From ec1d74478eb624c184c5c5e2217e6b2be2cacd8a Mon Sep 17 00:00:00 2001
From: Milan* <tchncs@vivaldi.net>
Date: Sat, 13 Jan 2018 15:28:54 +0100
Subject: [PATCH 1/3] remove fire abm's update mobs_{redo,animal}

---
 mods/fire/init.lua | 19 ++++++++++++-------
 mods/mobs_animal   |  2 +-
 mods/mobs_redo     |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/mods/fire/init.lua b/mods/fire/init.lua
index a846b289..5fc51b7b 100644
--- a/mods/fire/init.lua
+++ b/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]]
diff --git a/mods/mobs_animal b/mods/mobs_animal
index 51ac8cc9..80b157eb 160000
--- a/mods/mobs_animal
+++ b/mods/mobs_animal
@@ -1 +1 @@
-Subproject commit 51ac8cc9302637c95867a86264cac004e3426325
+Subproject commit 80b157eb20d814513a67c1bd65501ebdd71a05ca
diff --git a/mods/mobs_redo b/mods/mobs_redo
index 622d04b9..95a2e8a4 160000
--- a/mods/mobs_redo
+++ b/mods/mobs_redo
@@ -1 +1 @@
-Subproject commit 622d04b9e3bc9285ea6250d25d4d7f1dc0e2d471
+Subproject commit 95a2e8a47e4ab430e793e22deed8eb5635f27b89

From af2a921a305a1055a33d9ac5679348da4755c172 Mon Sep 17 00:00:00 2001
From: Milan* <tchncs@vivaldi.net>
Date: Sat, 13 Jan 2018 20:59:00 +0100
Subject: [PATCH 2/3] update submodule hudbars

---
 mods/hudbars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/hudbars b/mods/hudbars
index e9bfd222..8d864a49 160000
--- a/mods/hudbars
+++ b/mods/hudbars
@@ -1 +1 @@
-Subproject commit e9bfd2221f8b68ccbdb8a44155a8c51a54eaaec4
+Subproject commit 8d864a49548457ccb3944a62b6a4338f962d4c64

From 68cb28f2586f8af5c7eee365d044a86452498f6f Mon Sep 17 00:00:00 2001
From: Milan* <tchncs@vivaldi.net>
Date: Sat, 13 Jan 2018 23:40:57 +0100
Subject: [PATCH 3/3] update submodule death_messages

---
 mods/death_messages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/death_messages b/mods/death_messages
index 23c57bf0..b84a287d 160000
--- a/mods/death_messages
+++ b/mods/death_messages
@@ -1 +1 @@
-Subproject commit 23c57bf000ce48a00c3991d8ef8f011e8c6cf75b
+Subproject commit b84a287dddf3ee57fa8178cf8504a4180b60f28a