aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-01-29 23:51:25 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-01-29 23:51:25 +1000
commita47674eca1d1411d0d5b006c4e3f97ddf49cb655 (patch)
tree27193da23388727b3c826d42174bad88207cb30a /src/Java/gtPlusPlus/xmod/gregtech
parent79f6d0d5981324541c4b89e14597dec59627cdc8 (diff)
downloadGT5-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/Java/gtPlusPlus/xmod/gregtech')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java2
1 files changed, 1 insertions, 1 deletions
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){