Merge remote-tracking branch 'upstream/master'

chicken.lua

@@ -38,7 +38,7 @@ stepheight = 0.6,
 	lava_damage = 5,
 	light_damage = 0,
 	fall_damage = 0,
-	fall_speed = -8,
+	fall_speed = -4,
 	fear_height = 5,
 	animation = {
 		speed_normal = 15,

cow.lua

@@ -158,7 +158,7 @@ minetest.register_craftitem(":mobs:bucket_milk", {
 	inventory_image = "mobs_bucket_milk.png",
 	stack_max = 1,
 	on_use = minetest.item_eat(8, "bucket:bucket_empty"),
-	groups = {food_milk = 1, flammable = 3},
+	groups = {food_milk = 1, flammable = 3, drink = 1},
 })
 
 -- glass of milk
@@ -166,7 +166,7 @@ minetest.register_craftitem(":mobs:glass_milk", {
 	description = S("Glass of Milk"),
 	inventory_image = "mobs_glass_milk.png",
 	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
-	groups = {food_milk_glass = 1, flammable = 3, vessel = 1},
+	groups = {food_milk_glass = 1, flammable = 3, vessel = 1, drink = 1},
 })
 
 minetest.register_craft({

depends.txt

@@ -1,4 +1,4 @@
 default
 mobs
-intllib?
 lucky_block?
+intllib?

init.lua

@@ -1,13 +1,11 @@
 
-local path = minetest.get_modpath("mobs_animal")
-
 -- Load support for intllib.
-local MP = minetest.get_modpath(minetest.get_current_modname())
+local path = minetest.get_modpath(minetest.get_current_modname())
-local S, NS = dofile(MP.."/intllib.lua")
+local S = minetest.get_translator and minetest.get_translator("mobs_animal") or
+		dofile(path .. "/intllib.lua")
 mobs.intllib = S
 
 -- Animals
-
 dofile(path .. "/chicken.lua") -- JKmurray
 dofile(path .. "/cow.lua") -- KrupnoPavel
 dofile(path .. "/rat.lua") -- PilzAdam
@@ -20,6 +18,7 @@ dofile(path .. "/goat.lua") -- NALC(sys4 fork MFF)
 dofile(path .. "/penguin.lua") -- D00Med
 dofile(path .. "/panda.lua") -- AspireMint
 
+-- Lucky Blocks
 dofile(path .. "/lucky_block.lua")
 
 print (S("[MOD] Mobs Redo Animals loaded"))

intllib.lua

@@ -1,45 +1,3 @@
+-- Support for the old multi-load method
+dofile(minetest.get_modpath("intllib").."/init.lua")
 
--- Fallback functions for when `intllib` is not installed.
--- Code released under Unlicense <http://unlicense.org>.
-
--- Get the latest version of this file at:
---   https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua
-
-local function format(str, ...)
-	local args = { ... }
-	local function repl(escape, open, num, close)
-		if escape == "" then
-			local replacement = tostring(args[tonumber(num)])
-			if open == "" then
-				replacement = replacement..close
-			end
-			return replacement
-		else
-			return "@"..open..num..close
-		end
-	end
-	return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl))
-end
-
-local gettext, ngettext
-if minetest.get_modpath("intllib") then
-	if intllib.make_gettext_pair then
-		-- New method using gettext.
-		gettext, ngettext = intllib.make_gettext_pair()
-	else
-		-- Old method using text files.
-		gettext = intllib.Getter()
-	end
-end
-
--- Fill in missing functions.
-
-gettext = gettext or function(msgid, ...)
-	return format(msgid, ...)
-end
-
-ngettext = ngettext or function(msgid, msgid_plural, n, ...)
-	return format(n==1 and msgid or msgid_plural, ...)
-end
-
-return gettext, ngettext

locale/mobs_animal.de.tr

@@ -0,0 +1,50 @@
+# textdomain:mobs_animal
+@1 Sheep=@1 Schaf
+Bee=Biene
+Beehive=Bienenstock
+Black=Schwarzes
+Blue=Blaues
+Brown=Braunes
+Bucket of Milk=Eimer Milch
+Bunny=Häschen
+#Butter=
+Cheese=Käse
+Cheese Block=Käseblock
+Chicken=Huhn
+Chicken Egg=Hühnerei
+Cooked Chicken=Gekochtes Hühnchen
+Cooked Mutton=Gekochtes Hammelfleisch
+Cooked Porkchop=Gekochtes Schweinekotelett
+Cooked Rabbit=Gekochtes Kaninchen
+Cooked Rat=Gekochte Ratte
+Cow=Kuh
+Cow already milked!=Kuh ist bereits gemolken!
+Cyan=Cyan
+Dark Green=Dunkelgrünes
+Dark Grey=Dunkelgraues
+Feather=Feder
+Fried Egg=Spiegelei
+#Glass of Milk=
+Green=Grünes
+Grey=Graues
+#Hairball=
+Honey=Honig
+Honey Block=Honigblock
+Kitten=Kätzchen
+Magenta=Magenta
+Orange=Oranges
+#Panda=
+Penguin=Pinguin
+Pink=Pinkes
+Rabbit Hide=Kaninchenfell
+Rat=Ratte
+Raw Chicken=Rohes Hühnchen
+Raw Mutton=Rohes Hammelfleisch
+Raw Porkchop=Rohes Schweinekotelett
+Raw Rabbit=Rohes Kaninchen
+Red=Rotes
+Violet=Violettes
+Warthog=Warzenschwein
+White=Weißes
+Yellow=Gelbes
+#[MOD] Mobs Redo Animals loaded=

locale/mobs_animal.en.tr

@@ -0,0 +1,50 @@
+# textdomain:mobs_animal
+#@1 Sheep=
+#Bee=
+#Beehive=
+#Black=
+#Blue=
+#Brown=
+#Bucket of Milk=
+#Bunny=
+#Butter=
+#Cheese=
+#Cheese Block=
+#Chicken=
+#Chicken Egg=
+#Cooked Chicken=
+#Cooked Mutton=
+#Cooked Porkchop=
+#Cooked Rabbit=
+#Cooked Rat=
+#Cow=
+#Cow already milked!=
+#Cyan=
+#Dark Green=
+#Dark Grey=
+#Feather=
+#Fried Egg=
+#Glass of Milk=
+#Green=
+#Grey=
+#Hairball=
+#Honey=
+#Honey Block=
+#Kitten=
+#Magenta=
+#Orange=
+#Panda=
+#Penguin=
+#Pink=
+#Rabbit Hide=
+#Rat=
+#Raw Chicken=
+#Raw Mutton=
+#Raw Porkchop=
+#Raw Rabbit=
+#Red=
+#Violet=
+#Warthog=
+#White=
+#Yellow=
+#[MOD] Mobs Redo Animals loaded=

locale/mobs_animal.fr.tr

@@ -0,0 +1,50 @@
+# textdomain:mobs_animal
+@1 Sheep=Mouton @1
+Bee=Abeille
+Beehive=Ruche
+Black=noir
+Blue=bleu
+Brown=marron
+Bucket of Milk=Seau de lait
+Bunny=Lapin
+Butter=Beurre
+Cheese=Fromage
+Cheese Block=Bloc de fromage
+Chicken=Poule
+Chicken Egg=Œuf
+Cooked Chicken=Poulet cuit
+Cooked Mutton=Mouton cuit
+Cooked Porkchop=Côte de sanglier cuite
+Cooked Rabbit=Lapin cuit
+Cooked Rat=Rat cuit
+Cow=Vache
+Cow already milked!=Vache déjà traite !
+Cyan=cyan
+Dark Green=vert foncé
+Dark Grey=gris foncé
+Feather=Plume
+Fried Egg=Œuf au plat
+Glass of Milk=Verre de lait
+Green=vert
+Grey=gris
+Hairball=Boule de poils
+Honey=Miel
+Honey Block=Bloc de miel
+Kitten=Chaton
+Magenta=magenta
+Orange=orange
+Panda=Panda
+Penguin=Manchot
+Pink=rose
+Rabbit Hide=Fourrure de lapin
+Rat=Rat
+Raw Chicken=Poulet cru
+Raw Mutton=Mouton cru
+Raw Porkchop=Côte de sanglier crue
+Raw Rabbit=Lapin cru
+Red=rouge
+Violet=violet
+Warthog=Sanglier
+White=blanc
+Yellow=jaune
+[MOD] Mobs Redo Animals loaded=[MOD] Animaux «Mobs Redo» chargés

locale/mobs_animal.it.tr

@@ -0,0 +1,50 @@
+# textdomain:mobs_animal
+@1 Sheep=Pecora @1
+Bee=Ape
+Beehive=Favo
+Black=Nera
+Blue=Blu
+Brown=Marrone
+Bucket of Milk=Secchio di latte
+Bunny=Coniglietto
+#Butter=
+Cheese=Formaggio
+Cheese Block=Blocco di formaggio
+Chicken=Gallina
+Chicken Egg=Uovo di gallina
+Cooked Chicken=Pollo cotto
+Cooked Mutton=Montone Cotto
+Cooked Porkchop=Bistecca di maiale cotta
+Cooked Rabbit=Coniglio Cotto
+Cooked Rat=Ratto cotto
+Cow=Mucca
+Cow already milked!=Mucca già munta!
+Cyan=Ciano
+Dark Green=Verde scuro
+Dark Grey=Grigio scuro
+Feather=Piuma
+Fried Egg=Uovo fritto
+#Glass of Milk=
+Green=Verde
+Grey=Grigia
+#Hairball=
+Honey=Miele
+Honey Block=Blocco di miele
+Kitten=Gattino
+Magenta=Magenta
+Orange=Arancione
+#Panda=
+Penguin=Pinguino
+Pink=Rosa
+Rabbit Hide=Pelle di Coniglio
+Rat=Ratto
+Raw Chicken=Pollo crudo
+Raw Mutton=Montone Crudo
+Raw Porkchop=Bistecca di maiale cruda
+Raw Rabbit=Coniglio Crudo
+Red=Rossa
+Violet=Viola
+Warthog=Facocero
+White=Bianca
+Yellow=Gialla
+#[MOD] Mobs Redo Animals loaded=

locale/mobs_animal.ms.tr

@@ -0,0 +1,50 @@
+# textdomain:mobs_animal
+@1 Sheep=Biri-biri @1
+Bee=Lebah
+Beehive=Sarang Lebah
+Black=Hitam
+Blue=Biru
+Brown=Perang
+Bucket of Milk=Baldi Susu
+Bunny=Arnab
+#Butter=
+Cheese=Keju
+Cheese Block=Blok Keju
+Chicken=Ayam
+Chicken Egg=Telur Ayam
+Cooked Chicken=Ayam Bakar
+Cooked Mutton=Daging Biri-biri Bakar
+Cooked Porkchop=Daging Babi Bakar
+Cooked Rabbit=Daging Arnab Bakar
+Cooked Rat=Tikus Bakar
+Cow=Lembu
+Cow already milked!=Lembu telah diperah susunya!
+Cyan=Sian
+Dark Green=Hijau Gelap
+Dark Grey=Kelabu Gelap
+Feather=Bulu
+Fried Egg=Telur Goreng
+#Glass of Milk=
+Green=Hijau
+Grey=Kelabu
+#Hairball=
+Honey=Madu
+Honey Block=Blok Madu
+Kitten=Anak Kucing
+Magenta=Merah Lembayung
+Orange=Jingga
+#Panda=
+Penguin=Penguin
+Pink=Merah Jambu
+Rabbit Hide=Belulang Arnab
+Rat=Tikus
+Raw Chicken=Ayam Mentah
+Raw Mutton=Daging Biri-biri Mentah
+Raw Porkchop=Daging Babi Mentah
+Raw Rabbit=Daging Arnab Mentah
+Red=Merah
+Violet=Ungu
+Warthog=Babi Hutan
+White=Putih
+Yellow=Kuning
+#[MOD] Mobs Redo Animals loaded=

locale/mobs_animal.ru.tr

@@ -0,0 +1,50 @@
+# textdomain:mobs_animal
+@1 Sheep=@1 овца
+Bee=Пчела
+Beehive=Улей
+Black=Черная
+Blue=Синяя
+Brown=Коричневая
+Bucket of Milk=Ведро молока
+Bunny=Кролик
+Butter=Масло
+Cheese=Сыр
+Cheese Block=Блок сыра
+Chicken=Курица
+Chicken Egg=Куриное яйцо
+Cooked Chicken=Приготовленная курятина
+Cooked Mutton=Приготовленная баранина
+Cooked Porkchop=Приготовленные свиные отбивные
+Cooked Rabbit=Приготовленная крольчатина
+Cooked Rat=Приготовленная крыса
+Cow=Корова
+Cow already milked!=Корову уже подоили!
+Cyan=Голубая
+Dark Green=Темно-зеленая
+Dark Grey=Темно-серая
+Feather=Перо
+Fried Egg=Яичница
+Glass of Milk=Стакан молока
+Green=Зеленая
+Grey=Серая
+Hairball=Комочек шерсти
+Honey=Мёд
+Honey Block=Блок мёда
+Kitten=Котенок
+Magenta=Пурпурная
+Orange=Оранжевая
+Panda=Панда
+Penguin=Пингвин
+Pink=Розовая
+Rabbit Hide=Кроличья шкурка
+Rat=Крыса
+Raw Chicken=Сырая курятина
+Raw Mutton=Сырая баранина
+Raw Porkchop=Свиные отбивные
+Raw Rabbit=Сырая крольчатина
+Red=Красная
+Violet=Фиолетовая
+Warthog=Бородавочник
+White=Белая
+Yellow=Желтая
+#[MOD] Mobs Redo Animals loaded=

locale/mobs_animal.tr.tr

@@ -0,0 +1,50 @@
+# textdomain:mobs_animal
+@1 Sheep=@1 Koyun
+Bee=Arı
+Beehive=Arı kovanı
+Black=Siyah
+Blue=Mavi
+Brown=Kahverengi
+Bucket of Milk=Süt kovası
+Bunny=Tavşan
+#Butter=
+Cheese=Peynir
+Cheese Block=Peynir bloğu
+Chicken=Tavuk
+Chicken Egg=Tavuk yumurtası 
+Cooked Chicken=Pişmiş tavuk
+Cooked Mutton=pişmiş kuzu
+Cooked Porkchop=Pişmiş pirzola
+Cooked Rabbit=pişmiş tavşan
+Cooked Rat=Pişmiş sıçan
+Cow=İnek
+Cow already milked!=İnekte süt yok!
+Cyan=Camgöbeği
+Dark Green=Koyu yeşil
+Dark Grey=Koyu gri
+#Feather=
+Fried Egg=Kızarmış yumurta
+#Glass of Milk=
+Green=Yeşil
+Grey=Gri
+#Hairball=
+Honey=Bal
+Honey Block=Bal bloğu
+Kitten=Yavru kedi
+Magenta=Macenta
+Orange=Turuncu
+#Panda=
+#Penguin=
+Pink=Pembe
+Rabbit Hide=tavşan kürkü
+Rat=Sıçan
+Raw Chicken=Çiğ tavuk
+Raw Mutton=çiğ kuzu
+Raw Porkchop=Çiğ pirzola
+Raw Rabbit=çiğ tavşan
+Red=Kırmızı
+Violet=Mor
+Warthog=Domuz
+White=Beyaz
+Yellow=Sarı
+#[MOD] Mobs Redo Animals loaded=

locale/mobs_animal.zh_CN.tr

@@ -0,0 +1,50 @@
+# textdomain:mobs_animal
+@1 Sheep=@1羊
+Bee=蜜蜂
+Beehive=蜂巢
+Black=黑
+Blue=蓝
+Brown=棕
+Bucket of Milk=一桶牛奶
+Bunny=兔子
+Butter=黄油
+Cheese=奶酪
+Cheese Block=奶酪方块
+Chicken=鸡
+Chicken Egg=鸡蛋
+Cooked Chicken=熟鸡肉
+Cooked Mutton=熟羊肉
+Cooked Porkchop=熟猪排
+Cooked Rabbit=熟兔肉
+Cooked Rat=熟老鼠
+Cow=奶牛
+Cow already milked!=奶牛已被挤奶！
+Cyan=青
+Dark Green=暗绿
+Dark Grey=暗灰
+Feather=羽毛
+Fried Egg=煎蛋
+Glass of Milk=一杯牛奶
+Green=绿
+Grey=灰
+Hairball=毛球
+Honey=蜂蜜
+Honey Block=蜂蜜方块
+Kitten=小猫
+Magenta=品红
+Orange=橙
+Panda=熊猫
+Penguin=企鹅
+Pink=粉红
+Rabbit Hide=兔子皮
+Rat=老鼠
+Raw Chicken=生鸡肉
+Raw Mutton=生羊肉
+Raw Porkchop=生猪排
+Raw Rabbit=生兔肉
+Red=红
+Violet=紫
+Warthog=野猪
+White=白
+Yellow=黄
+#[MOD] Mobs Redo Animals loaded=

locale/mobs_animal.zh_TW.tr

@@ -0,0 +1,50 @@
+# textdomain:mobs_animal
+@1 Sheep=@1羊
+Bee=蜜蜂
+Beehive=蜂巢
+Black=黑
+Blue=藍
+Brown=棕
+Bucket of Milk=一桶牛奶
+Bunny=兔子
+Butter=黃油
+Cheese=奶酪
+Cheese Block=奶酪方塊
+Chicken=雞
+Chicken Egg=雞蛋
+Cooked Chicken=熟雞肉
+Cooked Mutton=熟羊肉
+Cooked Porkchop=熟豬排
+Cooked Rabbit=熟兔肉
+Cooked Rat=熟老鼠
+Cow=奶牛
+Cow already milked!=奶牛已被擠奶！
+Cyan=青
+Dark Green=暗綠
+Dark Grey=暗灰
+Feather=羽毛
+Fried Egg=煎蛋
+Glass of Milk=一杯牛奶
+Green=綠
+Grey=灰
+Hairball=毛球
+Honey=蜂蜜
+Honey Block=蜂蜜方塊
+Kitten=小貓
+Magenta=品紅
+Orange=橙
+Panda=熊貓
+Penguin=企鵝
+Pink=粉紅
+Rabbit Hide=兔子皮
+Rat=老鼠
+Raw Chicken=生雞肉
+Raw Mutton=生羊肉
+Raw Porkchop=生豬排
+Raw Rabbit=生兔肉
+Red=紅
+Violet=紫
+Warthog=野豬
+White=白
+Yellow=黃
+#[MOD] Mobs Redo Animals loaded=