diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-09-20 06:30:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-20 06:30:22 +0200 |
commit | 944ed365b393da674cb997c695102a30965cd015 (patch) | |
tree | 09553de574eeb094ae397de58a9235eaad5b0ea7 /src/main/java/gregtech/common/items | |
parent | 371dcdb8fd8a8ab17b887385981f5858a0f87af9 (diff) | |
parent | c58d6ccefa1f9a0ba29a853567d479ce60dff3f4 (diff) | |
download | GT5-Unofficial-944ed365b393da674cb997c695102a30965cd015.tar.gz GT5-Unofficial-944ed365b393da674cb997c695102a30965cd015.tar.bz2 GT5-Unofficial-944ed365b393da674cb997c695102a30965cd015.zip |
Merge branch 'experimental' into beefix
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 6 | ||||
-rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index d61e89dfac..ef17e4f433 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -186,7 +186,11 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Shape_Mold_Rod_Long.set(addItem(tLastID = 323, "Mold (Long Rod)", "Mold for making Long Rods", new Object[0])); ItemList.Shape_Mold_Rotor.set(addItem(tLastID = 324, "Mold (Rotor)", "Mold for making a Rotor", new Object[0])); ItemList.Shape_Mold_Turbine_Blade.set(addItem(tLastID = 325, "Mold (Turbine Blade)", "Mold for making a Turbine Blade", new Object[0])); - + ItemList.Shape_Mold_Pipe_Tiny.set(addItem(tLastID = 326, "Mold (Tiny Pipe)", "Mold for making tiny Pipes", new Object[0])); + ItemList.Shape_Mold_Pipe_Small.set(addItem(tLastID = 327, "Mold (Small Pipe)", "Mold for making small Pipes", new Object[0])); + ItemList.Shape_Mold_Pipe_Medium.set(addItem(tLastID = 328, "Mold (Normal Pipe)", "Mold for making Pipes", new Object[0])); + ItemList.Shape_Mold_Pipe_Large.set(addItem(tLastID = 329, "Mold (Large Pipe)", "Mold for making large Pipes", new Object[0])); + ItemList.Shape_Mold_Pipe_Huge.set(addItem(tLastID = 330, "Mold (Huge Pipe)", "Mold for making full Block Pipes", new Object[0])); GT_ModHandler.removeRecipe(new ItemStack[]{new ItemStack(Blocks.glass), null, new ItemStack(Blocks.glass), null, new ItemStack(Blocks.glass)}); //GT_ModHandler.addCraftingRecipe(ItemList.Shape_Mold_Credit.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"h ", aTextShape, aTextEmptyRow, 'P', ItemList.Shape_Empty}); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index c3691d96f4..c66671c44f 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -363,6 +363,7 @@ public class ItemComb extends Item { addProcessEV(tComb,Materials.Titanium,90); addProcessEV(tComb,Materials.Ilmenite,80); addProcessEV(tComb,Materials.Bauxite,75); + addProcessEV(tComb,Materials.Rutile,75); tComb = getStackForType(CombType.MAGNESIUM); addProcessLV(tComb,Materials.Magnesium,100); addProcessLV(tComb,Materials.Magnesite,80); |