Merge remote-tracking branch 'upstream/master'

init.lua

@@ -141,37 +141,7 @@ minetest.register_craft({
 	recipe = "default:clay",
 })
 
--- register a few extra dye colour options
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "dye:dark_grey 3",
-	recipe = {"dye:black", "dye:black", "dye:white"}
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "dye:green 4",
-	recipe = {"default:cactus"}
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "dye:brown 4",
-	recipe = {"default:dry_shrub"}
-})
-
--- only add light grey recipe if unifieddye mod isnt present (conflict)
-if not minetest.get_modpath("unifieddyes") then
-
-	minetest.register_craft( {
-		type = "shapeless",
-		output = "dye:grey 3",
-		recipe = {"dye:black", "dye:white", "dye:white"}
-	})
-end
-
--- 2x2 red baked clay makes 16x clay brick
+-- 2x2 red bakedclay makes 16x clay brick
 minetest.register_craft( {
 	output = "default:clay_brick 16",
 	recipe = {
@@ -405,6 +375,7 @@ end
 
 end
 
+
 -- flowerpot mod
 
 if minetest.get_modpath("flowerpot") then
@@ -414,5 +385,4 @@ if minetest.get_modpath("flowerpot") then
 	flowerpot.register_node("bakedclay:mannagrass")
 end
 
-
-print ("[MOD] Baked Clay loaded")
+minetest.log("action", "[MOD] Baked Clay loaded.")