diff options
author | Technus <daniel112092@gmail.com> | 2017-05-01 08:22:05 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-05-01 08:22:05 +0200 |
commit | cb0f1d4d2c705676de231272cd731a319071c0ac (patch) | |
tree | 8acf54c21a000f12191bd25126761bac8ea5584c /src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java | |
parent | c12e474c23ca02fb3479312850f6ae07e623d8b9 (diff) | |
parent | 417d45d2578402d9bb6406e2622d9261a4c25cf4 (diff) | |
download | GT5-Unofficial-cb0f1d4d2c705676de231272cd731a319071c0ac.tar.gz GT5-Unofficial-cb0f1d4d2c705676de231272cd731a319071c0ac.tar.bz2 GT5-Unofficial-cb0f1d4d2c705676de231272cd731a319071c0ac.zip |
Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java')
-rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index b006872c3f..63b4c50473 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -30,8 +30,8 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi break; case "Basic": GT_ModHandler.removeRecipeByOutput(aStack); - GT_ModHandler.addCraftingRecipe(aStack, new Object[]{"RIR","VBV","CCC",'R',ItemList.Circuit_Parts_Resistor.get(1,new Object[0]),'C',GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1),'V', ItemList.Circuit_Parts_Vacuum_Tube.get(1,new Object[0]),'B',ItemList.Circuit_Board_Coated.get(1,new Object[0]),'I',ItemList.IC2_Item_Casing_Steel.get(1,new Object[0])}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Circuit_Basic.get(1L, new Object[0]), new Object[]{ItemList.Circuit_Integrated.getWildcard(1L, new Object[0])}); + GT_ModHandler.addCraftingRecipe(aStack, new Object[]{"RIR","VBV","CCC",'R',ItemList.Circuit_Parts_Resistor.get(1,new Object[0]),'C',GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1),'V', ItemList.Circuit_Parts_Vacuum_Tube.get(1,new Object[0]),'B',ItemList.Circuit_Board_Coated_Basic.get(1,new Object[0]),'I',ItemList.IC2_Item_Casing_Steel.get(1,new Object[0])}); + GT_ModHandler.addShapelessCraftingRecipe(GT_ModHandler.getIC2Item("electronicCircuit", 1L), new Object[]{ItemList.Circuit_Integrated.getWildcard(1L, new Object[0])}); break; case "Advanced": GT_ModHandler.removeRecipeByOutput(aStack); |