Remove redundant flags (#529)

* Remove CORE.GTNH

* Remove LoadedMods.Gregtech

* Remove LoadedMods.IndustrialCraft2

* Remove LoadedMods.MiscUtils

* Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK

* clean

* Remove mention to GT versions

* Fix assembler mode

11 files changed, 2150 insertions, 3774 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
index ff104057b1..aace371163 100644
--- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.ItemList;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -9,18 +8,9 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 public class LOADER_Machine_Components {
 
     public static void initialise() {
-
         registerDefaultComponents();
 
-        if (!CORE.GTNH) {
-            if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-                registerGTExperimentalComponents();
-            } else {
-                registerGTStandardComponents();
-            }
-        } else {
-            registerGTNHComponents();
-        }
+        registerGTNHComponents();
     }
 
     private static void registerDefaultComponents() {
@@ -65,13 +55,11 @@ public class LOADER_Machine_Components {
         CI.sensor_HV = ItemList.Sensor_HV.get(1);
         CI.sensor_EV = ItemList.Sensor_EV.get(1);
         CI.sensor_IV = ItemList.Sensor_IV.get(1);
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
-            CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
-            CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
-            CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
-            CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1);
-        }
+        CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
+        CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
+        CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
+        CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
+        CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1);
     }
 
     private static void registerGTExperimentalComponents() {
@@ -101,11 +89,9 @@ public class LOADER_Machine_Components {
         CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
         CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
 
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
-            CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
-            CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
-        }
+        CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
+        CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
+        CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
 
         registerComponentsULV();
         registerComponentsMAX();
@@ -145,11 +131,9 @@ public class LOADER_Machine_Components {
         CI.sensor_UV = GregtechItemList.Sensor_UV.get(1);
         CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
 
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
-            CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
-            CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
-        }
+        CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
+        CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
+        CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
 
         registerComponentsULV();
     }
@@ -188,11 +172,9 @@ public class LOADER_Machine_Components {
         CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
         CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
 
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1);
-            CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1);
-            CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1);
-        }
+        CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1);
+        CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1);
+        CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1);
 
         // Thanks 0lafe
         CI.electricMotor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1);
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java
deleted file mode 100644
index 524aa08f60..0000000000
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package gtPlusPlus.core.recipe;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.*;
-import gregtech.api.interfaces.IOreRecipeRegistrator;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-
-public class RECIPES_Extruder implements IOreRecipeRegistrator {
-
-    public RECIPES_Extruder() {
-        OrePrefixes.ingot.add((IOreRecipeRegistrator) this);
-        OrePrefixes.dust.add((IOreRecipeRegistrator) this);
-    }
-
-    public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
-            final String aModName, final ItemStack aStack) {
-        if (!CORE.GTNH && ((aMaterial == Materials.Glass || aMaterial == Materials.WroughtIron
-                || GT_OreDictUnificator.get(OrePrefixes.ingot, (Object) aMaterial, 1L) != null)
-                && !aMaterial.contains(SubTag.NO_SMELTING))) {
-            final long aMaterialMass = aMaterial.getMass();
-            final int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L);
-            if (tAmount > 0 && tAmount <= 64 && aPrefix.mMaterialAmount % 3628800L == 0L) {
-                int tVoltageMultiplier = (aMaterial.mBlastFurnaceTemp >= 2800) ? 64 : 16;
-                if (aMaterial.contains(SubTag.NO_SMASHING)) {
-                    tVoltageMultiplier /= 4;
-                } else if (aPrefix.name().startsWith(OrePrefixes.dust.name())) {
-                    return;
-                }
-
-                GT_Values.RA.addExtruderRecipe(
-                        GT_Utility.copyAmount(1L, new Object[] { aStack }),
-                        GregtechItemList.Shape_Extruder_SmallGear.get(0L, new Object[0]),
-                        GT_OreDictUnificator
-                                .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount),
-                        ((int) Math.max(aMaterialMass * 5L * tAmount, tAmount) / 4),
-                        8 * tVoltageMultiplier);
-                GT_Values.RA.addAlloySmelterRecipe(
-                        GT_Utility.copyAmount(2L, new Object[] { aStack }),
-                        ItemList.Shape_Mold_Gear_Small.get(0L, new Object[0]),
-                        GT_OreDictUnificator
-                                .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount),
-                        ((int) Math.max(aMaterialMass * 10L * tAmount, tAmount) / 4),
-                        2 * tVoltageMultiplier);
-            }
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 0dcdb008bb..3bf145f0b3 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.core.recipe;
 
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
 import java.util.ArrayList;
 
 import net.minecraft.init.Blocks;
