From: BlockMen <nmuelll@web.de>
Date: Tue, 16 Sep 2014 17:12:31 +0000 (+0200)
Subject: Fix dye stuff, fixes #243
X-Git-Tag: 0.4.11~48
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4969665e75e80e378d696b48d451a245e54d81f;p=oweals%2Fminetest_game.git

Fix dye stuff, fixes #243
---

diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index 026a31c0..3d2cb113 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -19,6 +19,7 @@ minetest.register_craftitem("default:book", {
 minetest.register_craftitem("default:coal_lump", {
 	description = "Coal Lump",
 	inventory_image = "default_coal_lump.png",
+	groups = {coal = 1}
 })
 
 minetest.register_craftitem("default:iron_lump", {
diff --git a/mods/dye/init.lua b/mods/dye/init.lua
index ebdc9380..810502d2 100644
--- a/mods/dye/init.lua
+++ b/mods/dye/init.lua
@@ -73,7 +73,7 @@ dyelocal.dyes = {
 	{"dark_green", "Dark green dye",{dye=1, basecolor_green=1,   excolor_green=1,     unicolor_dark_green=1}},
 	{"green",      "Green dye",     {dye=1, basecolor_green=1,   excolor_green=1,     unicolor_green=1}},
 	{"yellow",     "Yellow dye",    {dye=1, basecolor_yellow=1,  excolor_yellow=1,    unicolor_yellow=1}},
-	{"brown",      "Brown dye",     {dye=1, basecolor_yellow=1,  excolor_orange=1,    unicolor_dark_orange=1}},
+	{"brown",      "Brown dye",     {dye=1, basecolor_brown=1,   excolor_orange=1,    unicolor_dark_orange=1}},
 	{"orange",     "Orange dye",    {dye=1, basecolor_orange=1,  excolor_orange=1,    unicolor_orange=1}},
 	{"red",        "Red dye",       {dye=1, basecolor_red=1,     excolor_red=1,       unicolor_red=1}},
 	{"magenta",    "Magenta dye",   {dye=1, basecolor_magenta=1, excolor_red_violet=1,unicolor_red_violet=1}},
@@ -98,6 +98,12 @@ for _, row in ipairs(dyelocal.dyes) do
 		recipe = {"group:flower,color_"..name},
 	})
 end
+-- manually add coal->black dye
+minetest.register_craft({
+	type = "shapeless",
+	output = "dye:black 4",
+	recipe = {"group:coal"},
+})
 
 -- Mix recipes
 -- Just mix everything to everything somehow sanely