aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-07-25 12:15:51 +0200
committerDream-Master <dream-master@gmx.net>2017-07-25 12:15:51 +0200
commita1d69dc39adfc813a75ed9295948590dac107bd4 (patch)
tree7a715f76a4cce7e881f95a691a5a9fec4079adaa /src/main/java/gregtech
parent11c2aff89a255317c3f85d40b249c9bd0a6f2b3b (diff)
downloadGT5-Unofficial-a1d69dc39adfc813a75ed9295948590dac107bd4.tar.gz
GT5-Unofficial-a1d69dc39adfc813a75ed9295948590dac107bd4.tar.bz2
GT5-Unofficial-a1d69dc39adfc813a75ed9295948590dac107bd4.zip
change pipe ids because already occupied by GTNH Pipes
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java6
1 files changed, 3 insertions, 3 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 2251017a2f..1fb3652de4 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -1448,9 +1448,9 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI
GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveLarge.get(Materials.Osmium), new GT_MetaPipeEntity_Item(5638, "GT_Pipe_Restrictive_Osmium_Large", "Large Restrictive Osmium Item Pipe", 0.75F, Materials.Osmium, 16, 204800, true).getStackForm(1L));
GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveHuge.get(Materials.Osmium), new GT_MetaPipeEntity_Item(5639, "GT_Pipe_Restrictive_Osmium_Huge", "Huge Restrictive Osmium Item Pipe", 0.875F, Materials.Osmium, 32, 102400, true).getStackForm(1L));
generateItemPipes(Materials.PolyvinylChloride, Materials.PolyvinylChloride.mName, "PVC", 5690, 4);
- generateItemPipes(Materials.Nickel, Materials.Nickel.mName, "Nickel", 5652, 1);
- generateItemPipes(Materials.Cobalt, Materials.Cobalt.mName, "Cobalt", 5658, 2);
- generateItemPipes(Materials.Aluminium, Materials.Aluminium.mName, "Aluminium", 5664, 2);
+ generateItemPipes(Materials.Nickel, Materials.Nickel.mName, "Nickel", 5680, 1);
+ generateItemPipes(Materials.Cobalt, Materials.Cobalt.mName, "Cobalt", 5690, 2);
+ generateItemPipes(Materials.Aluminium, Materials.Aluminium.mName, "Aluminium", 5700, 2);
ItemList.Automation_ChestBuffer_ULV.set(new GT_MetaTileEntity_ChestBuffer(9230, "automation.chestbuffer.tier.00", "Ultra Low Voltage Chest Buffer", 0).getStackForm(1L));