diff options
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/build.properties b/build.properties index e4a4a8da3d..ae791aac31 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.22.41 +gt.version=5.09.22.42 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index b012706636..9524842a79 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -299,6 +299,49 @@ public class GT_CraftingRecipeLoader GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(5L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Brass), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Zinc)}); GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(6L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Brass), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(8L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(8L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Zinc)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(8L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(10L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(10L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Zinc)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(10L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Aluminium)}); + + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(12L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AnnealedCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(12L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.RoseGold)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(12L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AstralSilver)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(14L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AnnealedCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(14L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.RoseGold)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(14L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AstralSilver)}); + + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(16L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.HSSG), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AnnealedCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(16L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.HSSG), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.RoseGold)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(16L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.HSSG), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AstralSilver)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(18L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.HSSE), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AnnealedCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(18L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.HSSE), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.RoseGold)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(18L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.HSSE), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AstralSilver)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(20L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.HSSS), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AnnealedCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(20L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.HSSS), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.RoseGold)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(20L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.HSSS), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.AstralSilver)}); + + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(22L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Naquadah), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.HSSG)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(24L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Naquadah), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.HSSE)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(26L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Naquadah), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.HSSS)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(28L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.NaquadahAlloy), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Osmiridium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.HSSE)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(30L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.NaquadahAlloy), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Osmiridium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.HSSG)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(32L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.NaquadahAlloy), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Osmiridium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.HSSS)}); + + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(34L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.EnergeticAlloy), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Naquadah)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(36L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.EnergeticAlloy), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.NaquadahAlloy)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(38L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.EnergeticAlloy), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Draconium)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(40L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.BlackPlutonium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Sunnarium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Naquadah)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(42L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.BlackPlutonium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Sunnarium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.NaquadahAlloy)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(44L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.BlackPlutonium), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Sunnarium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Draconium)}); + + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(48L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.DraconiumAwakened), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.HSSS)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(52L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.DraconiumAwakened), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.Naquadah)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(56L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.DraconiumAwakened), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.NaquadahAlloy)}); + GT_ModHandler.addCraftingRecipe(ItemList.IC2_Mixed_Metal_Ingot.get(64L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"X", "Y", "Z", Character.valueOf('X'), OrePrefixes.plate.get(Materials.DraconiumAwakened), Character.valueOf('Y'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('Z'), OrePrefixes.plate.get(Materials.BlackPlutonium)}); + GT_Log.out.println("GT_Mod: Adding Rolling Machine Recipes."); GT_ModHandler.addRollingMachineRecipe(ItemList.RC_Rail_Standard.get(4L, new Object[0]), new Object[]{"X X", "X X", "X X", Character.valueOf('X'), OrePrefixes.ingot.get(Materials.Aluminium).toString()}); GT_ModHandler.addRollingMachineRecipe(ItemList.RC_Rail_Standard.get(32L, new Object[0]), new Object[]{"X X", "X X", "X X", Character.valueOf('X'), OrePrefixes.ingot.get(Materials.Titanium).toString()}); |