aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-11-29 13:19:47 +0100
committerDream-Master <dream-master@gmx.net>2017-11-29 13:19:47 +0100
commit256e55a025993ca4cd598e47bfd6234c871543c2 (patch)
tree35f0f120e0562d103e9ec19891cc1da765adb30f /src/main
parent907c616791ab8bc91488c6fce3ae5f15166920f1 (diff)
downloadGT5-Unofficial-256e55a025993ca4cd598e47bfd6234c871543c2.tar.gz
GT5-Unofficial-256e55a025993ca4cd598e47bfd6234c871543c2.tar.bz2
GT5-Unofficial-256e55a025993ca4cd598e47bfd6234c871543c2.zip
fix a id overlapping
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index c272b51e84..874e6dc787 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -1430,7 +1430,7 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI
generateFluidPipes(Materials.Titanium, Materials.Titanium.mName, 5150, 480, 5000, true);
generateFluidMultiPipes(Materials.Titanium, Materials.Titanium.mName, 5155, 480, 5000, true);
generateFluidPipes(Materials.TungstenSteel, Materials.TungstenSteel.mName, 5160, 600, 7500, true);
- generateFluidMultiPipes(Materials.TungstenSteel, Materials.TungstenSteel.mName, 5165, 600, 7500, true);
+ generateFluidMultiPipes(Materials.TungstenSteel, Materials.TungstenSteel.mName, 5270, 600, 7500, true);
GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(Materials.Ultimate), new GT_MetaPipeEntity_Fluid(5165, "GT_Pipe_HighPressure_Small", "Small High Pressure Fluid Pipe", 0.375F, Materials.Redstone, 4800, 1500, true).getStackForm(1L));
GT_OreDictUnificator.registerOre(OrePrefixes.pipeMedium.get(Materials.Ultimate), new GT_MetaPipeEntity_Fluid(5166, "GT_Pipe_HighPressure", "High Pressure Fluid Pipe", 0.5F, Materials.Redstone, 7200, 1500, true).getStackForm(1L));
GT_OreDictUnificator.registerOre(OrePrefixes.pipeLarge.get(Materials.Ultimate), new GT_MetaPipeEntity_Fluid(5167, "GT_Pipe_HighPressure_Large", "Large High Pressure Fluid Pipe", 0.75F, Materials.Redstone, 9600, 1500, true).getStackForm(1L));