Merge remote-tracking branch 'upstream/master'

init.lua

@@ -6,12 +6,13 @@ local min, max, random = math.min, math.max, math.random
 
 
 -- Load support for intllib.
-local S, NS = dofile(path .. "/intllib.lua")
+local S = minetest.get_translator and minetest.get_translator("bonemeal") or
+		dofile(path .. "/intllib.lua")
 
 
 -- creative check
 local creative_mode_cache = minetest.settings:get_bool("creative_mode")
-function is_creative(name)
+function bonemeal.is_creative(name)
 	return creative_mode_cache or minetest.check_player_privs(name, {creative = true})
 end
 
@@ -494,7 +495,7 @@ minetest.register_craftitem("bonemeal:mulch", {
 		end
 
 		-- take item if not in creative
-		if not is_creative(user:get_player_name()) then
+		if not bonemeal.is_creative(user:get_player_name()) then
 			itemstack:take_item()
 		end
 
@@ -524,7 +525,7 @@ minetest.register_craftitem("bonemeal:bonemeal", {
 		end
 
 		-- take item if not in creative
-		if not is_creative(user:get_player_name()) then
+		if not bonemeal.is_creative(user:get_player_name()) then
 			itemstack:take_item()
 		end
 
@@ -554,7 +555,7 @@ minetest.register_craftitem("bonemeal:fertiliser", {
 		end
 
 		-- take item if not in creative
-		if not is_creative(user:get_player_name()) then
+		if not bonemeal.is_creative(user:get_player_name()) then
 			itemstack:take_item()
 		end
 
@@ -631,6 +632,16 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	type = "shapeless",
+	output = "bonemeal:mulch",
+	recipe = {
+		"group:seed", "group:seed", "group:seed",
+		"group:seed", "group:seed", "group:seed",
+		"group:seed", "group:seed", "group:seed"
+	}
+})
+
 -- fertiliser
 minetest.register_craft({
 	type = "shapeless",

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/template.txt

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

mods.lua

@@ -39,7 +39,8 @@ if farming and farming.mod and farming.mod == "redo" then
 		{"farming:rye_", 8},
 		{"farming:oat_", 8},
 		{"farming:rice_", 8},
-		{"farming:mint_", 4}
+		{"farming:mint_", 4},
+		{"farming:cabbage_", 6}
 	})
 end