@@ -30,7 +28,6 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.*;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EnchantingUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -59,10 +56,8 @@ public class RECIPES_GREGTECH {
         dehydratorRecipes();
         blastFurnaceRecipes();
 
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            largeChemReactorRecipes();
-            fusionRecipes();
-        }
+        largeChemReactorRecipes();
+        fusionRecipes();
 
         fissionFuelRecipes();
         autoclaveRecipes();
@@ -359,80 +354,45 @@ public class RECIPES_GREGTECH {
 
     private static void assemblyLineRecipes() {
 
-        ItemStack[] aCoilWire = new ItemStack[] {
-                ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32),
-                ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 64 : 32),
-                ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 64 : 32),
-                ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 64 : 32), };
+        ItemStack[] aCoilWire = new ItemStack[] { ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 64),
+                ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 64),
+                ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, 64),
+                ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, 64), };
 
         // Containment Casings
         CORE.RA.addAssemblylineRecipe(
                 ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1),
                 20 * 60 * 30,
-                new Object[] { ItemList.Field_Generator_IV.get(GTNH ? 32 : 16),
-                        ItemList.Electric_Motor_EV.get(GTNH ? 64 : 32),
-                        ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16),
-                        CI.getTieredComponent(OrePrefixes.cableGt12, 7, GTNH ? 32 : 16),
-                        CI.getTieredComponent(OrePrefixes.wireGt16, 6, GTNH ? 64 : 32),
-                        ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, GTNH ? 64 : 16),
-                        ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8),
-                        ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.ARCANITE.getGear(GTNH ? 8 : 2),
-                        new Object[] { CI.getTieredCircuitOreDictName(5), 64 },
+                new Object[] { ItemList.Field_Generator_IV.get(32), ItemList.Electric_Motor_EV.get(64),
+                        ItemList.Energy_LapotronicOrb.get(32), CI.getTieredComponent(OrePrefixes.cableGt12, 7, 32),
+                        CI.getTieredComponent(OrePrefixes.wireGt16, 6, 64),
+                        ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, 64),
+                        ELEMENT.getInstance().GADOLINIUM.getDust(32), ELEMENT.getInstance().SAMARIUM.getDust(16),
+                        ALLOY.ARCANITE.getGear(8), new Object[] { CI.getTieredCircuitOreDictName(5), 64 },
                         new Object[] { CI.getTieredCircuitOreDictName(6), 32 },
                         new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
                         GregtechItemList.Laser_Lens_Special.get(1), aCoilWire[3] },
-                new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)),
-                        ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)),
-                        ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)),
-                        ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)), },
+                new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * 4),
+                        ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * 8), ALLOY.TUMBAGA.getFluidStack(144 * 9 * 32),
+                        ALLOY.NICHROME.getFluidStack(144 * 1 * 16), },
                 ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32),
-                20 * 60 * 10 * (GTNH ? 2 : 1),
+                20 * 60 * 10 * 2,
                 (int) MaterialUtils.getVoltageForTier(6));
 
