Merge remote-tracking branch 'upstream/master'

init.lua

@@ -6,7 +6,8 @@ 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

locale/bonemeal.es.tr

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

locale/bonemeal.fr.tr

@@ -0,0 +1,6 @@
+# textdomain: beds
+Mulch=Paillis
+Bone Meal=Poudre d'os
+Fertiliser=Engrais
+Bone=Os
+[MOD] bonemeal loaded=[MOD] bonemeal chargé

locale/bonemeal.it.tr

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

locale/bonemeal.ru.tr

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

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.tr

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

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

@@ -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