aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-08-01 10:19:12 +0200
committerDream-Master <dream-master@gmx.net>2017-08-01 10:19:12 +0200
commit1ceb02303dbb0952618f7fe01028871934a9cb00 (patch)
tree827a6f3055e797b5c884e2c8f78dcca3a8c52c28 /src/main/java/gregtech/loaders/preload
parenta3265450b750907ba36c4e8d78dd65b188a47682 (diff)
parentfe11172e01fcc378f9979c41de598c2255e80064 (diff)
downloadGT5-Unofficial-1ceb02303dbb0952618f7fe01028871934a9cb00.tar.gz
GT5-Unofficial-1ceb02303dbb0952618f7fe01028871934a9cb00.tar.bz2
GT5-Unofficial-1ceb02303dbb0952618f7fe01028871934a9cb00.zip
Merge branch 'experimental-test' into experimental
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java4
1 files changed, 4 insertions, 0 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 0a6f083724..549a3986fc 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -1448,6 +1448,10 @@ 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", 5700, 1);
+ generateItemPipes(Materials.Cobalt, Materials.Cobalt.mName, "Cobalt", 5710, 2);
+ generateItemPipes(Materials.Aluminium, Materials.Aluminium.mName, "Aluminium", 5720, 2);
+
ItemList.Automation_ChestBuffer_ULV.set(new GT_MetaTileEntity_ChestBuffer(9230, "automation.chestbuffer.tier.00", "Ultra Low Voltage Chest Buffer", 0).getStackForm(1L));
ItemList.Automation_ChestBuffer_LV.set(new GT_MetaTileEntity_ChestBuffer(9231, "automation.chestbuffer.tier.01", "Low Voltage Chest Buffer", 1).getStackForm(1L));