Merge https://notabug.org/TenPlus1/mobs_animal into HEAD

2020-09-11 09:28:09 +02:00 · 2020-09-11 09:28:09 +02:00 · 27d51ce380
parent f5caf7f262 e8ccc6b3c1
commit 27d51ce380
21 changed files with 529 additions and 93 deletions
--- a/bee.lua
+++ b/bee.lua
@ -128,7 +128,7 @@ minetest.register_node(":mobs:beehive", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = true,
-	groups = {oddly_breakable_by_hand = 3, flammable = 1},
+	groups = {oddly_breakable_by_hand = 3, flammable = 1, disable_suffocation = 1},
 	sounds = default.node_sound_defaults(),

 	on_construct = function(pos)
--- a/chicken.lua
+++ b/chicken.lua
@ -39,7 +39,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,
@ -56,7 +56,10 @@ stepheight = 0.6,
 		run_end = 110,
 		run_speed = 24,
 	},
-	follow = {"farming:seed_wheat", "farming:seed_cotton"},
+	follow = {
+		"farming:seed_wheat", "farming:seed_cotton", "farming:seed_barley",
+		"farming:seed_oat", "farming:seed_rye"
+	},
 	view_range = 5,

 	on_rightclick = function(self, clicker)
@ -92,15 +95,15 @@ stepheight = 0.6,
 })


-local spawn_on = "default:dirt_with_grass"
+local spawn_on = {"default:dirt_with_grass"}

 if minetest.get_modpath("ethereal") then
