Merge branch 'master' into cover_default_tick_rate

dependencies.gradle

@@ -43,7 +43,7 @@ dependencies {
     api("com.github.GTNewHorizons:ModularUI2:2.1.16-1.7.10:dev")
     api("com.github.GTNewHorizons:waila:1.8.2:dev")
     api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-507-GTNH:dev")
-    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.0-gtnh:dev")
+    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.2-gtnh:dev")
     api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
     api("com.github.GTNewHorizons:Postea:1.0.13:dev")
 

src/functionalTest/java/kubatech/test/kubatechTestMod.java

@@ -38,7 +38,7 @@ public class kubatechTestMod {
     public void preInit(FMLPreInitializationEvent ev) {
         // Disable GT5u messing with vanilla recipes for unit tests
         GTMod.gregtechproxy.mNerfedWoodPlank = false;
-        GTMod.gregtechproxy.mNerfedVanillaTools = false;
+        GTMod.gregtechproxy.mChangeWoodenVanillaTools = false;
     }
 
     @EventHandler

src/main/java/gregtech/GTMod.java

@@ -88,7 +88,6 @@
 import gregtech.common.config.Other;
 import gregtech.common.config.Worldgen;
 import gregtech.common.covers.CoverFacadeAE;
-import gregtech.common.items.flinttools.FlintTools;
 import gregtech.common.misc.GTCommand;
 import gregtech.common.misc.spaceprojects.commands.SPCommand;
 import gregtech.common.misc.spaceprojects.commands.SPMCommand;
@@ -325,11 +324,6 @@ public void onPreLoad(FMLPreInitializationEvent aEvent) {
         if (FMLCommonHandler.instance()
             .getEffectiveSide()
             .isServer()) AssemblyLineServer.fillMap(aEvent);
-
-        // Flint tool setup.
-        FlintTools.registerTools();
-        FlintTools.registerPosteaTransformations();
-        FlintTools.registerRecipes();
     }
 
     @Mod.EventHandler
@@ -537,7 +531,7 @@ public void onPostLoad(FMLPostInitializationEvent aEvent) {
             .map(tName -> GTModHandler.getIC2Item(tName, 1L))
             .forEach(GTModHandler::removeRecipeByOutputDelayed);
 
-        GTPostLoad.nerfVanillaTools();
+        GTPostLoad.changeWoodenVanillaTools();
 
         // Register postea transformers
         new PosteaTransformers().run();

src/main/java/gregtech/common/GTProxy.java

@@ -538,7 +538,7 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
     public boolean mAxeWhenAdventure = true;
     public boolean mSurvivalIntoAdventure = false;
     public boolean mNerfedWoodPlank = true;
-    public boolean mNerfedVanillaTools = true;
+    public boolean mChangeWoodenVanillaTools = true;
     public boolean mHungerEffect = true;
     public boolean mIgnoreTcon = true;
     public boolean mAchievements = true;

src/main/java/gregtech/common/config/Gregtech.java

@@ -238,10 +238,10 @@ public static class General {
         @Config.RequiresMcRestart
         public boolean nerfedWoodPlank;
 
-        @Config.Comment("if true, reduces the durability of the vanilla tools.")
+        @Config.Comment("if true, change the default durability of wooden vanilla tools to 64 and increase speed to match stone")
         @Config.DefaultBoolean(true)
         @Config.RequiresMcRestart
-        public boolean nerfedVanillaTools;
+        public boolean changedWoodenVanillaTools;
 
         @Config.Comment("if true, enables GT5U achievements.")
         @Config.DefaultBoolean(true)