diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-11-07 16:52:26 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-11-07 16:52:26 +1000 |
| commit | c55eecb0755deecb1d7cac4b78e0c5c19d7f85f3 (patch) | |
| tree | 690686e8050f77ecbaa09b07e540cf2f3b2cecef /src/Java/gtPlusPlus/xmod | |
| parent | 3e20ba4cf8cf18f1d8840db10ae5a32c2912746c (diff) | |
| download | GT5-Unofficial-c55eecb0755deecb1d7cac4b78e0c5c19d7f85f3.tar.gz GT5-Unofficial-c55eecb0755deecb1d7cac4b78e0c5c19d7f85f3.tar.bz2 GT5-Unofficial-c55eecb0755deecb1d7cac4b78e0c5c19d7f85f3.zip | |
+ Added 'The keys to the city' amulet.
$ Fixed #153, Dark Steel pipes existing without EIO.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 6a93a46dbf..438d64bfe2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -91,7 +91,9 @@ public class GregtechConduits { generateNonGTFluidPipes(GT_Materials.HastelloyX, ALLOY.HASTELLOY_X, BasePipeID+50, 10000, 4200, true); generateGTFluidPipes(Materials.Tungsten, BasePipeID+55, 4320, 7200, true); - generateGTFluidPipes(Materials.DarkSteel, BasePipeID+60, 2320, 2750, true); + if (LoadedMods.EnderIO){ + generateGTFluidPipes(Materials.DarkSteel, BasePipeID+60, 2320, 2750, true); + } generateGTFluidPipes(Materials.Clay, BasePipeID+65, 100, 500, false); generateGTFluidPipes(Materials.Lead, BasePipeID+70, 720, 1200, true); } @@ -154,9 +156,9 @@ public class GregtechConduits { registerOre(OrePrefixes.cableGt08, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 9, "cable." + aMaterial.getLocalizedName().toLowerCase() + ".08", "8x " + aMaterial.getLocalizedName() + " Cable", 0.625F, aLossInsulated, 8L * aAmperage, aVoltage, true, false, aMaterial.getRGBA()).getStackForm(1L)); registerOre(OrePrefixes.cableGt12, aMaterial, new GregtechMetaPipeEntity_Cable(aStartID + 10, "cable." + aMaterial.getLocalizedName().toLowerCase() + ".12", "12x " + aMaterial.getLocalizedName() + " Cable", 0.875F, aLossInsulated, 12L * aAmperage, aVoltage, true, false, aMaterial.getRGBA()).getStackForm(1L)); } - + generateWireRecipes(aMaterial); - + } private static void superConductorFactory(final GT_Materials Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps){ |