Merge remote-tracking branch 'upstream/master'

2024-09-15 09:40:56 +02:00
parent ee51e847df ef7d33f740
commit 6d096beca8
150 changed files with 149 additions and 87 deletions
--- a/bushes_classic/nodes.lua
+++ b/bushes_classic/nodes.lua
@ -161,6 +161,7 @@ for i, bush_name in ipairs(bushes_classic.bushes) do
 		paramtype2 = "facedir",
 		on_use = minetest.item_eat(18),
 		groups = { dig_immediate = 3 },
+		is_ground_content = false,
 	})


@ -212,4 +213,5 @@ minetest.register_node(":bushes:basket_empty", {
 	paramtype = "light",
 	paramtype2 = "facedir",
    groups = { dig_immediate = 3 },
+	is_ground_content = false,
 })
--- a/bushes_classic/textures/bushes_basket.png
+++ b/bushes_classic/textures/bushes_basket.png
--- a/bushes_classic/textures/bushes_basket_pie_blackberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_blackberry.png
--- a/bushes_classic/textures/bushes_basket_pie_blueberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_blueberry.png
--- a/bushes_classic/textures/bushes_basket_pie_gooseberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_gooseberry.png
--- a/bushes_classic/textures/bushes_basket_pie_mixed_berry.png
+++ b/bushes_classic/textures/bushes_basket_pie_mixed_berry.png
--- a/bushes_classic/textures/bushes_basket_pie_raspberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_raspberry.png
--- a/bushes_classic/textures/bushes_basket_pie_strawberry.png
+++ b/bushes_classic/textures/bushes_basket_pie_strawberry.png
--- a/bushes_classic/textures/bushes_bush_blackberry.png
+++ b/bushes_classic/textures/bushes_bush_blackberry.png
--- a/bushes_classic/textures/bushes_bush_blueberry.png
+++ b/bushes_classic/textures/bushes_bush_blueberry.png
--- a/bushes_classic/textures/bushes_bush_fruitless.png
+++ b/bushes_classic/textures/bushes_bush_fruitless.png
--- a/bushes_classic/textures/bushes_bush_gooseberry.png
+++ b/bushes_classic/textures/bushes_bush_gooseberry.png
--- a/bushes_classic/textures/bushes_bush_raspberry.png
+++ b/bushes_classic/textures/bushes_bush_raspberry.png
--- a/bushes_classic/textures/bushes_bush_strawberry.png
+++ b/bushes_classic/textures/bushes_bush_strawberry.png