Merge remote-tracking branch 'upstream/master'

init.lua

@@ -1,8 +1,8 @@
 
 bonemeal = {
 	item_list = {
-		bucket_water = "buckets:bucket_water",
+		bucket_water = "bucket:bucket_water",
-		bucket_empty = "buckets:bucket_empty",
+		bucket_empty = "bucket:bucket_empty",
 		dirt = "default:dirt",
 		torch = "default:torch",
 		coral = "default:coral_skeleton"
@@ -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
+	if check_sapling(pos, node.name, strength, light_ok) then
-	and check_sapling(pos, node.name, light_ok) then
 		return true
 	end
 
@@ -588,7 +589,6 @@ minetest.register_craftitem("bonemeal:gelatin_powder", {
 -- crafting recipes
 --
 
-
 -- gelatin powder
 minetest.register_craft({
 	output = "bonemeal:gelatin_powder 4",

locale/bonemeal.de.tr

@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal geladen
 Bone=Knochen
 Bone Meal=Knochenmehl
 Fertiliser=Dünger

locale/bonemeal.en.tr

@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-#[MOD] bonemeal loaded=
 #Bone=
 #Bone Meal=
 #Fertiliser=

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

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

locale/bonemeal.it.tr

@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal caricata
 Bone=Ossa
 Bone Meal=Pasto osseo
 Fertiliser=Fertilizzante

locale/bonemeal.ru.tr

@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] костная мука загружена
 Bone=Кость
 Bone Meal=Костная Мука
 Fertiliser=Удобрение

locale/bonemeal.uk.tr

@@ -0,0 +1,10 @@
+# textdomain: bonemeal
+
+Bonemeal=Кісткове борошно
+Adds bone and bonemeal giving the ability to quickly grow plants and saplings.=Додає кістки та кісткове борошно, що дає можливість швидко вирощувати рослини та саджанці.
+
+Bone=Кістка
+Bone Meal=Кісткове борошно
+Fertiliser=Добриво
+Gelatin Powder=Желатиновий порошок
+Mulch=Мульча

mods.lua

@@ -86,7 +86,9 @@ if minetest.get_modpath("default") then
 		{"default:sand", {}, {"default:dry_shrub", "", "", ""} },
 		{"default:desert_sand", {}, {"default:dry_shrub", "", "", ""} },
 		{"default:silver_sand", {}, {"default:dry_shrub", "", "", ""} },
-		{"default:dirt_with_rainforest_litter", {}, {"default:junglegrass", "", "", ""}}
+		{"default:dirt_with_rainforest_litter", {}, {"default:junglegrass", "", "", ""} },
+		{"default:dirt_with_coniferous_litter", {}, {"default:fern_1", "default:fern_2",
+			"default:fern_3", "", "", ""}}
 	})
 end
 
@@ -162,6 +164,7 @@ if minetest.get_modpath("ethereal") then
 		{"ethereal:banana_tree_sapling", ethereal.grow_banana_tree, "soil"},
 		{"ethereal:frost_tree_sapling", ethereal.grow_frost_tree, "soil"},
 		{"ethereal:mushroom_sapling", ethereal.grow_mushroom_tree, "soil"},
+		{"ethereal:mushroom_brown_sapling", ethereal.grow_mushroom_brown_tree, "soil"},
 		{"ethereal:willow_sapling", ethereal.grow_willow_tree, "soil"},
 		{"ethereal:redwood_sapling", ethereal.grow_redwood_tree, "soil"},
 		{"ethereal:giant_redwood_sapling", ethereal.grow_giant_redwood_tree, "soil"},
@@ -184,7 +187,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, {}}
@@ -292,29 +296,42 @@ end
 if minetest.get_modpath("df_trees") then
 
 	local function spore_tree_fix(pos)
-		minetest.set_node(pos, {name = "air"})
+		minetest.remove_node(pos) ; df_trees.spawn_spore_tree(pos)
-		df_trees.spawn_spore_tree(pos)
 	end
 
 	local function fungiwood_fix(pos)
-		minetest.set_node(pos, {name = "air"})
+		minetest.remove_node(pos) ; df_trees.spawn_fungiwood(pos)
-		df_trees.spawn_fungiwood(pos)
 	end
 
 	local function tunnel_fix(pos)
-		minetest.set_node(pos, {name = "air"})
+		minetest.remove_node(pos) ; df_trees.spawn_tunnel_tube(pos)
-		df_trees.spawn_tunnel_tube(pos)
+	end
+
+	local function black_cap_fix(pos)
+		minetest.remove_node(pos) ; df_trees.spawn_black_cap(pos)
+	end
+
+	local function goblin_cap_fix(pos)
+		minetest.remove_node(pos) ; df_trees.spawn_goblin_cap(pos)
+	end
+
+	local function tower_cap_fix(pos)
+		minetest.remove_node(pos) ; df_trees.spawn_tower_cap(pos)
+	end
+
+	local function nether_cap_fix(pos)
+		minetest.remove_node(pos) ; df_trees.spawn_nether_cap(pos)
 	end
 
 	bonemeal:add_sapling({
-		{"df_trees:black_cap_sapling", df_trees.spawn_black_cap, "soil", true},
+		{"df_trees:black_cap_sapling", black_cap_fix, "soil", true},
 		{"df_trees:fungiwood_sapling", fungiwood_fix, "soil", true},
-		{"df_trees:goblin_cap_sapling", df_trees.spawn_goblin_cap, "soil", true},
+		{"df_trees:goblin_cap_sapling", goblin_cap_fix, "soil", true},
 		{"df_trees:spore_tree_sapling", spore_tree_fix, "soil", true},
-		{"df_trees:tower_cap_sapling", df_trees.spawn_tower_cap, "soil", true},
+		{"df_trees:tower_cap_sapling", tower_cap_fix, "soil", true},
 		{"df_trees:tunnel_tube_sapling", tunnel_fix, "soil", true},
-		{"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:nether_cap", true},
+		{"df_trees:nether_cap_sapling", nether_cap_fix, "group:nether_cap", true},
-		{"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:cools_lava", true}
+		{"df_trees:nether_cap_sapling", nether_cap_fix, "group:cools_lava", true}
 	})
 end