From 2503d3d6a3bf9d83ffceb6c89df78099ebfee57b Mon Sep 17 00:00:00 2001
From: NathanSalapat <rendertracer@gmail.com>
Date: Thu, 19 May 2016 08:44:06 -0500
Subject: [PATCH] Some changes for the 0.4.14 release of Minetest.

---
 craftitems.lua                    |  10 --------
 crafts.lua                        |  15 ++++++-----
 nodes.lua                         |  41 +++++-------------------------
 textures/more_fire_flintstone.png | Bin 437 -> 0 bytes
 tools.lua                         |  12 ++++-----
 5 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 100644 textures/more_fire_flintstone.png

diff --git a/craftitems.lua b/craftitems.lua
index 458f40e..f369755 100644
--- a/craftitems.lua
+++ b/craftitems.lua
@@ -4,16 +4,6 @@ minetest.register_craftitem('more_fire:charcoal', {
 	groups = {coal = 1}
 })
 
-minetest.register_craftitem('more_fire:flintstone', {
-	description = 'Flintstone',
-	inventory_image = 'more_fire_flintstone.png',
-})
-
-minetest.register_craftitem('more_fire:lighter', {
-	description = 'Flint and Steel',
-	inventory_image = 'more_fire_lighter.png',
-})
-
 minetest.register_craftitem('more_fire:oil', {
 	description = 'lantern oil',
 	inventory_image = 'more_fire_oil.png',
diff --git a/crafts.lua b/crafts.lua
index 42bb412..fa1465d 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -107,12 +107,6 @@ minetest.register_craft({
 		}
 })
 
-minetest.register_craft({
-	type = 'shapeless',
-	output = 'more_fire:lighter 1',
-	recipe = {'more_fire:flintstone', 'default:steel_ingot'}
-})
-
 minetest.register_craft({
 	output = 'more_fire:oil_lamp_off 1',
 	recipe = {
@@ -127,6 +121,15 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'more_fire:lighter',
+	recipe = {
+		{'','','group:wood'},
+		{'','default:flint',''},
+		{'default:steel_ingot','',''},
+	}
+})
+
 -- cooking recipes
 minetest.register_craft({
 	type = 'cooking',
diff --git a/nodes.lua b/nodes.lua
index b0345bc..8ba3a43 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -1,18 +1,3 @@
-minetest.override_item('default:gravel', {
-	drop = {
-		max_items = 1,
-		items = {
-			{
-				items = {'more_fire:flintstone'},
-				rarity = 15,
-			},
-			{
-				items = {'default:gravel'},
-			}
-		}
-	},
-})
-
 minetest.register_node(':default:torch', {
 	description = 'Torch',
 	drawtype = 'nodebox',
@@ -155,12 +140,12 @@ minetest.register_node('more_fire:kindling', {
 		fixed = { -0.48, -0.5, -0.48, 0.48, 0.0, 0.48 },  
 		},
 	on_construct = function(pos)
-	 		local meta = minetest.env:get_meta(pos)
-	 		local inv = meta:get_inventory()
-			inv:set_size('fuel', 1)
-			inv:set_size("src", 1)
-			inv:set_size("dst", 2)
-		end,
+		local meta = minetest.env:get_meta(pos)
+		local inv = meta:get_inventory()
+		inv:set_size('fuel', 4)
+		inv:set_size("src", 1)
+		inv:set_size("dst", 2)
+	end,
 })
 
 minetest.register_node('more_fire:embers', {
@@ -172,7 +157,7 @@ minetest.register_node('more_fire:embers', {
 	wield_image = 'more_fire_campfire.png',
 	walkable = false,
 	is_ground_content = true,
-	groups = {dig_immediate=3, flammable=1,},
+	groups = {dig_immediate=3, flammable=1,not_in_creative_inventory=1},
 	paramtype = 'light',
 	light_source = 5,
 	drop = 'more_fire:kindling',
@@ -282,18 +267,6 @@ minetest.register_node('more_fire:kindling_contained', {
 		inv:set_size("src", 1)
 		inv:set_size("dst", 2)
 	end,
-	can_dig = function(pos, player)
-			local meta = minetest.get_meta(pos);
-			local inv = meta:get_inventory()
-			if not inv:is_empty("fuel") then
-				return false
-			elseif not inv:is_empty("dst") then
-				return false
-			elseif not inv:is_empty("src") then
-				return false
-			end
-			return true
-		end,
 })
 
 minetest.register_node('more_fire:embers_contained', {
diff --git a/textures/more_fire_flintstone.png b/textures/more_fire_flintstone.png
deleted file mode 100644
index da7fd055e454da16ba8849c3278857b61ac1d981..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 437
zcmV;m0ZRUfP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vkU59wLh-0)hYl0YXVc
zK~y-)t&=fJ12GiGe@WVU^q|xs^b6=L=;q=_a1q4WPvR!{6&%FD#of_GDdJFSXBWXO
zAgRMCmrLT{oz!|)6@63QdwIY7^Iih~W!-LfcQ6?2SH9Nz*Nn|HO{3QORcn2uOTu>`
z@v#tMImY<Z@Aql9+g11iI55WCehVleE=iJBr_(`7iBbw71i(FT2%H&XUbNO2V*rqI
zz)=VRfDi)CIh=EZ5LSR=Ak$i(0IN+3&XrO-X`0r`RZ5|hs@!p&=Uej%ZYl+J=DjD+
zbBdzCIkz^QPM_t>=>Wq;fXZTw0K-o`D1#3|2)y?{8T;jz9?Vaoadhu$H-M3>$={V~
z78L_bthLku9=-Ro8|&=aT3Z0LYLZvp`|T{tYAcf@K}tDpdItdOLWol!Z@9uzuh-j)
fF;1+tfB(gA>8f>kunTOW00000NkvXXu0mjfgU-03

diff --git a/tools.lua b/tools.lua
index d9292b9..de5c5e5 100644
--- a/tools.lua
+++ b/tools.lua
@@ -11,13 +11,11 @@ minetest.register_tool('more_fire:lighter', {
 	},
 	on_use = function(itemstack, user, pointed_thing)
 		minetest.sound_play("spark", {gain = 1.0, max_hear_distance = 32, loop = false })
-		if pointed_thing.type == 'node'
-			and string.find(minetest.get_node(pointed_thing.under).name, 'more_fire:kindling')
-			then
-				burn(pointed_thing)
-				itemstack:add_wear(65535/200)
-				return itemstack
-			end
+		if pointed_thing.type == 'node'	then
+			burn(pointed_thing)
+			itemstack:add_wear(65535/200)
+			return itemstack
+		end
 	end,
 })