-        // Slow Fusion Controller
-        /*
-         * CORE.RA.addAssemblylineRecipe( GregtechItemList.COMET_Cyclotron.get(1), 20 * 60 * 30, new ItemStack[] {
-         * CI.getFieldGenerator(6, GTNH ? 32 : 8), ItemList.Electric_Motor_EV.get(GTNH ? 32 : 8),
-         * ItemList.Tool_Scanner.get(GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.cableGt12, 6, GTNH ? 32 : 16),
-         * CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.plate, 6,
-         * GTNH ? 64 : 32), ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8),
-         * ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.INCOLOY_MA956.getGear(GTNH ? 8 : 2),
-         * CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.circuit, 6,
-         * GTNH ? 32 : 16), CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8) }, new FluidStack[] {
-         * CI.getTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTertiaryTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
-         * CI.getAlternativeTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
-         * }, GregtechItemList.Miniature_Fusion.get(1), 20 * 60 * 5 * (GTNH ? 2 : 1), (int)
-         * MaterialUtils.getVoltageForTier(7));
-         */
-
-        // Plasma Tank
-        /*
-         * CORE.RA.addAssemblylineRecipe( ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor,
-         * 1), 20 * 60 * 5, new ItemStack[] { CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 32 : 16),
-         * CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 16 : 4), CI.getTieredComponent(OrePrefixes.pipeHuge, 5,
-         * GTNH ? 16 : 4), CI.getTieredComponent(OrePrefixes.cableGt08, 7, GTNH ? 32 : 16),
-         * CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 8 : 4), aCoilWire[2] }, new FluidStack[] {
-         * CI.getTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), CI.getTertiaryTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)),
-         * CI.getAlternativeTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), }, GregtechItemList.Plasma_Tank.get(1), 20 * 60 *
-         * 1 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(5));
-         */
-
         // Turbine Automation Port
         CORE.RA.addAssemblylineRecipe(
                 ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1),
                 20 * 60 * 60 * 24,
-                new Object[] { CI.getTieredMachineHull(8, 4), CI.getConveyor(8, GTNH ? 24 : 12),
-                        CI.getElectricMotor(7, GTNH ? 32 : 16), CI.getElectricPiston(7, GTNH ? 16 : 4),
-                        CI.getEnergyCore(6, GTNH ? 8 : 2), CI.getPlate(8, GTNH ? 24 : 12),
-                        CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 48 : 24),
-                        CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 32 : 16),
-                        CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 12 : 6),
+                new Object[] { CI.getTieredMachineHull(8, 4), CI.getConveyor(8, 24), CI.getElectricMotor(7, 32),
+                        CI.getElectricPiston(7, 16), CI.getEnergyCore(6, 8), CI.getPlate(8, 24),
+                        CI.getTieredComponent(OrePrefixes.screw, 8, 48), CI.getTieredComponent(OrePrefixes.bolt, 7, 32),
+                        CI.getTieredComponent(OrePrefixes.rod, 6, 12),
                         new Object[] { CI.getTieredCircuitOreDictName(7), 20 },
-                        CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8), },
+                        CI.getTieredComponent(OrePrefixes.rotor, 6, 16), },
                 new FluidStack[] { CI.getTieredFluid(8, 144 * 32), CI.getAlternativeTieredFluid(7, 144 * 16),
                         CI.getTertiaryTieredFluid(7, 144 * 16), ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144) },
                 GregtechItemList.Hatch_Input_TurbineHousing.get(4),
