Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2

This commit is contained in:
Nedelosk committed 2016-10-25 18:14:30 +02:00
commit f993d0571d
40 files changed
+239 -271

No files matched your search

@@ -1046,7 +1046,6 @@ public enum FlowerDefinition implements IFlowerDefinition {
IFlower flower = getIndividual();
return BotanyCore.getFlowerRoot().getMemberStack(flower, flowerStage);
}
public static void preInitFlowers(){
MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(FlowerManager.flowerRoot));