Merge pull request #13 from ademant/master

wrong crafting recipe for recycling old torches

craftitems.lua

@@ -1,8 +1,15 @@
-minetest.register_craftitem('more_fire:charcoal', {
-	description = 'Charcoal',
-	inventory_image = 'more_fire_charcoal_lump.png',
-	groups = {coal = 1}
-})
+
+-- check if charcoal already defined by mod ethereal
+if minetest.get_modpath("ethereal") then
+	minetest.override_item("ethereal:charcoal_lump",{groups={coal = 1}})
+	minetest.register_alias("more_fire:charcoal", "ethereal:charcoal_lump")
+else
+	minetest.register_craftitem('more_fire:charcoal', {
+		description = 'Charcoal',
+		inventory_image = 'more_fire_charcoal_lump.png',
+		groups = {coal = 1}
+	})
+end
 
 minetest.register_craftitem('more_fire:oil', {
 	description = 'lantern oil',

crafts.lua

@@ -2,7 +2,7 @@ minetest.register_craft({ --recycle old torches
 	output = 'default:stick 1',
 	recipe = {
 		{'more_fire:torch_stub', 'more_fire:torch_stub', 'more_fire:torch_stub'},
-		{'more_fire:torch_stub', , },
+		{'more_fire:torch_stub', '', ''},
 	}
 })
 
@@ -135,11 +135,13 @@ minetest.register_craft({
 })
 
 -- cooking recipes
-minetest.register_craft({
-	type = 'cooking',
-	recipe = 'group:tree',
-	output = 'more_fire:charcoal',
-})
+if not minetest.get_modpath("ethereal") then
+	minetest.register_craft({
+		type = 'cooking',
+		recipe = 'group:tree',
+		output = 'more_fire:charcoal',
+	})
+end
 
 minetest.register_craft({
 	type = 'cooking',
@@ -149,11 +151,13 @@ minetest.register_craft({
 })
 
 -- fuel recipes
-minetest.register_craft({
-	type = 'fuel',
-	recipe = 'more_fire:charcoal',
-	burntime = 35,
-})
+if not minetest.get_modpath("ethereal") then
+	minetest.register_craft({
+		type = 'fuel',
+		recipe = 'more_fire:charcoal',
+		burntime = 35,
+	})
+end
 
 minetest.register_craft({
 	type = 'fuel',

mod.conf

@@ -2,3 +2,4 @@ name = more_fire
 depends=default,farming,fire,vessels
 description = This is a Minetest mod that adds more/better fire related stuff.
 author = Napiophelios
+optional_depends = ethereal