diff --git a/assets/opencomputers/recipes/default.recipes b/assets/opencomputers/recipes/default.recipes index 0bb14ece7..765545d59 100644 --- a/assets/opencomputers/recipes/default.recipes +++ b/assets/opencomputers/recipes/default.recipes @@ -43,7 +43,7 @@ hdd3 { graphicsCard1 { input: [["oc:circuitBasic", "oc:craftingALU", "oc:craftingRAMBasic"] - ["", "oc:craftingCircuitBoardPrinted", ""]] + ["", "oc:craftingCard", ""]] } graphicsCard2 { input: [["oc:circuitAdvanced", "oc:circuitAdvanced", "oc:craftingRAMAdvanced"] @@ -55,11 +55,11 @@ graphicsCard3 { } redstoneCard { input: [[torchRedstoneActive, "oc:circuitBasic", ""] - ["", "oc:craftingCircuitBoardPrinted", ""]] + ["", "oc:craftingCard", ""]] } lanCard { input: [["oc:craftingCable", "oc:circuitBasic", ""] - ["", "oc:craftingCircuitBoardPrinted", ""]] + ["", "oc:craftingCard", ""]] } wlanCard { input: [[enderPearl, "oc:circuitAdvanced", ""] diff --git a/assets/opencomputers/recipes/gregtech.recipes b/assets/opencomputers/recipes/gregtech.recipes index 1eab83bf4..6d0ea59c1 100644 --- a/assets/opencomputers/recipes/gregtech.recipes +++ b/assets/opencomputers/recipes/gregtech.recipes @@ -46,18 +46,19 @@ hdd3 { [screwTungstenSteel , craftingToolScrewdriver, screwTungstenSteel]] } +# graphicsCard1 { fallback to default } +# graphicsCard2 { fallback to default } +# graphicsCard3 { fallback to default } redstoneCard { input: [[screwStainlessSteel , "oc:circuitAdvanced" , screwStainlessSteel] - ["comparator", "oc:craftingCircuitBoardPrinted", diode] + ["comparator", "oc:craftingCard", diode] [screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]] } - lanCard { input: [[screwStainlessSteel , "oc:circuitAdvanced" , screwStainlessSteel] - ["oc:craftingCable", "oc:craftingCircuitBoardPrinted", "oc:craftingCable"] + ["oc:craftingCable", "oc:craftingCard", "oc:craftingCable"] [screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]] } - wlanCard { input: [[screwTitanium , "oc:circuitElite" , screwTitanium] [{item="item.GT_Components", subID=84}, "oc:componentCardLan", {item="item.GT_Components", subID=82}] @@ -69,7 +70,6 @@ craftingUpgrade { ["oc:circuitAdvanced", {item=tile.BlockMetaID_Machine, subID=16}, "oc:circuitAdvanced"] [screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]] } - generatorUpgrade { input: [[screwStainlessSteel, "oc:craftingCircuitBoardPrinted" , screwStainlessSteel] ["oc:circuitAdvanced", craftingGenerator, "oc:circuitAdvanced"] @@ -85,7 +85,6 @@ signUpgrade { ["oc:circuitBasic", stickWood, "oc:circuitBasic"] [screwAluminium, craftingToolScrewdriver, screwAluminium]] } - solarGeneratorUpgrade { input: [[screwTitanium, "", screwTitanium] ["oc:circuitElite", {item=GT_Components, subID=7} , "oc:circuitElite"] @@ -107,6 +106,10 @@ disk { ["", plateAluminium, ""]] } +# buttonGroup { fallback to default } +# arrowKeys { fallback to default } +# numPad { fallback to default } + transistor { type: assembly input: [redstone, {item="GT_Materials", subID=64}] @@ -161,6 +164,7 @@ cu { output: 3 } +# rawCircuitBoard { fallback to default } circuitBoard { type: furnace input: "oc:craftingCircuitBoardRaw" @@ -219,7 +223,7 @@ diskDrive { [craftingPiston, craftingRawMachineTier02, craftingLenseWhite] ["oc:circuitAdvanced", craftingToolWrench, "oc:circuitAdvanced"]] } - +# keyboard { fallback to default } powerConverter { input: [["", "oc:circuitAdvanced", ""] [plateAluminium, {item=Electric, subID=4}, plateAluminium] diff --git a/li/cil/oc/Items.scala b/li/cil/oc/Items.scala index a0f6f182f..e8105b118 100644 --- a/li/cil/oc/Items.scala +++ b/li/cil/oc/Items.scala @@ -120,6 +120,7 @@ object Items { register("oc:craftingCircuitBoardRaw", rawCircuitBoard.createItemStack()) register("oc:craftingCircuitBoard", circuitBoard.createItemStack()) register("oc:craftingCircuitBoardPrinted", pcb.createItemStack()) + register("oc:craftingCard", card.createItemStack()) register("oc:craftingWire", cuttingWire.createItemStack()) register("oc:circuitBasic", chip1.createItemStack()) register("oc:circuitAdvanced", chip2.createItemStack())