From 862ed82d2a0646d04ad278eafc51c9c96ce9f3ee Mon Sep 17 00:00:00 2001
From: Rui914 <mrrst0914@gmail.com>
Date: Sun, 15 Mar 2015 06:32:16 +0900
Subject: [PATCH] Revert "Add Charcoal"

This reverts commit d31bcc8ad2184d5153e8693af8f26c1d9b19ec6e.
---
 mods/default/aliases.lua                        |   1 -
 mods/default/crafting.lua                       |  10 ++--------
 mods/default/craftitems.lua                     |   6 ------
 mods/default/textures/default_charcoal_lump.png | Bin 239 -> 0 bytes
 4 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 mods/default/textures/default_charcoal_lump.png

diff --git a/mods/default/aliases.lua b/mods/default/aliases.lua
index 200c4a60..72477513 100644
--- a/mods/default/aliases.lua
+++ b/mods/default/aliases.lua
@@ -62,7 +62,6 @@ minetest.register_alias("Stick", "default:stick")
 minetest.register_alias("paper", "default:paper")
 minetest.register_alias("book", "default:book")
 minetest.register_alias("lump_of_coal", "default:coal_lump")
-minetest.register_alias("lump_of_charcoal", "default:charcoal_lump")
 minetest.register_alias("lump_of_iron", "default:iron_lump")
 minetest.register_alias("lump_of_clay", "default:clay_lump")
 minetest.register_alias("steel_ingot", "default:steel_ingot")
diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 044d8bab..71f00a7e 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -48,7 +48,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'default:torch 4',
 	recipe = {
-		{'group:coal'},
+		{'default:coal_lump'},
 		{'group:stick'},
 	}
 })
@@ -686,12 +686,6 @@ minetest.register_craft({
 	recipe = "default:clay_lump",
 })
 
-minetest.register_craft({
-	type = "cooking",
-	output = "default:charcoal",
-	recipe = "group:wood",
-})
-
 --
 -- Fuels
 --
@@ -806,7 +800,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "group:coal",
+	recipe = "default:coal_lump",
 	burntime = 40,
 })
 
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index 18e7c6d7..539f6b43 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -23,12 +23,6 @@ minetest.register_craftitem("default:coal_lump", {
 	groups = {coal = 1}
 })
 
-minetest.register_craftitem("default:charcoal_lump", {
-	description = "Charcoal Lump",
-	inventory_image = "default_charcoal_lump.png",
-	groups = {coal = 1}
-})
-
 minetest.register_craftitem("default:iron_lump", {
 	description = "Iron Lump",
 	inventory_image = "default_iron_lump.png",
diff --git a/mods/default/textures/default_charcoal_lump.png b/mods/default/textures/default_charcoal_lump.png
deleted file mode 100644
index 6bf013f09b2f92a03aa80fff09e09fc2fa123414..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=3blR-T@oj*gCDVPS4=
zZn^Ipi-DqyB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM<h@Mw=f7ZGR&GI0Tg5}@$_|N
zzt7Ca!mKdA^HLsAD9qEvF@)oKZtp?f1_K`E?uZ3~!VVG*M`9OLuzb7Us#dG`@cPMV
zZ-f4A>F~KR#k7}=KjNaF5>NVNTjAOaW(S!U%q-gvZQ}XBRp7MA@5P<sD?bxHRn{>s
X^yOma`L;V1Xaj?%tDnm{r-UW|{5nV;