Merge remote-tracking branch 'upstream/master'

init.lua

@@ -163,33 +163,6 @@ minetest.register_craft({
 	recipe = "default:clay"
 })
 
--- register a few extra dye colour options
-
-minetest.register_craft({
-	output = "dye:green 4",
-	recipe = {{"default:cactus"}}
-})
-
-minetest.register_craft({
-	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( {
-		output = "dye:dark_grey 3",
-		recipe = {{"dye:black", "dye:black", "dye:white"}}
-	})
-
-	minetest.register_craft( {
-		output = "dye:grey 3",
-		recipe = {{"dye:black", "dye:white", "dye:white"}}
-	})
-end
-
 -- 2x2 red baked clay makes 16x clay brick
 
 minetest.register_craft( {