aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/common/CommonProxy.java
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-05-13 01:03:38 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-05-13 01:41:31 +1000
commitcc960c4aa3697b9f47f1ca050511f5d2a94e63f2 (patch)
treee8848ffc6149675dcb91ef401065010d1fc17569 /src/Java/gtPlusPlus/core/common/CommonProxy.java
parent74cbb7d6c9dd8b2cf3d856d9483b464dbdd3a4e1 (diff)
downloadGT5-Unofficial-cc960c4aa3697b9f47f1ca050511f5d2a94e63f2.tar.gz
GT5-Unofficial-cc960c4aa3697b9f47f1ca050511f5d2a94e63f2.tar.bz2
GT5-Unofficial-cc960c4aa3697b9f47f1ca050511f5d2a94e63f2.zip
+ Added Turbine Animations.
$ Fixed Large Auto-Assembler Name. $ Possible fix for #239. $ Other Bug Fixes. $ Fixed Old School Circuits breaking Integrated Circuit Recipes. % Made Adv. EBF. Use new casing textures. % Streamlined Old School Circuit function call locations to a single handler. % Cleaned up ASM Logging.
Diffstat (limited to 'src/Java/gtPlusPlus/core/common/CommonProxy.java')
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 4d32d66ecd..8a1ef34b68 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -78,6 +78,8 @@ public class CommonProxy {
CI.preInit();
AddToCreativeTab.initialiseTabs();
+
+
COMPAT_IntermodStaging.preInit();
BookHandler.run();
//Registration of entities and renderers
@@ -135,12 +137,6 @@ public class CommonProxy {
Logger.INFO("Cleaning up, doing postInit.");
PlayerCache.initCache();
- //Circuits
- if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
- RECIPES_Old_Circuits.handleCircuits();
- new RECIPES_Old_Circuits();
- }
-
//Make Burnables burnable
if (!CORE.burnables.isEmpty()){
BurnableFuelHandler fuelHandler = new BurnableFuelHandler();