merge upstream

src/recipes.lua

@@ -276,13 +276,14 @@ minetest.register_craft({
 	}
 })
 	
---minetest.register_craft({
---	output = "xdecor:stone_tile 2",
---	recipe = {
---		{"default:cobble", "default:cobble"},
---		{"default:cobble", "default:cobble"}
---	}
---})
+minetest.register_craft({
+	output = "xdecor:stone_tile 2",
+	recipe = {
+		{"default:stone", "", "default:stone"},
+        {"", "", ""},
+		{"default:stone", "", "default:stone"}
+	}
+})
 	
 --minetest.register_craft({
 --	output = "xdecor:stone_rune 4",