From 87f25f7a0da03acb8d196c06e18d7197310bb46e Mon Sep 17 00:00:00 2001
From: Jean-Patrick Guerrero <jeanpatrick.guerrero@gmail.com>
Date: Tue, 15 Mar 2016 17:52:58 +0100
Subject: [PATCH] Drop and alias flint-and-steel (merged in Minetest Game)

---
 craftitems.lua                  |  22 +---------------------
 recipes.lua                     |   7 -------
 textures/xdecor_flint_steel.png | Bin 196 -> 0 bytes
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 textures/xdecor_flint_steel.png

diff --git a/craftitems.lua b/craftitems.lua
index f4e3100..e189a66 100644
--- a/craftitems.lua
+++ b/craftitems.lua
@@ -21,27 +21,7 @@ minetest.register_craftitem("xdecor:bowl_soup", {
 	end
 })
 
-if rawget(_G, "fire") then
-	minetest.register_tool("xdecor:flint_steel", {
-		description = "Flint & Steel",
-		inventory_image = "xdecor_flint_steel.png",
-		on_use = function(itemstack, user, pointed_thing)
-			local player = user:get_player_name()
-			local pt = pointed_thing
-
-			if pt.type == "node" and minetest.get_node(pt.above).name == "air" then
-				if not minetest.is_protected(pt.above, player) then
-					minetest.set_node(pt.above, {name="fire:basic_flame"})
-				else
-					minetest.chat_send_player(player, "[!] This area is protected")
-				end
-			end
-
-			itemstack:add_wear(2000)
-			return itemstack
-		end
-	})
-end
+minetest.register_alias("xdecor:flint_steel", "fire:flint_and_steel")
 
 minetest.register_tool("xdecor:hammer", {
 	description = "Hammer",
diff --git a/recipes.lua b/recipes.lua
index 36ec58d..d30d521 100644
--- a/recipes.lua
+++ b/recipes.lua
@@ -145,13 +145,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "xdecor:flint_steel",
-	recipe = {
-		{"default:obsidian_shard", "default:steel_ingot"}
-	}
-})
-
 minetest.register_craft({
 	output = "xdecor:frame",
 	recipe = {
diff --git a/textures/xdecor_flint_steel.png b/textures/xdecor_flint_steel.png
deleted file mode 100644
index ce7fabc21ecfc27018a65273e3618d4c3f41e262..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=3blR!&Y%=0-Zz)zu;*
zB2%VJS-W<vmy2C_QBHn-er8H+bXdR<wE&P(#*!evU<QY0H`0I{Z%-G;5RU7~2iPPM
zc_bNE9GJ(Tk?h7WS->NpYSYS!SxgfYGjl=~F(r9OtX40yWRw)_Rb}$&a$w625IS>U
mN~-|d<VC_~a$MJhF*6)J#`$<dru#FXu?(KBelF{r5}E)CzB+>d