AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 10:51:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

completed recipes

Browse Source
This commit is contained in:
Johannes Lohrer 2013-12-28 19:31:40 +01:00
parent 53ae80914c
commit f79194c419
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/opencomputers/recipes/default.recipes
View File

@ -67,13 +67,13 @@ wlanCard {
}
craftingUpgrade {
input: [[ingotIron, pistonBase, ingotIron]
input: [[ingotIron, craftingPiston, ingotIron]
["oc:circuitBasic", workbench, "oc:circuitBasic"]
[ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
}
generatorUpgrade {
input: [[ingotIron, "", ingotIron]
["oc:circuitBasic", pistonBase, "oc:circuitBasic"]
["oc:circuitBasic", craftingPiston, "oc:circuitBasic"]
["oc:craftingCircuitBoardPrinted", ingotIron, "oc:craftingCircuitBoardPrinted"]]
}
navigationUpgrade {
@ -83,12 +83,12 @@ navigationUpgrade {
}
signUpgrade {
input: [[ingotIron, dyePowder, ingotIron]
["oc:circuitAdvanced", stickWood, "oc:circuitAdvanced"]
["oc:circuitBasic", stickWood, "oc:circuitBasic"]
[ingotIron, pistonStickyBase, ingotIron]]
}
solarGeneratorUpgrade {
input: [[glass, glass, glass]
["oc:circuitAdvanced", "oc:craftingGenerator", "oc:circuitAdvanced"]]
["oc:circuitElite", "oc:craftingGenerator", "oc:circuitElite"]]
}
nuggetIron {

33
assets/opencomputers/recipes/gregtech.recipes
View File

@ -75,23 +75,22 @@ generatorUpgrade {
["oc:circuitAdvanced",craftingGenerator , "oc:circuitAdvanced"]
[screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]]
}
#todo
#navigationUpgrade {
# input: [[ingotGold, compass, ingotGold]
# ["oc:circuitElite", {item=map, subID=32767}, "oc:circuitElite"]
# [ingotGold, potion, ingotGold]]
#}
#todo
#signUpgrade {
# input: [[ingotIron, dyePowder, ingotIron]
# ["oc:circuitAdvanced", stickWood, "oc:circuitAdvanced"]
# [ingotIron, pistonStickyBase, ingotIron]]
#}
#todo
#solarGeneratorUpgrade {
# input: [[glass, glass, glass]
# ["oc:circuitAdvanced", "oc:craftingGenerator", "oc:circuitAdvanced"]]
#}
navigationUpgrade {
input: [[craftingRawMachineTier02, compass, screwStainlessSteel]
["oc:circuitElite", {item=map, subID=any}, "oc:circuitElite"]
[screwStainlessSteel, potion, craftingToolScrewdriver]]
}
signUpgrade {
input: [[screwAluminium, dyePowder, screwAluminium]
["oc:circuitBasic", stickWood, "oc:circuitBasic"]
[screwAluminium, craftingToolScrewdriver, screwAluminium]]
}
solarGeneratorUpgrade {
input: [[screwTitanium, "", screwTitanium]
["oc:circuitElite", {item=tile.GT_Components,subID=7} , "oc:circuitElite"]
[screwTitanium, craftingToolScrewdriver, screwTitanium]]
}
cuttingWire {

2
li/cil/oc/Recipes.scala
View File

@ -248,7 +248,7 @@ object Recipes {
}
}
}
case other => throw new RecipeException("Invalid ingredient type (not a map or string): "+other)
case other => throw new RecipeException("Invalid ingredient type (not a map or string): " + other)
}
private def itemNameEquals(item: Item, name: String) =