diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-01-29 23:51:25 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-01-29 23:51:25 +1000 |
| commit | a47674eca1d1411d0d5b006c4e3f97ddf49cb655 (patch) | |
| tree | 27193da23388727b3c826d42174bad88207cb30a /src | |
| parent | 79f6d0d5981324541c4b89e14597dec59627cdc8 (diff) | |
| download | GT5-Unofficial-a47674eca1d1411d0d5b006c4e3f97ddf49cb655.tar.gz GT5-Unofficial-a47674eca1d1411d0d5b006c4e3f97ddf49cb655.tar.bz2 GT5-Unofficial-a47674eca1d1411d0d5b006c4e3f97ddf49cb655.zip | |
$ Fixed issue with ID collision when loaded in GTNH.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 00001e7af6..14fbc63797 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -60,7 +60,6 @@ public class CORE { public static final int GREG_FIRST_ID = 760; public static final boolean MAIN_GREGTECH_5U_EXPERIMENTAL_FORK = Meta_GT_Proxy.areWeUsingGregtech5uExperimental(); public static final int GREGTECH_API_VERSION = GregTech_API.VERSION; - public static IGregtech_RecipeAdder RA; //GT++ Fake Player Profile public static GameProfile gameProfile = new GameProfile(UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), "[GT++]"); @@ -101,6 +100,7 @@ public class CORE { @Deprecated public static IGregtech_RecipeAdder sRecipeAdder; + public static IGregtech_RecipeAdder RA; public static GregtechRecipe GT_Recipe = new GregtechRecipe(); public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000]; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index f3287f338c..5cefcb7a53 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -79,9 +79,9 @@ public class GregtechConduits { customWireFactory(ALLOY.LEAGRISIUM, 512, BaseWireID + 56, 1, 2, 2); customWireFactory(ELEMENT.getInstance().ZIRCONIUM, 128, BaseWireID + 67, 1, 2, 2); customWireFactory(ALLOY.HG1223, 32768, BaseWireID + 78, 2, 8, 4); + customWireFactory(ALLOY.TRINIUM_TITANIUM, 2048, BaseWireID + 89, 1, 2, 16); } - customWireFactory(ALLOY.TRINIUM_TITANIUM, 2048, BaseWireID + 89, 1, 2, 16); //superConductorFactory(GT_Materials.Superconductor, 524288, 30660, 0, 0, 8); if (LoadedMods.Thaumcraft){ |