From 7de4ec526451c10c9e4b92c75046d716483389cb Mon Sep 17 00:00:00 2001
From: daretmavi <daretmavi@gmail.com>
Date: Sun, 21 Feb 2021 01:19:24 +0100
Subject: [PATCH] Mods update

---
 CHANGELOG                                     |  1 +
 buildscripts/03_my_updates.sh                 |  2 +-
 mod_sources.txt                               |  2 +-
 .../dynamic_liquid/cooling_lava.lua           | 19 +--------------
 mods/tools/bonemeal/init.lua                  | 24 +++++++++----------
 5 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 93f23a3..da773da 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ Work in Progress 0.7 [21.02.2020]
 	ADD Textures
 		- LessDirt
 
+	Mods update
 
 -------------------------------------------------------------------------------
 Work in Progress 0.7 [19.02.2020]
diff --git a/buildscripts/03_my_updates.sh b/buildscripts/03_my_updates.sh
index 57a306f..c024fe1 100755
--- a/buildscripts/03_my_updates.sh
+++ b/buildscripts/03_my_updates.sh
@@ -38,7 +38,7 @@ MOD_PATCH=( )	#patch names
 #MOD_PATCHES - all patches defined
 #MOD_PATCHES -  first is path and all patch names are separeted by ":"
 #MOD_PATCHES=("mobs/water_life:poison.patch" "buildings/doors:doors_update.patch" "player/3d_armor:mob_damage.patch" "player/hbsprint:no_damage.patch" "player/hunger_ng:effects.patch")
-MOD_PATCHES=("buildings/doors:doors_update.patch" "player/hbsprint:no_damage.patch" "environment/dynamic_liquid:bucket.patch" "mobs/mobs_mobkit/water_life:poison.patch" "mobs/mobs_mobkit/water_life:poison_hunger_ng.patch" "buildings/mg_villages:villages.patch" "player/fire_plus:extend_fire.patch")
+MOD_PATCHES=("buildings/doors:doors_update.patch" "player/hbsprint:no_damage.patch" "mobs/mobs_mobkit/water_life:poison.patch" "mobs/mobs_mobkit/water_life:poison_hunger_ng.patch" "buildings/mg_villages:villages.patch" "player/fire_plus:extend_fire.patch")
 #"mobs/mobs_mobs/goblins:goblins_nil.patch"
 
 #MOD_PATCHES=( )
diff --git a/mod_sources.txt b/mod_sources.txt
index 3da9ff5..1e1424c 100644
--- a/mod_sources.txt
+++ b/mod_sources.txt
@@ -196,7 +196,7 @@ origin	https://github.com/minetest-mods/wielded_light.git (fetch)
 Mod: player/wielded_light
 
 origin	https://notabug.org/TenPlus1/bonemeal.git (fetch)
-* master 308baf3 [origin/master] update mod.conf info
+* master 634d149 [origin/master] ignore xdecor's flowerpots when adding flowers
 Mod: tools/bonemeal
 
 origin	git@gitlab.com:daretmavi/bucket-lite.git (fetch)
diff --git a/mods/environment/dynamic_liquid/cooling_lava.lua b/mods/environment/dynamic_liquid/cooling_lava.lua
index c57da0a..035c4fd 100644
--- a/mods/environment/dynamic_liquid/cooling_lava.lua
+++ b/mods/environment/dynamic_liquid/cooling_lava.lua
@@ -221,21 +221,4 @@ minetest.register_abm({
 	action = function(...)
 		cool_lava_source(...)
 	end,
-})
-
--- new water types to work with lava cooling
-dynamic_liquid.add_to_water_nodes = function(new_source, new_flowing)
-	-- Flowing liquid
-	table.insert(dynamic_lava_flowing_destroys, new_flowing)
-	table.insert(dynamic_lava_source_destroys, new_flowing)
-
-	table.insert(all_flowing_nodes, new_flowing)
-	table.insert(all_source_nodes, new_flowing)
-
-	--Source liquid
-	table.insert(dynamic_lava_source_destroys, new_source)
-	table.insert(dynamic_cools_lava_flowing, new_source)
-	table.insert(dynamic_cools_lava_source, new_source)
-
-	table.insert(all_source_nodes, new_source)
-end
+})
\ No newline at end of file
diff --git a/mods/tools/bonemeal/init.lua b/mods/tools/bonemeal/init.lua
index 6f28922..71cff14 100644
--- a/mods/tools/bonemeal/init.lua
+++ b/mods/tools/bonemeal/init.lua
@@ -63,24 +63,22 @@ local dry_grass = {
 	"default:dry_grass_5", "", ""
 }
 
--- add all in-game flowers except waterlily
+-- loads mods then add all in-game flowers except waterlily
 local flowers = {}
 
-for node, def in pairs(minetest.registered_nodes) do
+minetest.after(0.1, function()
 
-	if def.groups.flower and not node:find("waterlily") then
-		flowers[#flowers + 1] = node
+	for node, def in pairs(minetest.registered_nodes) do
+
+		if def.groups
+		and def.groups.flower
+		and not node:find("waterlily")
+		and not node:find("xdecor:potted_") then
+			flowers[#flowers + 1] = node
+		end
 	end
-end
+end)
 
--- add additional bakedclay flowers if enabled
-if minetest.get_modpath("bakedclay") then
-	flowers[#flowers + 1] = "bakedclay:delphinium"
-	flowers[#flowers + 1] = "bakedclay:thistle"
-	flowers[#flowers + 1] = "bakedclay:lazarus"
-	flowers[#flowers + 1] = "bakedclay:mannagrass"
-	flowers[#flowers + 1] = ""
-end
 
 -- default biomes deco
 local deco = {