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)
 
@@ -118,6 +119,7 @@ mobs:register_mob("mobs_animal:cow", {
 			return
 		end
 	end,
+
 	on_replace = function(self, pos, oldnode, newnode)
 
 		self.food = (self.food or 0) + 1

license.txt

@@ -25,3 +25,5 @@ Chicken sounds from freesounds.org under CC0
 Mutton, Pork and Rabbit meat textures by Piezo_ under CC0
 
 Cow textures by sirrobzeroone under CC0
+
+mobs_panda_viking.png by Zlo under CC0

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 "Приготовленные свиные отбивные"

locale/zh_CN.pot

@@ -0,0 +1,206 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# IFRFSX <1079092922@qq.com>, 2020.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-31 11:28+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: bee.lua
+msgid "Bee"
+msgstr "蜜蜂"
+
+#: bee.lua
+msgid "Honey"
+msgstr "蜂蜜"
+
+#: bee.lua
+msgid "Beehive"
+msgstr "蜂巢"
+
+#: bee.lua
+msgid "Honey Block"
+msgstr "蜂蜜方块"
+
+#: bunny.lua
+msgid "Bunny"
+msgstr "兔子"
+
+#: bunny.lua
+msgid "Raw Rabbit"
+msgstr "生兔肉"
+
+#: bunny.lua
+msgid "Cooked Rabbit"
+msgstr "熟兔肉"
+
+#: bunny.lua
+msgid "Rabbit Hide"
+msgstr "兔子皮"
+
+#: chicken.lua
+msgid "Chicken"
+msgstr "鸡"
+
+#: chicken.lua
+msgid "Chicken Egg"
+msgstr "鸡蛋"
+
+#: chicken.lua
+msgid "Fried Egg"
+msgstr "煎蛋"
+
+#: chicken.lua
+msgid "Raw Chicken"
+msgstr "生鸡肉"
+
+#: chicken.lua
+msgid "Cooked Chicken"
+msgstr "熟鸡肉"
+
+#: chicken.lua
+msgid "Feather"
+msgstr "羽毛"
+
+#: cow.lua
+msgid "Cow already milked!"
+msgstr "奶牛已经被挤奶了！"
+
+#: cow.lua
+msgid "Cow"
+msgstr "奶牛"
+
+#: cow.lua
+msgid "Bucket of Milk"
+msgstr "一桶牛奶"
+
+#: cow.lua
+msgid "Glass of Milk"
+msgstr "一杯牛奶"
+
+#: cow.lua
+msgid "Cheese"
+msgstr "奶酪"
+
+#: cow.lua
+msgid "Cheese Block"
+msgstr "奶酪方块"
+
+#: init.lua
+msgid "[MOD] Mobs Redo 'Animals' loaded"
+msgstr "[模组] Mobs Redo 'Animals' 已加载！"
+
+#: kitten.lua
+msgid "Kitten"
+msgstr "小猫"
+
+#: kitten.lua
+msgid "Hairball"
+msgstr "毛球"
+
+#: penguin.lua
+msgid "Penguin"
+msgstr "企鹅"
+
+#: rat.lua
+msgid "Rat"
+msgstr "老鼠"
+
+#: rat.lua
+msgid "Cooked Rat"
+msgstr "熟老鼠"
+
+#: sheep.lua
+msgid "Black"
+msgstr "黑"
+
+#: sheep.lua
+msgid "Blue"
+msgstr "蓝"
+
+#: sheep.lua
+msgid "Brown"
+msgstr "棕"
+
+#: sheep.lua
+msgid "Cyan"
+msgstr "青"
+
+#: sheep.lua
+msgid "Dark Green"
+msgstr "蓝绿"
+
+#: sheep.lua
+msgid "Dark Grey"
+msgstr "蓝灰"
+
+#: sheep.lua
+msgid "Green"
+msgstr "绿"
+
+#: sheep.lua
+msgid "Grey"
+msgstr "灰"
+
+#: sheep.lua
+msgid "Magenta"
+msgstr "品红"
+
+#: sheep.lua
+msgid "Orange"
+msgstr "橙"
+
+#: sheep.lua
+msgid "Pink"
+msgstr "粉红"
+
+#: sheep.lua
+msgid "Red"
+msgstr "红"
+
+#: sheep.lua
+msgid "Violet"
+msgstr "紫"
+
+#: sheep.lua
+msgid "White"
+msgstr "白"
+
+#: sheep.lua
+msgid "Yellow"
+msgstr "黄"
+
+#: sheep.lua
+msgid "@1 Sheep"
+msgstr "@1羊"
+
+#: sheep.lua
+msgid "Raw Mutton"
+msgstr "生羊肉"
+
+#: sheep.lua
+msgid "Cooked Mutton"
+msgstr "熟羊肉"
+
+#: warthog.lua
+msgid "Warthog"
+msgstr "野猪"
+
+#: warthog.lua
+msgid "Raw Porkchop"
+msgstr "生猪排"
+
+#: warthog.lua
+msgid "Cooked Porkchop"
+msgstr "熟猪排"

locale/zh_CN.txt

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

locale/zh_TW.txt

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

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({