Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

init.lua

@@ -100,41 +100,6 @@ 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"}
-})
-
--- 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
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "dye:green 4",
-	recipe = {"default:cactus"}
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "dye:black 4",
-	recipe = {"default:coal_lump"}
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "dye:brown 4",
-	recipe = {"default:dry_shrub"}
-})
-
 -- 2x2 red bakedclay makes 16x clay brick
 minetest.register_craft( {
 	output = "default:clay_brick 16",
@@ -300,7 +265,6 @@ lucky_block:add_blocks({
 })
 end
 
-
 -- colored clay compatibility
 if minetest.settings:get_bool("colored_clay_compatibility") == true then
 
@@ -338,5 +302,4 @@ end
 
 end
 
-
+minetest.log("action", "[MOD] Baked Clay loaded.")
-print ("[MOD] Baked Clay loaded")