remove fire abm's

update mobs_{redo,animal}

mods/fire/init.lua

@@ -31,18 +31,18 @@ minetest.register_node("fire:basic_flame", {
 	damage_per_second = 4,
 	groups = {igniter = 2, dig_immediate = 3, not_in_creative_inventory = 1},
 	on_timer = function(pos)
-		local f = minetest.find_node_near(pos, 1, {"group:flammable"})
-		if not f then
+		--local f = minetest.find_node_near(pos, 1, {"group:flammable"})
+		--if not f then
 			minetest.remove_node(pos)
-			return
-		end
+		--	return
+		--end
 		-- Restart timer
-		return true
+		return false
 	end,
 	drop = "",
 
 	on_construct = function(pos)
-		minetest.get_node_timer(pos):start(math.random(30, 60))
+		minetest.get_node_timer(pos):start(math.random(20, 30))
 	end,
 })
 
@@ -288,8 +288,13 @@ minetest.register_abm({
 
 
 -- Enable the following ABMs according to 'enable fire' setting
+<<<<<<< HEAD
 
 local fire_enabled = minetest.setting_getbool("enable_fire")
+=======
+--[[
+local fire_enabled = minetest.settings:get_bool("enable_fire")
+>>>>>>> 2e47e09... fire: remove fire abm's, make fire nodes last 20-30 seconds
 if fire_enabled == nil then
 	-- New setting not specified, check for old setting.
 	-- If old setting is also not specified, 'not nil' is true.
@@ -356,4 +361,4 @@ else -- Fire enabled
 		end,
 	})
 
-end
+end]]

mobs_animal @ 80b157eb

-Subproject commit 51ac8cc9302637c95867a86264cac004e3426325
+Subproject commit 80b157eb20d814513a67c1bd65501ebdd71a05ca

mobs_redo @ 95a2e8a4

-Subproject commit 622d04b9e3bc9285ea6250d25d4d7f1dc0e2d471
+Subproject commit 95a2e8a47e4ab430e793e22deed8eb5635f27b89