diff options
-rw-r--r-- | src/Java/gtPlusPlus/GTplusplus.java | 2 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/common/CommonProxy.java | 3 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/recipe/common/CI.java | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 46a9caf73a..dfe87b7808 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -200,7 +200,7 @@ public class GTplusplus implements ActionListener { FMLCommonHandler.instance().bus().register(new LoginEventHandler()); Utils.LOG_INFO("Login Handler Initialized"); - if (CORE.configSwitches.enableOldGTcircuits){ + if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ removeCircuitRecipeMap(); //Bye shitty recipes. } diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index 2df2daa146..6f885fadfe 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -16,7 +16,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.RECIPES_Old_Circuits; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.recipe.LOADER_Machine_Components; import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.debug.DEBUG_INIT; @@ -93,7 +92,7 @@ public class CommonProxy { PlayerCache.initCache(); //Circuits - if (CORE.configSwitches.enableOldGTcircuits){ + if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ RECIPES_Old_Circuits.handleCircuits(); new RECIPES_Old_Circuits(); } diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index e796e237f8..7cee90bc15 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -370,7 +370,7 @@ public class CI { } public static ItemStack getDataOrb(){ - if (CORE.configSwitches.enableOldGTcircuits){ + if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ return GregtechItemList.Old_Tool_DataOrb.get(1); } else { |