update

Also fixes fermenter recipes for these crops

dependencies.gradle

@@ -2,8 +2,8 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha35:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.25-GTNH:dev')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha33:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.23-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2:api')
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.15'
 }
 
 

src/main/java/forestry/plugins/PluginLepidopterology.java

@@ -60,7 +60,6 @@ public class PluginLepidopterology extends ForestryPlugin {
     public static int spawnConstraint = 100;
     public static int entityConstraint = 1000;
     private static boolean allowPollination = true;
-    public static boolean disableButterflyLeafSpawns = false;
 
     public static ItemRegistryLepidopterology items;
     public static BlockRegistryLepidopterology blocks;
@@ -113,8 +112,7 @@ public class PluginLepidopterology extends ForestryPlugin {
 
         blocks.lepidopterology.init();
 
-        if (!PluginLepidopterology.disableButterflyLeafSpawns)
-            TreeManager.treeRoot.registerLeafTickHandler(new ButterflySpawner());
+        TreeManager.treeRoot.registerLeafTickHandler(new ButterflySpawner());
 
         RecipeSorter.register(
                 "forestry:lepidopterologymating",
@@ -129,8 +127,6 @@ public class PluginLepidopterology extends ForestryPlugin {
         spawnConstraint = config.getIntLocalized("butterfly.entities", "spawn.limit", spawnConstraint, 0, 500);
         entityConstraint = config.getIntLocalized("butterfly.entities", "maximum", entityConstraint, 0, 5000);
         allowPollination = config.getBooleanLocalized("butterfly.entities", "pollination", allowPollination);
-        disableButterflyLeafSpawns = config
-                .getBooleanLocalized("butterfly.entities", "disable.leaf.spawns", disableButterflyLeafSpawns);
 
         config.save();
     }

src/main/resources/assets/forestry/lang/en_US.lang

@@ -1684,8 +1684,6 @@ for.config.butterfly.entities.maximum=Butterfly Maximum
 for.config.butterfly.entities.maximum.comment=New butterflies will stay in item form and will not take flight once this limit is reached.
 for.config.butterfly.entities.pollination=Butterfly Pollination
 for.config.butterfly.entities.pollination.comment=Allow butterflies to pollinate leaves.
-for.config.butterfly.entities.disable.leaf.spawns=Disable Butterfly Leaf Spawns
-for.config.butterfly.entities.disable.leaf.spawns.comment=Prevent random butterflies from autonomously spawning from Forestry leaves.
 
 for.config.backpacks.item.stacks.format=Add itemStacks for the %s's backpack here in the format 'modid:name:meta'. For wildcard metadata the format is 'modid:name'.
 for.config.backpacks.ore.dict.format=Add ore dictionary names for the %s's backpack here in the format 'oreDictName'.