Merge remote-tracking branch 'upstream/master'

README.md

@@ -30,5 +30,8 @@ Changelog:
 - 0.8 - Added support for farming redo's new garlic, pepper and onion crops
 - 0.9 - Added support for farming redo's pea and beetroot crops, checks for place_param
 - 1.0 - add_deco() now adds to existing item list while set_deco() replaces item list (thanks h-v-smacker)
+- 1.1 - Added {can_bonemeal=1} group for special nodes
+- 1.2 - Added support for minetest 5.0 cactus seedling, blueberry bush sapling and emergent jungle tree saplings, additional flowers and pine bush sapling.
+- 1.3 - Ability to craft dye from mulch, bonemeal and fertiliser (thanks orbea)
 
 Lucky Blocks: 6

depends.txt

@@ -5,3 +5,5 @@ ethereal?
 moretrees?
 technic_worldgen?
 lucky_block?
+flowers?
+dye?

locale/bonemeal.en.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+#[MOD] bonemeal loaded=
+#Bone=
+#Bone Meal=
+#Fertiliser=
+#Gelatin Powder=
+#Mulch=

locale/bonemeal.es.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+[MOD] bonemeal loaded=[MOD] bonemeal cargado
+Bone=Hueso
+Bone Meal=Comida de hueso
+Fertiliser=Fertilizante
+#Gelatin Powder=
+Mulch=Mantillo

locale/bonemeal.fr.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+[MOD] bonemeal loaded=[MOD] bonemeal chargé
+Bone=Os
+Bone Meal=Poudre d'os
+Fertiliser=Engrais
+Gelatin Powder=Poudre de gélatine
+Mulch=Paillis

locale/bonemeal.it.tr

@@ -0,0 +1,7 @@
+# textdomain:bonemeal
+[MOD] bonemeal loaded=[MOD] bonemeal caricata
+Bone=Ossa
+Bone Meal=Pasto osseo
+Fertiliser=Fertilizzante
+#Gelatin Powder=
+Mulch=Pacciame

locale/bonemeal.ru.tr

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

locale/es.txt

@@ -0,0 +1,7 @@
+# init.lua
+
+Mulch = Mantillo
+Bone Meal = Comida de hueso
+Fertiliser = Fertilizante
+Bone = Hueso
+[MOD] bonemeal loaded = [MOD] bonemeal cargado

locale/it.txt

@@ -0,0 +1,7 @@
+# init.lua
+
+Mulch = Pacciame
+Bone Meal = Pasto osseo
+Fertiliser = Fertilizzante
+Bone = Ossa
+[MOD] bonemeal loaded = [MOD] bonemeal caricata

locale/ru.txt

@@ -0,0 +1,7 @@
+# init.lua
+
+Mulch = Мульча
+Bone Meal = Костная Мука
+Fertiliser = Удобрение
+Bone = Кость
+[MOD] bonemeal loaded = [MOD] костная мука загружена

locale/template.txt

@@ -1,7 +1,7 @@
 # init.lua
 
-Mulch = 
-Bone Meal = 
-Fertiliser = 
-Bone = 
-[bonemeal] loaded = 
+Mulch =
+Bone Meal =
+Fertiliser =
+Bone =
+[MOD] bonemeal loaded =

mods.lua

@@ -5,7 +5,7 @@ if minetest.get_modpath("animalmaterials") then
 	minetest.register_craft({
 		type = "shapeless",
 		output = "bonemeal:bonemeal 2",
-		recipe = {"animalmaterials:bone"},
+		recipe = {"animalmaterials:bone"}
 	})
 end
 
@@ -36,6 +36,11 @@ if farming and farming.mod and farming.mod == "redo" then
 		{"farming:pineapple_", 8},
 		{"farming:pea_", 5},
 		{"farming:beetroot_", 5},
+		{"farming:rye_", 8},
+		{"farming:oat_", 8},
+		{"farming:rice_", 8},
+		{"farming:mint_", 4},
+		{"farming:cabbage_", 6}
 	})
 end
 
@@ -44,7 +49,7 @@ if minetest.get_modpath("ethereal") then
 
 	bonemeal:add_crop({
 		{"ethereal:strawberry_", 8},
-		{"ethereal:onion_", 5},
+		{"ethereal:onion_", 5}
 	})
 
 	bonemeal:add_sapling({
@@ -60,6 +65,7 @@ if minetest.get_modpath("ethereal") then
 		{"ethereal:orange_tree_sapling", ethereal.grow_orange_tree, "soil"},
 		{"ethereal:bamboo_sprout", ethereal.grow_bamboo_tree, "soil"},
 		{"ethereal:birch_sapling", ethereal.grow_birch_tree, "soil"},
+		{"ethereal:sakura_sapling", ethereal.grow_sakura_tree, "soil"}
 	})
 
 	local grass = {"default:grass_3", "default:grass_4", "default:grass_5", ""}
@@ -75,7 +81,7 @@ if minetest.get_modpath("ethereal") then
 		{"ethereal:mushroom_dirt", {}, {"flowers:mushroom_red", "flowers:mushroom_brown", "", "", ""}},
 		{"ethereal:jungle_dirt", grass, {"default:junglegrass", "", "", ""}},
 		{"ethereal:grove_dirt", grass, {"ethereal:fern", "", "", ""}},
-		{"ethereal:bamboo_dirt", grass, {}},
+		{"ethereal:bamboo_dirt", grass, {}}
 	})
 end
 
@@ -111,12 +117,46 @@ if minetest.get_modpath("moretrees") then
 		{"moretrees:poplar_sapling", moretrees.spawn_poplar_object, "soil"},
 		{"moretrees:willow_sapling", moretrees.spawn_willow_object, "soil"},
 		{"moretrees:rubber_tree_sapling", moretrees.spawn_rubber_tree_object, "soil"},
-		{"moretrees:fir_sapling", fir_grow, "soil"},
+		{"moretrees:fir_sapling", fir_grow, "soil"}
 	})
 
 elseif minetest.get_modpath("technic_worldgen") then
 
 	bonemeal:add_sapling({
-		{"moretrees:rubber_tree_sapling", technic.rubber_tree_model, "soil"},
+		{"moretrees:rubber_tree_sapling", technic.rubber_tree_model, "soil"}
 	})
 end
+
+
+if minetest.get_modpath("caverealms") then
+
+	local fil = minetest.get_modpath("caverealms") .. "/schematics/shroom.mts"
+	local add_shroom = function(pos)
+
+		minetest.swap_node(pos, {name = "air"})
+
+		minetest.place_schematic(
+			{x = pos.x - 5, y = pos.y, z = pos.z - 5}, fil, 0, nil, false)
+	end
+
+	bonemeal:add_sapling({
+		{"caverealms:mushroom_sapling", add_shroom, "soil"}
+	})
+end
+
+
+if minetest.get_modpath("dye") then
+
+	local bonemeal_dyes = {
+			bonemeal = "white", fertiliser = "green", mulch = "brown"}
+
+	for mat, dye in pairs(bonemeal_dyes) do
+
+		minetest.register_craft({
+			output = "dye:" .. dye .. " 4",
+			recipe = {
+				{"bonemeal:" .. mat}
+			},
+		})
+	end
+end