Don't crash on nil-player in can_dig and check the right players for attachment in...

[xdecor.git] / recipes.lua

diff --git a/recipes.lua b/recipes.lua
index bdc22e3dafc556049fb3924480b5ff321fea32de..33ea2c8fe5cc1dccb3c26fe35f686c3d8f664f5f 100644 (file)
--- a/recipes.lua
+++ b/recipes.lua
@@ -47,24 +47,10 @@ minetest.register_craft({
        }
 })
 
-minetest.register_craft({ 
-       output = "realchess:chessboard",
-       recipe = {
-               {"dye:black", "dye:white", "dye:black"},
-               {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood"}
-       } 
-})
-
-minetest.register_craft({ 
-       output = "xdecor:crafting_guide",
-       type = "shapeless",
-       recipe = {"default:book", "dye:blue"}
-})
-
 minetest.register_craft({
-       output = "xdecor:cushion 3",
+       output = "xdecor:cactusbrick",
        recipe = {
-               {"wool:red", "wool:red", "wool:red"}
+               {"default:brick", "default:cactus"}
        }
 })
 
@@ -77,6 +63,14 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({ 
+       output = "realchess:chessboard",
+       recipe = {
+               {"dye:black", "dye:white", "dye:black"},
+               {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood"}
+       } 
+})
+
 minetest.register_craft({
        output = "xdecor:chair",
        recipe = {
@@ -95,27 +89,32 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = "xdecor:cobble_wall_ln 6",
+       output = "xdecor:cobweb",
        recipe = {
-               {"default:cobble", "default:cobble", "default:cobble"},
-               {"default:cobble", "default:cobble", "default:cobble"}
+               {"farming:cotton", "", "farming:cotton"},
+               {"", "farming:cotton", ""},
+               {"farming:cotton", "", "farming:cotton"}
        }
 })
 
+minetest.register_craft({ 
+       output = "xdecor:crafting_guide",
+       type = "shapeless",
+       recipe = {"default:book"}
+})
+
 minetest.register_craft({
-       output = "xdecor:mossycobble_wall_ln 6",
+       output = "xdecor:cushion 3",
        recipe = {
-               {"default:mossycobble", "default:mossycobble", "default:mossycobble"},
-               {"default:mossycobble", "default:mossycobble", "default:mossycobble"}
+               {"wool:red", "wool:red", "wool:red"}
        }
 })
 
 minetest.register_craft({
-       output = "xdecor:cobweb",
+       output = "xdecor:cushion_block",
        recipe = {
-               {"farming:cotton", "", "farming:cotton"},
-               {"", "farming:cotton", ""},
-               {"farming:cotton", "", "farming:cotton"}
+               {"xdecor:cushion"},
+               {"xdecor:cushion"}
        }
 })
 
@@ -155,14 +154,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = "xdecor:flint_steel",
-       recipe = {
-               {"default:obsidian_shard", "default:steel_ingot"}
-       }
-})
-
-minetest.register_craft({
-       output = "xdecor:frame",
+       output = "xdecor:itemframe",
        recipe = {
                {"group:stick", "group:stick", "group:stick"},
                {"group:stick", "default:paper", "group:stick"},
@@ -238,6 +230,13 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = "xdecor:moonbrick",
+       recipe = {
+               {"default:brick", "default:stone"}
+       }
+})
+
 minetest.register_craft({
        output = "xdecor:multishelf",
        recipe = {
@@ -258,7 +257,7 @@ minetest.register_craft({
 minetest.register_craft({
        output = "xdecor:painting_1",
        recipe = {
-               {"default:sign_wall", "dye:blue"}
+               {"default:sign_wall_wood", "dye:blue"}
        }
 })
 
@@ -269,7 +268,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = "xdecor:pressure_wooden_off",
+       output = "xdecor:pressure_wood_off",
        type = "shapeless",
        recipe = {"group:wood", "group:wood"}
 })
@@ -325,6 +324,15 @@ minetest.register_craft({
        } 
 })
 
+minetest.register_craft({
+       output = "xdecor:trampoline",
+       recipe = {
+               {"farming:string", "farming:string", "farming:string"},
+               {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+               {"default:steel_ingot", "", "default:steel_ingot"}
+       }
+})
+
 minetest.register_craft({
        output = "xdecor:tv",
        recipe = {