From 00358eb20f578d1e64a13a2c450f9caa2419464f Mon Sep 17 00:00:00 2001
From: Olivier Dragon <odragon@protonmail.com>
Date: Sun, 26 Nov 2023 16:49:23 -0500
Subject: [PATCH] Update bonemeal from upstream.

---
 builder/mods_src/tools/bonemeal           | 2 +-
 mods/tools/bonemeal/init.lua              | 9 +++++----
 mods/tools/bonemeal/locale/bonemeal.de.tr | 1 -
 mods/tools/bonemeal/locale/bonemeal.en.tr | 1 -
 mods/tools/bonemeal/locale/bonemeal.es.tr | 1 -
 mods/tools/bonemeal/locale/bonemeal.fr.tr | 1 -
 mods/tools/bonemeal/locale/bonemeal.it.tr | 1 -
 mods/tools/bonemeal/locale/bonemeal.ru.tr | 1 -
 mods/tools/bonemeal/mods.lua              | 3 ++-
 9 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/builder/mods_src/tools/bonemeal b/builder/mods_src/tools/bonemeal
index 8e929e5a1..4f8ca6a0a 160000
--- a/builder/mods_src/tools/bonemeal
+++ b/builder/mods_src/tools/bonemeal
@@ -1 +1 @@
-Subproject commit 8e929e5a1cca502bd1c6a1926c8aadd17ad58acc
+Subproject commit 4f8ca6a0a57259690bbc876cdffc6460998dc113
diff --git a/mods/tools/bonemeal/init.lua b/mods/tools/bonemeal/init.lua
index 77f584166..dbb74606c 100644
--- a/mods/tools/bonemeal/init.lua
+++ b/mods/tools/bonemeal/init.lua
@@ -86,7 +86,7 @@ end
 
 
 -- sapling check
-local function check_sapling(pos, sapling_node, light_ok)
+local function check_sapling(pos, sapling_node, strength, light_ok)
 
 	-- what is sapling placed on?
 	local under =  minetest.get_node({
@@ -128,7 +128,9 @@ local function check_sapling(pos, sapling_node, light_ok)
 
 				particle_effect(pos)
 
-				grow_tree(pos, saplings[n][2])
+				if math.random(5 - strength) == 1 then
+					grow_tree(pos, saplings[n][2])
+				end
 
 				return true
 			end
@@ -474,8 +476,7 @@ function bonemeal:on_use(pos, strength, node)
 	end
 
 	-- check for sapling growth
-	if random(5 - strength) == 1
-	and check_sapling(pos, node.name, light_ok) then
+	if check_sapling(pos, node.name, strength, light_ok) then
 		return true
 	end
 
diff --git a/mods/tools/bonemeal/locale/bonemeal.de.tr b/mods/tools/bonemeal/locale/bonemeal.de.tr
index 2045f67f9..d31d3e341 100644
--- a/mods/tools/bonemeal/locale/bonemeal.de.tr
+++ b/mods/tools/bonemeal/locale/bonemeal.de.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal geladen
 Bone=Knochen
 Bone Meal=Knochenmehl
 Fertiliser=Dünger
diff --git a/mods/tools/bonemeal/locale/bonemeal.en.tr b/mods/tools/bonemeal/locale/bonemeal.en.tr
index bdbed19ba..c3e9590b2 100644
--- a/mods/tools/bonemeal/locale/bonemeal.en.tr
+++ b/mods/tools/bonemeal/locale/bonemeal.en.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-#[MOD] bonemeal loaded=
 #Bone=
 #Bone Meal=
 #Fertiliser=
diff --git a/mods/tools/bonemeal/locale/bonemeal.es.tr b/mods/tools/bonemeal/locale/bonemeal.es.tr
index 964d56eca..3021ae202 100644
--- a/mods/tools/bonemeal/locale/bonemeal.es.tr
+++ b/mods/tools/bonemeal/locale/bonemeal.es.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal cargado
 Bone=Hueso
 Bone Meal=Comida de hueso
 Fertiliser=Fertilizante
diff --git a/mods/tools/bonemeal/locale/bonemeal.fr.tr b/mods/tools/bonemeal/locale/bonemeal.fr.tr
index aba2e6170..11bf40915 100644
--- a/mods/tools/bonemeal/locale/bonemeal.fr.tr
+++ b/mods/tools/bonemeal/locale/bonemeal.fr.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal chargé
 Bone=Os
 Bone Meal=Poudre d'os
 Fertiliser=Engrais
diff --git a/mods/tools/bonemeal/locale/bonemeal.it.tr b/mods/tools/bonemeal/locale/bonemeal.it.tr
index 26e0d7d74..7aa373a00 100644
--- a/mods/tools/bonemeal/locale/bonemeal.it.tr
+++ b/mods/tools/bonemeal/locale/bonemeal.it.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal caricata
 Bone=Ossa
 Bone Meal=Pasto osseo
 Fertiliser=Fertilizzante
diff --git a/mods/tools/bonemeal/locale/bonemeal.ru.tr b/mods/tools/bonemeal/locale/bonemeal.ru.tr
index 0f63b0895..fc65dc142 100644
--- a/mods/tools/bonemeal/locale/bonemeal.ru.tr
+++ b/mods/tools/bonemeal/locale/bonemeal.ru.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] костная мука загружена
 Bone=Кость
 Bone Meal=Костная Мука
 Fertiliser=Удобрение
diff --git a/mods/tools/bonemeal/mods.lua b/mods/tools/bonemeal/mods.lua
index debaf3e03..58ba78fcf 100644
--- a/mods/tools/bonemeal/mods.lua
+++ b/mods/tools/bonemeal/mods.lua
@@ -184,7 +184,8 @@ if minetest.get_modpath("ethereal") then
 			"flowers:tulip", "flowers:viola", "ethereal:strawberry_7"}},
 		{"ethereal:gray_dirt", {}, {"ethereal:snowygrass", "", ""}},
 		{"ethereal:cold_dirt", {}, {"ethereal:snowygrass", "", ""}},
-		{"ethereal:mushroom_dirt", {}, {"flowers:mushroom_red", "flowers:mushroom_brown", "", "", ""}},
+		{"ethereal:mushroom_dirt", {}, {"flowers:mushroom_red", "flowers:mushroom_brown",
+				"ethereal:spore_grass", "ethereal:spore_grass", "", "", ""}},
 		{"ethereal:jungle_dirt", grass, {"default:junglegrass", "", "", ""}},
 		{"ethereal:grove_dirt", grass, {"ethereal:fern", "", "", ""}},
 		{"ethereal:bamboo_dirt", grass, {}}