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 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
@@ -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