diff --git a/assets/opencomputers/recipes/default.recipes b/assets/opencomputers/recipes/default.recipes index 765545d59..2027fadc4 100644 --- a/assets/opencomputers/recipes/default.recipes +++ b/assets/opencomputers/recipes/default.recipes @@ -19,6 +19,16 @@ ram3 { input: [["oc:circuitElite", "oc:circuitElite", "oc:circuitElite"] ["oc:craftingRAMAdvanced", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMAdvanced"]] } +ram4 { + input: [["oc:circuitElite", emerald, "oc:circuitElite"] + ["oc:craftingRAMElite", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMElite"] + ["oc:circuitElite", "", "oc:circuitElite"]] +} +ram5 { + input: [["oc:circuitElite", netherStar, "oc:circuitElite"] + ["oc:craftingRAMElite2", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMElite2"] + ["oc:circuitElite", "", "oc:circuitElite"]] +} floppy { input: [[nuggetIron, lever, nuggetIron] diff --git a/assets/opencomputers/recipes/gregtech.recipes b/assets/opencomputers/recipes/gregtech.recipes index 6d0ea59c1..f44017a72 100644 --- a/assets/opencomputers/recipes/gregtech.recipes +++ b/assets/opencomputers/recipes/gregtech.recipes @@ -24,6 +24,16 @@ ram3 { ["oc:craftingRAMAdvanced", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMAdvanced"] [Dataorb, craftingToolWrench, Dataorb]] } +ram4 { + input: [["oc:circuitElite", emerald, "oc:circuitElite"] + ["oc:craftingRAMElite", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMElite"] + [Dataorb, craftingToolWrench, Dataorb]] +} +ram5 { + input: [["oc:circuitElite", netherStar, "oc:circuitElite"] + ["oc:craftingRAMElite2", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMElite2"] + [Dataorb, craftingToolWrench, Dataorb]] +} floppy { input: [[screwAluminium, lever, screwAluminium] diff --git a/li/cil/oc/Items.scala b/li/cil/oc/Items.scala index 7c553bb56..4a0c7efe6 100644 --- a/li/cil/oc/Items.scala +++ b/li/cil/oc/Items.scala @@ -140,6 +140,8 @@ object Items { register("oc:craftingRAMBasic", ram1.createItemStack()) register("oc:craftingRAMAdvanced", ram2.createItemStack()) register("oc:craftingRAMElite", ram3.createItemStack()) + register("oc:craftingRAMElite2", ram4.createItemStack()) + register("oc:craftingRAMElite3", ram5.createItemStack()) register("oc:craftingHDDBasic", hdd1.createItemStack()) register("oc:craftingHDDAdvanced", hdd2.createItemStack()) register("oc:craftingHDDElite", hdd3.createItemStack()) diff --git a/li/cil/oc/Recipes.scala b/li/cil/oc/Recipes.scala index ee689c267..7cffe689f 100644 --- a/li/cil/oc/Recipes.scala +++ b/li/cil/oc/Recipes.scala @@ -56,6 +56,8 @@ object Recipes { addRecipe(Items.ram1.createItemStack(), recipes, "ram1") addRecipe(Items.ram2.createItemStack(), recipes, "ram2") addRecipe(Items.ram3.createItemStack(), recipes, "ram3") + addRecipe(Items.ram4.createItemStack(), recipes, "ram4") + addRecipe(Items.ram5.createItemStack(), recipes, "ram5") addRecipe(Items.floppyDisk.createItemStack(), recipes, "floppy") addRecipe(Items.hdd1.createItemStack(), recipes, "hdd1")