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

init.lua

@@ -3,6 +3,14 @@
 local MP = minetest.get_modpath(minetest.get_current_modname())
 local S, NS = dofile(MP .. "/intllib.lua")
 
+
+-- 0.4.17 or 5.0 check
+local y_off = 20
+if minetest.registered_nodes["default:permafrost"] then
+	y_off = 10
+end
+
+
 -- rideable horse
 
 mobs:register_mob("mob_horse:horse", {
@@ -53,7 +61,7 @@ mobs:register_mob("mob_horse:horse", {
 			self.max_speed_reverse = 2
 			self.accel = 6
 			self.terrain_type = 3
-			self.driver_attach_at = {x = 0, y = 20, z = -2}
+			self.driver_attach_at = {x = 0, y = y_off, z = -2}
 			self.driver_eye_offset = {x = 0, y = 3, z = 0}
 		end
 
@@ -122,7 +130,7 @@ self.saddle = nil
 self.saddle = nil
 
 			-- attach player to horse
-			elseif (not self.driver
+			elseif (not self.driver and not self.child
 			and clicker:get_wielded_item():get_name() == "mobs:saddle")
 			or self.saddle then
 

locale/zh_CN.pot

@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-02-06 00:07+0800\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"
+
+#: init.lua
+msgid "Horse"
+msgstr "马"
+
+#: init.lua
+msgid "Horse shoes fitted -"
+msgstr "马蹄铁 -"
+
+#: init.lua
+msgid " speed: "
+msgstr "速度："
+
+#: init.lua
+msgid " , jump height: "
+msgstr "，跳跃高度"
+
+#: init.lua
+msgid " , stop speed: "
+msgstr "，停止速度："
+
+#: init.lua
+msgid "Horse shoes only work on horses!"
+msgstr "马蹄铁只对马有效！"
+
+#: init.lua
+msgid "Steel HorseShoes (use on horse to apply)"
+msgstr "钢马蹄铁（用在马匹上）"
+
+#: init.lua
+msgid "Bronze HorseShoes (use on horse to apply)"
+msgstr "青铜马蹄铁（用在马匹上）"
+
+#: init.lua
+msgid "Mese HorseShoes (use on horse to apply)"
+msgstr "黄石马蹄铁（用在马匹上）"
+
+#: init.lua
+msgid "Diamond HorseShoes (use on horse to apply)"
+msgstr "钻石马蹄铁（用在马匹上）"

locale/zh_CN.txt

@@ -0,0 +1,12 @@
+#Mod: mob_horse
+
+Horse = 马
+Horse shoes fitted - = 马蹄铁 -
+ speed:  = 速度：
+ , jump height:  = ，跳跃高度：
+ , stop speed:  = ，停止速度：
+Horse shoes only work on horses! = 马蹄铁只对马有效！
+Steel HorseShoes (use on horse to apply) = 钢马蹄铁（用在马匹上）
+Bronze HorseShoes (use on horse to apply) = 青铜马蹄铁（用在马匹上）
+Mese HorseShoes (use on horse to apply) = 黄石马蹄铁（用在马匹上）
+Diamond HorseShoes (use on horse to apply) = 钻石马蹄铁（用在马匹上）

locale/zh_TW.txt

@@ -0,0 +1,12 @@
+#Mod: mob_horse
+
+Horse = 馬
+Horse shoes fitted - = 馬蹄鐵 -
+ speed:  = 速度：
+ , jump height:  = ，跳躍高度：
+ , stop speed:  = ，停止速度：
+Horse shoes only work on horses! = 馬蹄鐵只對馬有效！
+Steel HorseShoes (use on horse to apply) = 鋼馬蹄鐵（用在馬匹上）
+Bronze HorseShoes (use on horse to apply) = 青銅馬蹄鐵（用在馬匹上）
+Mese HorseShoes (use on horse to apply) = 黃石馬蹄鐵（用在馬匹上）
+Diamond HorseShoes (use on horse to apply) = 鑽石馬蹄鐵（用在馬匹上）