diff options
author | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
---|---|---|
committer | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
commit | 8928f78ee6305e29ed8d3b9395fcb6564c984fdf (patch) | |
tree | cd250c2b98d7131158e3744efe238780cec73fec /signs_road/crafts.lua | |
parent | eccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff) | |
parent | a3e0d36a68247cac40349d9089fe3c71546d75e8 (diff) | |
download | display_modpack-master.tar.gz display_modpack-master.tar.bz2 display_modpack-master.zip |
Resolved conflicts by reordering of files
Diffstat (limited to 'signs_road/crafts.lua')
-rw-r--r-- | signs_road/crafts.lua | 130 |
1 files changed, 111 insertions, 19 deletions
diff --git a/signs_road/crafts.lua b/signs_road/crafts.lua index 3c15437..314a91a 100644 --- a/signs_road/crafts.lua +++ b/signs_road/crafts.lua @@ -19,57 +19,54 @@ along with signs_road. If not, see <http://www.gnu.org/licenses/>. --]] +-- Standard rectangle signs + minetest.register_craft({ - output = 'signs_road:blue_street_sign 2', + output = 'signs_road:white_sign 2', recipe = { - {'dye:blue', 'dye:white', ''}, + {'dye:white', 'dye:black', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:red_street_sign 2', + output = 'signs_road:blue_sign 2', recipe = { - {'dye:white', 'dye:red', ''}, + {'dye:blue', 'dye:white', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:white_street_sign 2', + output = 'signs_road:green_sign 2', recipe = { - {'dye:white', 'dye:black', ''}, + {'dye:green', 'dye:white', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - type = "shapeless", - output = 'signs_road:large_street_sign', - recipe = {'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign'}, -}) - -minetest.register_craft({ - output = 'signs_road:green_street_sign 2', + output = 'signs_road:yellow_sign 2', recipe = { - {'dye:green', 'dye:white', ''}, + {'dye:yellow', 'dye:black', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:yellow_street_sign 2', + output = 'signs_road:red_sign 2', recipe = { - {'dye:yellow', 'dye:black', ''}, + {'dye:red', 'dye:white', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) +-- Standard direction signs minetest.register_craft({ output = 'signs_road:black_right_sign 2', @@ -81,6 +78,24 @@ minetest.register_craft({ }) minetest.register_craft({ + output = 'signs_road:white_right_sign 2', + recipe = { + {'dye:white', 'dye:black', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', ''}, + {'', '', ''}, + } +}) + +minetest.register_craft({ + output = 'signs_road:blue_right_sign 2', + recipe = { + {'dye:blue', 'dye:white', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', ''}, + {'', '', ''}, + } +}) + +minetest.register_craft({ output = 'signs_road:green_right_sign 2', recipe = { {'dye:green', 'dye:white', 'default:steel_ingot'}, @@ -92,18 +107,95 @@ minetest.register_craft({ minetest.register_craft({ output = 'signs_road:yellow_right_sign 2', recipe = { - {'dye:yellow', 'dye:white', 'default:steel_ingot'}, + {'dye:yellow', 'dye:black', 'default:steel_ingot'}, {'default:steel_ingot', 'default:steel_ingot', ''}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:white_right_sign 2', + output = 'signs_road:red_right_sign 2', recipe = { - {'dye:white', 'dye:black', 'default:steel_ingot'}, + {'dye:red', 'dye:white', 'default:steel_ingot'}, {'default:steel_ingot', 'default:steel_ingot', ''}, {'', '', ''}, } }) +-- Transform Rectangle <-> Direction + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:white_right_sign', + recipe = {'signs_road:white_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:white_sign', + recipe = {'signs_road:white_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:blue_right_sign', + recipe = {'signs_road:blue_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:blue_sign', + recipe = {'signs_road:blue_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:green_right_sign', + recipe = {'signs_road:green_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:green_sign', + recipe = {'signs_road:green_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:yellow_right_sign', + recipe = {'signs_road:yellow_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:yellow_sign', + recipe = {'signs_road:yellow_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:red_right_sign', + recipe = {'signs_road:red_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:red_sign', + recipe = {'signs_road:red_right_sign'}, +}) + +-- Various signs + +minetest.register_craft({ + output = 'signs_road:blue_street_sign 4', + recipe = { + {'dye:blue', 'dye:white', 'dye:blue'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + } +}) + +minetest.register_craft({ + output = 'signs_road:red_street_sign 2', + recipe = { + {'dye:white', 'dye:red', 'dye:black'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'', '', ''}, + } +}) + +minetest.register_craft({ + type = "shapeless", + output = 'signs_road:large_street_sign', + recipe = {'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign'}, +}) |