Merge remote-tracking branch 'upstream/master'

init.lua

@@ -37,6 +37,17 @@ local function pine_grow(pos)
 end
 
 
+-- special function for cactus growth
+local function cactus_grow(pos)
+	default.grow_cactus(pos, minetest.get_node(pos))
+end
+
+-- special function for papyrus growth
+local function papyrus_grow(pos)
+	default.grow_papyrus(pos, minetest.get_node(pos))
+end
+
+
 -- default saplings
 local saplings = {
 	{"default:sapling", default.grow_new_apple_tree, "soil"},
@@ -49,7 +60,9 @@ local saplings = {
 	{"default:acacia_bush_sapling", default.grow_acacia_bush, "soil"},
 	{"default:large_cactus_seedling", default.grow_large_cactus, "sand"},
 	{"default:blueberry_bush_sapling", default.grow_blueberry_bush, "soil"},
-	{"default:pine_bush_sapling", default.grow_pine_bush, "soil"}
+	{"default:pine_bush_sapling", default.grow_pine_bush, "soil"},
+	{"default:cactus", cactus_grow, "sand"},
+	{"default:papyrus", papyrus_grow, "soil"},
 }
 
 -- helper tables ( "" denotes a blank item )
@@ -63,24 +76,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 = {

locale/bonemeal.de.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+[MOD] bonemeal loaded=[MOD] bonemeal geladen
+Bone=Knochen
+Bone Meal=Knochenmehl
+Fertiliser=Dünger
+Gelatin Powder=Gelatinepulver
+Mulch=Mulch

mod.conf

@@ -1 +1,4 @@
-name = bonemeal
+name = bonemeal
+depends = default
+optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye
+description = Adds bone and bonemeal giving the ability to quickly grow plants and saplings.

mods.lua

@@ -44,7 +44,9 @@ if farming and farming.mod and farming.mod == "redo" then
 		{"farming:lettuce_", 5},
 		{"farming:blackberry_", 4},
 		{"farming:vanilla_", 8},
-		{"farming:soy_", 7}
+		{"farming:soy_", 7},
+		{"farming:artichoke_", 5},
+		{"farming:parsley_", 3}
 	})
 end