-                20 * 60 * 60 * (GTNH ? 2 : 1),
+                20 * 60 * 60 * 2,
                 (int) MaterialUtils.getVoltageForTier(8));
 
         /*
@@ -452,13 +412,12 @@ public class RECIPES_GREGTECH {
                     aResearch[aCasingSlot],
                     20 * 60 * 60,
                     new ItemStack[] { CI.getTieredComponent(OrePrefixes.plate, j - 1, 16),
-                            CI.getTieredComponent(OrePrefixes.cableGt08, j + 1, (GTNH ? 32 : 16)),
+                            CI.getTieredComponent(OrePrefixes.cableGt08, j + 1, 32),
                             CI.getTieredComponent(OrePrefixes.gearGt, j - 1, 4), aCoilWire[aCasingSlot] },
-                    new FluidStack[] { CI.getTieredFluid(j, 144 * (GTNH ? 8 : 4)),
-                            CI.getTertiaryTieredFluid(j - 2, 144 * (GTNH ? 16 : 8)),
-                            CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 12)), },
+                    new FluidStack[] { CI.getTieredFluid(j, 144 * 8), CI.getTertiaryTieredFluid(j - 2, 144 * 16),
+                            CI.getAlternativeTieredFluid(j, 144 * 16), },
                     aGemCasings[aCasingSlot++],
-                    20 * 60 * 1 * (GTNH ? 2 : 1),
+                    20 * 60 * 1 * 2,
                     (int) MaterialUtils.getVoltageForTier(j));
         }
 
@@ -481,15 +440,14 @@ public class RECIPES_GREGTECH {
                     new Object[] { aGemCasings[aCasingSlot], ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16),
                             CI.getTieredComponent(OrePrefixes.plate, j, 16),
                             new Object[] { CI.getTieredCircuitOreDictName(j), 8 },
-                            CI.getTieredComponent(OrePrefixes.wireGt16, j + 1, GTNH ? 32 : 16),
-                            CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4),
-                            CI.getTieredComponent(OrePrefixes.screw, j - 1, GTNH ? 8 : 4), },
-                    new FluidStack[] { CI.getTieredFluid(j, 144 * 1 * (GTNH ? 16 : 8)),
-                            CI.getTertiaryTieredFluid(j - 2, 144 * 2 * (GTNH ? 16 : 8)),
-                            CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 8)),
-                            CI.getTertiaryTieredFluid(j - 1, 144 * (GTNH ? 16 : 8)), },
+                            CI.getTieredComponent(OrePrefixes.wireGt16, j + 1, 32),
+                            CI.getTieredComponent(OrePrefixes.bolt, j, 8),
+                            CI.getTieredComponent(OrePrefixes.screw, j - 1, 8), },
+                    new FluidStack[] { CI.getTieredFluid(j, 144 * 1 * 16),
+                            CI.getTertiaryTieredFluid(j - 2, 144 * 2 * 16), CI.getAlternativeTieredFluid(j, 144 * 16),
+                            CI.getTertiaryTieredFluid(j - 1, 144 * 16), },
                     aGemBatteries[aCasingSlot++],
-                    20 * 60 * 1 * (GTNH ? 2 : 1),
+                    20 * 60 * 1 * 2,
                     (int) MaterialUtils.getVoltageForTier(j));
         }
 
@@ -498,20 +456,19 @@ public class RECIPES_GREGTECH {
             CORE.RA.addAssemblylineRecipe(
                     ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1),
                     20 * 60 * 10,
-                    new Object[] { ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2),
-                            CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+                    new Object[] { ItemUtils.getSimpleStack(aGemCasings[2], 4),
+                            CI.getTieredComponent(OrePrefixes.plate, 8, 32),
                             new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
-                            CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8),
-                            CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3),
-                            CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8),
-                            CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12),
-                            CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6), aCoilWire[3] },
-                    new FluidStack[] { CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
-                            CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
-                            CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)),
-                            CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), },
+                            CI.getTieredComponent(OrePrefixes.cableGt02, 7, 16),
+                            CI.getTieredComponent(OrePrefixes.gearGt, 6, 6),
+                            CI.getTieredComponent(OrePrefixes.screw, 7, 16),
+                            CI.getTieredComponent(OrePrefixes.bolt, 5, 24),
+                            CI.getTieredComponent(OrePrefixes.frameGt, 4, 12), aCoilWire[3] },
+                    new FluidStack[] { CI.getTieredFluid(7, 144 * 18 * 16), CI.getTertiaryTieredFluid(7, 144 * 18 * 16),
+                            CI.getAlternativeTieredFluid(6, 144 * 18 * 16),
+                            CI.getAlternativeTieredFluid(7, 144 * 18 * 16), },
                     ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1),
-                    20 * 60 * 30 * (GTNH ? 2 : 1),
+                    20 * 60 * 30 * 2,
                     (int) MaterialUtils.getVoltageForTier(7));
 
             // Charge Pack LuV-UV
@@ -537,15 +494,14 @@ public class RECIPES_GREGTECH {
                                 new Object[] { CI.getTieredCircuitOreDictName(h), 4 },
                                 new Object[] { CI.getTieredCircuitOreDictName(h - 1), 8 },
                                 CI.getTieredComponent(OrePrefixes.cableGt12, h - 1, 16),
-                                CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
-                                CI.getTieredComponent(OrePrefixes.bolt, h - 2, GTNH ? 32 : 16),
-                                CI.getFieldGenerator(h, 1), },
-                        new FluidStack[] { CI.getTieredFluid(h, 144 * 4 * (GTNH ? 8 : 4)),
-                                CI.getTertiaryTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)),
-                                CI.getAlternativeTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)),
-                                CI.getAlternativeTieredFluid(h - 2, 144 * 4 * (GTNH ? 8 : 4)), },
+                                CI.getTieredComponent(OrePrefixes.screw, h, 16),
+                                CI.getTieredComponent(OrePrefixes.bolt, h - 2, 32), CI.getFieldGenerator(h, 1), },
+                        new FluidStack[] { CI.getTieredFluid(h, 144 * 4 * 8),
+                                CI.getTertiaryTieredFluid(h - 1, 144 * 4 * 8),
+                                CI.getAlternativeTieredFluid(h - 1, 144 * 4 * 8),
+                                CI.getAlternativeTieredFluid(h - 2, 144 * 4 * 8), },
                         aChargeOutputs[aCurrSlot],
-                        20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot + 1),
+                        20 * 60 * 30 * 2 * (aCurrSlot + 1),
                         (int) MaterialUtils.getVoltageForTier(h));
                 aCurrSlot++;
             }
@@ -554,20 +510,19 @@ public class RECIPES_GREGTECH {
             CORE.RA.addAssemblylineRecipe(
                     ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1),
                     20 * 60 * 10,
-                    new Object[] { ItemUtils.getSimpleStack(aGemCasings[3], GTNH ? 4 : 2),
-                            CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+                    new Object[] { ItemUtils.getSimpleStack(aGemCasings[3], 4),
+                            CI.getTieredComponent(OrePrefixes.plate, 8, 32),
                             new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
-                            CI.getTieredComponent(OrePrefixes.cableGt04, 8, GTNH ? 16 : 8),
-                            CI.getTieredComponent(OrePrefixes.gearGt, 7, GTNH ? 6 : 3),
-                            CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 16 : 8),
-                            CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 24 : 12),
-                            CI.getTieredComponent(OrePrefixes.frameGt, 5, GTNH ? 12 : 6), aCoilWire[3] },
-                    new FluidStack[] { CI.getTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
-                            CI.getTertiaryTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
-                            CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
-                            CI.getAlternativeTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)), },
+                            CI.getTieredComponent(OrePrefixes.cableGt04, 8, 16),
+                            CI.getTieredComponent(OrePrefixes.gearGt, 7, 6),
+                            CI.getTieredComponent(OrePrefixes.screw, 8, 16),
+                            CI.getTieredComponent(OrePrefixes.bolt, 7, 24),
+                            CI.getTieredComponent(OrePrefixes.frameGt, 5, 12), aCoilWire[3] },
+                    new FluidStack[] { CI.getTieredFluid(8, 144 * 18 * 16), CI.getTertiaryTieredFluid(8, 144 * 18 * 16),
+                            CI.getAlternativeTieredFluid(7, 144 * 18 * 16),
+                            CI.getAlternativeTieredFluid(8, 144 * 18 * 16), },
                     ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice", 1),
-                    20 * 60 * 30 * (GTNH ? 2 : 1),
+                    20 * 60 * 30 * 2,
                     (int) MaterialUtils.getVoltageForTier(8));
         }
         GT_Values.RA.addAssemblylineRecipe(
@@ -723,7 +678,7 @@ public class RECIPES_GREGTECH {
                 ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1),
                 null,
                 null,
-                FluidUtils.getFluidStack("radon", !GTNH ? 500 : 144),
+                FluidUtils.getFluidStack("radon", 144),
                 null,
                 null,
                 null,
@@ -751,20 +706,6 @@ public class RECIPES_GREGTECH {
 
     private static void blastSmelterRecipes() {
 
-        if (!GTNH) {
-            // Trinium
-            CORE.RA.addBlastSmelterRecipe(
-                    new ItemStack[] { ItemUtils.getGregtechCircuit(8), ELEMENT.getInstance().BISMUTH.getDust(8),
-                            ELEMENT.getInstance().IRON.getDust(64), ELEMENT.getInstance().CARBON.getDust(16),
-                            ELEMENT.getInstance().GOLD.getDust(16), ELEMENT.getInstance().SILVER.getDust(16),
-                            ELEMENT.getInstance().OSMIUM.getDust(4), ELEMENT.getInstance().IRIDIUM.getDust(4),
-                            ELEMENT.getInstance().CERIUM.getDust(8) },
-                    FluidUtils.getFluidStack("molten.trinium", 136 * 144),
-                    0,
-                    20 * 3000,
-                    2040 * 4);
-        }
-
         // Eglin Steel
         CORE.RA.addBlastSmelterRecipe(
                 new ItemStack[] { ItemUtils.getGregtechCircuit(6), ELEMENT.getInstance().IRON.getDust(4),
@@ -941,19 +882,17 @@ public class RECIPES_GREGTECH {
         // Hydrofluoric Acid
         boolean addedGtExtraction = false;
         // Try use Internal GT Fluid first
-        if (Utils.getGregtechVersionAsInt() >= 50929) {
-            // Hydrofluoric Acid
-            CORE.RA.addFluidCannerRecipe(
-                    ItemUtils.getSimpleStack(Items.glass_bottle),
-                    ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
-                    FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250),
-                    null);
-            addedGtExtraction = CORE.RA.addFluidCannerRecipe(
-                    ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
-                    ItemUtils.getSimpleStack(Items.glass_bottle),
-                    null,
-                    FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250));
-        }
+        // Hydrofluoric Acid
+        CORE.RA.addFluidCannerRecipe(
+                ItemUtils.getSimpleStack(Items.glass_bottle),
+                ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+                FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250),
+                null);
+        addedGtExtraction = CORE.RA.addFluidCannerRecipe(
+                ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+                ItemUtils.getSimpleStack(Items.glass_bottle),
+                null,
+                FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250));
         // Add a Fill recipe for GT++ Acid
         CORE.RA.addFluidCannerRecipe(
                 ItemUtils.getSimpleStack(Items.glass_bottle),
@@ -1317,8 +1256,7 @@ public class RECIPES_GREGTECH {
         ItemStack aFluidReg4 = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
 
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { aFluidReg1, CI.electricMotor_LV,
-                        CI.getTieredComponent(OrePrefixes.bolt, 1, GTNH ? 8 : 4),
+                new ItemStack[] { aFluidReg1, CI.electricMotor_LV, CI.getTieredComponent(OrePrefixes.bolt, 1, 8),
                         ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("stickBrass", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2) },
@@ -1327,8 +1265,7 @@ public class RECIPES_GREGTECH {
                 10 * 20,
                 30);
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { aFluidReg2, CI.electricMotor_MV,
-                        CI.getTieredComponent(OrePrefixes.bolt, 2, GTNH ? 8 : 4),
+                new ItemStack[] { aFluidReg2, CI.electricMotor_MV, CI.getTieredComponent(OrePrefixes.bolt, 2, 8),
                         ItemUtils.getItemStackOfAmountFromOreDict("ringInvar", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("stickInvar", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2) },
@@ -1337,8 +1274,7 @@ public class RECIPES_GREGTECH {
                 10 * 20 * 2,
                 120);
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { aFluidReg3, CI.electricMotor_HV,
-                        CI.getTieredComponent(OrePrefixes.bolt, 3, GTNH ? 8 : 4),
+                new ItemStack[] { aFluidReg3, CI.electricMotor_HV, CI.getTieredComponent(OrePrefixes.bolt, 3, 8),
                         ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("stickChrome", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2) },
@@ -1348,8 +1284,7 @@ public class RECIPES_GREGTECH {
                 480);
 
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { aFluidReg4, CI.electricMotor_EV,
-                        CI.getTieredComponent(OrePrefixes.bolt, 4, GTNH ? 8 : 4),
+                new ItemStack[] { aFluidReg4, CI.electricMotor_EV, CI.getTieredComponent(OrePrefixes.bolt, 4, 8),
                         ItemUtils.getItemStackOfAmountFromOreDict("ringTitanium", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("stickTitanium", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 2) },
@@ -1411,79 +1346,21 @@ public class RECIPES_GREGTECH {
 
             CORE.RA.addSixSlotAssemblingRecipe(
                     new ItemStack[] { aPackPlates[aAS], aPackRing[aAS], aPackWire[aAS], aPackCircuit[aAS],
-                            aPackBatteries[aAS], CI.getSensor(i, GTNH ? 4 : 2), },
-                    CI.getTieredFluid(i, (144 * (GTNH ? 4 : 2))),
+                            aPackBatteries[aAS], CI.getSensor(i, 4), },
+                    CI.getTieredFluid(i, (144 * 4)),
                     aPackOutput[aAS],
                     30 * 20 * i,
                     (int) GT_Values.V[i]);
         }
 
-        if (!GTNH) {
-            if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-                GT_Values.RA.addAssemblerRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.WroughtIron, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2L),
-                        GregtechItemList.Fluid_Cell_1L.get(1L, new Object[0]),
-                        50,
-                        32);
-                GT_Values.RA.addAssemblerRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Bronze, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 2L),
-                        GregtechItemList.Fluid_Cell_16L.get(1L, new Object[0]),
-                        50,
-                        32);
-                GT_Values.RA.addAssemblerRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Brass, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 2L),
-                        GregtechItemList.Fluid_Cell_36L.get(1L, new Object[0]),
-                        75,
-                        32);
-                GT_Values.RA.addAssemblerRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Invar, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 2L),
-                        GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]),
-                        75,
-                        32);
-
-            } else {
-                GT_Values.RA.addAssemblerRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 4L),
-                        GregtechItemList.Fluid_Cell_1L.get(1L, new Object[0]),
-                        50,
-                        32);
-                GT_Values.RA.addAssemblerRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 4L),
-                        GregtechItemList.Fluid_Cell_16L.get(1L, new Object[0]),
-                        50,
-                        32);
-                GT_Values.RA.addAssemblerRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Brass, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 4L),
-                        GregtechItemList.Fluid_Cell_36L.get(1L, new Object[0]),
-                        75,
-                        32);
-                GT_Values.RA.addAssemblerRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 8L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 4L),
-                        GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]),
-                        75,
-                        32);
-            }
-        }
-
         if (LoadedMods.Baubles) {
 
             // Turbine Housing Research Page
             CORE.RA.addSixSlotAssemblingRecipe(
                     new ItemStack[] { ItemUtils.getGregtechCircuit(17),
-                            ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", GTNH ? 64 : 32),
-                            CI.getSensor(6, GTNH ? 6 : 3), CI.getBolt(7, GTNH ? 64 : 32),
-                            ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),
-                            ItemUtils.getItemStackOfAmountFromOreDict(
-                                    CI.getTieredCircuitOreDictName(7),
-                                    GTNH ? 12 : 6) },
+                            ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", 64), CI.getSensor(6, 6),
+                            CI.getBolt(7, 64), ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", 64),
+                            ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 12) },
                     CI.getAlternativeTieredFluid(7, 144 * 32),
                     ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1),
                     20 * 60 * 5,
@@ -1492,12 +1369,9 @@ public class RECIPES_GREGTECH {
             // Cloaking Device Research Page
             CORE.RA.addSixSlotAssemblingRecipe(
                     new ItemStack[] { ItemUtils.getGregtechCircuit(17),
-                            ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4),
-                            CI.