Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

bee.lua

@@ -79,7 +79,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)

chicken.lua

@@ -91,15 +91,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,

cow.lua

@@ -66,6 +66,7 @@ mobs:register_mob("mobs_animal:cow", {
 		{"group:grass", "mobs:dung", 0},
 		{"default:dirt_with_grass", "default:dirt", -1}
 	},
+--	stay_near = {{"farming:straw", "group:grass"}, 10},
 	fear_height = 2,
 	on_rightclick = function(self, clicker)
 

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"
+"PO-Revision-Date: 2020-06-19 19:00 (UTC+3)\n"
-"Last-Translator: Oleg720 <contact@oleg720.ru>\n"
+"Last-Translator: YELLOW <pikayellow35@gmail.com>\n"
-"Language-Team: 720 Locales <>\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 "Приготовленные свиные отбивные"

warthog.lua

@@ -64,13 +64,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({