-	spawn_on = "ethereal:bamboo_dirt"
+	spawn_on = {"ethereal:bamboo_dirt", "ethereal:prairie_dirt"}
 end

 mobs:spawn({
 	name = "mobs_animal:chicken",
-	nodes = {spawn_on},
+	nodes = spawn_on,
 	neighbors = {"group:grass"},
 	min_light = 14,
 	interval = 60,
--- a/cow.lua
+++ b/cow.lua
@ -59,13 +59,17 @@ mobs:register_mob("mobs_animal:cow", {
 		die_speed = 10,
 		die_loop = false,
 	},
-	follow = {"farming:wheat", "default:grass_1"},
+	follow = {
+		"farming:wheat", "default:grass_1", "farming:barley",
+		"farming:oat", "farming:rye"
+	},
 	view_range = 8,
 	replace_rate = 10,
 	replace_what = {
 		{"group:grass", "air", 0},
 		{"default:dirt_with_grass", "default:dirt", -1}
 	},
+--	stay_near = {{"farming:straw", "group:grass"}, 10},
 	fear_height = 2,
 	on_rightclick = function(self, clicker)

@ -157,7 +161,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
@ -165,7 +169,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({
--- a/depends.txt
+++ b/depends.txt
@ -1,4 +1,4 @@
 default
 mobs
-intllib?
 lucky_block?
+intllib?
--- a/init.lua
+++ b/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 S, NS = dofile(MP.."/intllib.lua")
+local path = minetest.get_modpath(minetest.get_current_modname())
+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
@ -19,6 +17,7 @@ dofile(path .. "/kitten.lua") -- Jordach/BFD
 dofile(path .. "/penguin.lua") -- D00Med
 dofile(path .. "/panda.lua") -- AspireMint

+-- Lucky Blocks
 dofile(path .. "/lucky_block.lua")

 print (S("[MOD] Mobs Redo Animals loaded"))
--- a/intllib.lua
+++ b/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
--- a/kitten.lua
+++ b/kitten.lua
@ -53,7 +53,10 @@ stepheight = 1.1,
 		stoodup_start = 0,
 		stoodup_end = 0,
 	},
-	follow = {"mobs_animal:rat", "ethereal:fish_raw", "mobs_fish:clownfish", "mobs_fish:tropical"},
+	follow = {
+		"mobs_animal:rat", "ethereal:fish_raw", "mobs_fish:clownfish",
+		"mobs_fish:tropical", "xocean:fish_edible"
+	},
 	view_range = 8,

 	on_rightclick = function(self, clicker)
--- a/locale/mobs_animal.de.tr
+++ b/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=
--- a/locale/mobs_animal.en.tr
+++ b/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=
--- a/locale/mobs_animal.fr.tr
+++ b/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
--- a/locale/mobs_animal.it.tr
+++ b/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=
--- a/locale/mobs_animal.ms.tr
+++ b/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=
--- a/locale/mobs_animal.ru.tr
+++ b/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=
--- a/locale/mobs_animal.tr.tr
+++ b/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=
--- a/locale/mobs_animal.zh_CN.tr
+++ b/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=
--- a/locale/mobs_animal.zh_TW.tr
+++ b/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=
--- a/locale/ru.po
+++ b/locale/ru.po
@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-13 16:00 (UTC+5)\n"
-"PO-Revision-Date: 2018-03-29 18:00 (UTC+5)\n"
-"Last-Translator: Oleg720 <contact@oleg720.ru>\n"
-"Language-Team: 720 Locales <>\n"
+"PO-Revision-Date: 2020-06-19 19:00 (UTC+3)\n"
+"Last-Translator: YELLOW <pikayellow35@gmail.com>\n"
+"Language-Team: \n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
@ -39,16 +39,16 @@ msgstr "Кролик"

 #: bunny.lua
 msgid "Raw Rabbit"
-msgstr "Сырой кролик"
+msgstr "Сырая крольчатина"

 #: bunny.lua
 #, fuzzy
 msgid "Cooked Rabbit"
-msgstr "Приготовленный кролик"
+msgstr "Приготовленная крольчатина"

 #: bunny.lua
 msgid "Rabbit Hide"
-msgstr "Кролик скрыть"
+msgstr "Кроличья шкурка"

 #: chicken.lua
 msgid "Chicken"
@ -56,11 +56,11 @@ msgstr "Курица"

 #: chicken.lua
 msgid "Chicken Egg"
-msgstr "Курино яйцо"
+msgstr "Куриное яйцо"

 #: chicken.lua
 msgid "Fried Egg"
-msgstr "Жареное яйцо"
+msgstr "Яичница"

 #: chicken.lua
 msgid "Raw Chicken"
@ -68,7 +68,7 @@ msgstr "Сырая курятина"

 #: chicken.lua
 msgid "Cooked Chicken"
-msgstr "Вареная курятина"
+msgstr "Приготовленная курятина"

 #: chicken.lua
 msgid "Feather"
@ -86,6 +86,14 @@ msgstr "Корова"
 msgid "Bucket of Milk"
 msgstr "Ведро молока"

+#: cow.lua
+msgid "Glass of Milk"
+msgstr "Стакан молока"
+
+#: cow.lua
+msgid "Butter"
+msgstr "Масло"
+
 #: cow.lua
 msgid "Cheese"
 msgstr "Сыр"
@ -102,6 +110,14 @@ msgstr "[МОД] Mobs Redo 'Animals' загружен"
 msgid "Kitten"
 msgstr "Котенок"

+#: kitten.lua
+msgid "Hairball"
+msgstr "Комочек шерсти"
+
+#: panda.lua
+msgid "Panda"
+msgstr "Панда"
+
 #: penguin.lua
 msgid "Penguin"
 msgstr "Пингвин"
@ -116,76 +132,76 @@ msgstr "Приготовленная крыса"

 #: sheep.lua
 msgid "Black"
-msgstr "Черный"
+msgstr "Черная"

 #: sheep.lua
 msgid "Blue"
-msgstr "Синий"
+msgstr "Синяя"

 #: sheep.lua
 msgid "Brown"
-msgstr "Коричневый"
+msgstr "Коричневая"

 #: sheep.lua
 msgid "Cyan"
-msgstr "Голубой"
+msgstr "Голубая"

 #: sheep.lua
 msgid "Dark Green"
-msgstr "Темно-зеленый"
+msgstr "Темно-зеленая"

 #: sheep.lua
 msgid "Dark Grey"
-msgstr "Темно-серый"
+msgstr "Темно-серая"

 #: sheep.lua
 msgid "Green"
-msgstr "Зеленый"
+msgstr "Зеленая"

 #: sheep.lua
 msgid "Grey"
-msgstr "Серый"
+msgstr "Серая"

 #: sheep.lua
 msgid "Magenta"
-msgstr "Пурпурный"
+msgstr "Пурпурная"

 #: sheep.lua
 msgid "Orange"
-msgstr "Оранжевый"
+msgstr "Оранжевая"

 #: sheep.lua
 msgid "Pink"
-msgstr "Розовый"
+msgstr "Розовая"

 #: sheep.lua
 msgid "Red"
-msgstr "Красный"
+msgstr "Красная"

 #: sheep.lua
 msgid "Violet"
-msgstr "Фиолетовый"
+msgstr "Фиолетовая"

 #: sheep.lua
 msgid "White"
-msgstr "Белый"
+msgstr "Белая"

 #: sheep.lua
 msgid "Yellow"
-msgstr "Желтый"
+msgstr "Желтая"

 #: sheep.lua
 msgid "@1 Sheep"
-msgstr "@1 Овец"
+msgstr "@1 овца"

 #: sheep.lua
 msgid "Raw Mutton"
-msgstr "сырой ягненок"
+msgstr "Сырая баранина"

 #: sheep.lua
 #, fuzzy
 msgid "Cooked Mutton"
-msgstr "приготовленный ягненок"
+msgstr "Приготовленная баранина"

 #: warthog.lua
 msgid "Warthog"
@ -193,8 +209,8 @@ msgstr "Бородавочник"

 #: warthog.lua
 msgid "Raw Porkchop"
-msgstr "Отбивные из свинины"
+msgstr "Свиные отбивные"

 #: warthog.lua
 msgid "Cooked Porkchop"
-msgstr "Приготовленные отбивные"
+msgstr "Приготовленные свиные отбивные"
--- a/penguin.lua
+++ b/penguin.lua
@ -48,7 +48,7 @@ stepheight = 0.6,
 	floats = 0,
 	follow = {
 		"ethereal:fish_raw", "mobs_fish:clownfish", "mobs_fish:tropical",
-		"mobs_fish:clownfish_set", "mobs_fish:tropical_set"
+		"mobs_fish:clownfish_set", "mobs_fish:tropical_set", "xocean:fish_edible"
 	},
 	view_range = 5,

--- a/sheep.lua
+++ b/sheep.lua
@ -66,7 +66,10 @@ for _, col in ipairs(all_colours) do
 			walk_start = 81,
 			walk_end = 100,
 		},
-		follow = {"farming:wheat", "default:grass_1"},
+		follow = {
+			"farming:wheat", "default:grass_1", "farming:barley",
+			"farming:oat", "farming:rye"
+		},
 		view_range = 8,
 		replace_rate = 10,
 		replace_what = {
--- a/sounds/mobs_kitten.ogg
+++ b/sounds/mobs_kitten.ogg
--- a/warthog.lua
+++ b/warthog.lua
@ -63,13 +63,13 @@ local spawn_on = {"default:dirt_with_grass"}
 local spawn_by = {"group:grass"}

 if minetest.get_mapgen_setting("mg_name") ~= "v6" then
-	spawn_on = {"default:dirt_with_dry_grass"}
+	spawn_on = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"}
 	spawn_by = {"group:dry_grass"}
 end

 if minetest.get_modpath("ethereal") then
 	spawn_on = {"ethereal:mushroom_dirt"}
-	spawn_by = {"flowers:mushroom_brown", "flowers:mushroom_brown"}
+	spawn_by = {"flowers:mushroom_brown", "flowers:mushroom_red"}
 end

 mobs:spawn({