Merge branch 'master' into dyable-leather-armor

README.md

@@ -1,3 +1,5 @@
+# (Currently in feature freeze)
+
 # MineClone 2
 An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
 Developed by many people. Not developed or endorsed by Mojang AB.

mods/ENTITIES/mcl_mobs/api/mob_functions/backup_code_api.lua

@@ -1515,9 +1515,9 @@ local is_at_water_danger = function(self)
 end
 
 local function get_light(pos, tod)
-	if minetest.get_node_or_nil(pos) then
+	local ok, light = pcall(minetest.get_natural_light or minetest.get_node_light, pos, tod)
-		local lightfunc = minetest.get_natural_light or minetest.get_node_light
+	if ok then
-		return lightfunc(pos, tod)
+		return light
 	else
 		return 0
 	end

mods/ENTITIES/mobs_mc/locale/mobs_mc.de.tr

@@ -28,6 +28,7 @@ Pig=Schwein
 Polar Bear=Eisbär
 Rabbit=Kaninchen
 Killer Bunny=Killerkaninchen
+The Killer Bunny=Das Killerkaninchen
 Sheep=Schaf
 Shulker=Shulker
 Silverfish=Silberfischchen

mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr

@@ -28,6 +28,7 @@ Pig=Cerdo
 Polar Bear=Oso polar
 Rabbit=Conejo
 Killer Bunny=Conejo asesino
+The Killer Bunny=El Conejo asesino
 Sheep=Oveja
 Shulker=Shulker
 Silverfish=Lepisma

mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr

@@ -28,6 +28,7 @@ Pig=Cochon
 Polar Bear=Ours blanc
 Rabbit=Lapin
 Killer Bunny=Lapin tueur
+The Killer Bunny=Le Lapin tueur
 Sheep=Mouton
 Shulker=Shulker
 Silverfish=Poisson d'argent

mods/ENTITIES/mobs_mc/locale/mobs_mc.ru.tr

@@ -28,6 +28,7 @@ Pig=Свинья
 Polar Bear=Полярный медведь
 Rabbit=Кролик
 Killer Bunny=Кролик-убийца
+The Killer Bunny=Кролик-убийца
 Sheep=Овца
 Shulker=Шалкер
 Silverfish=Чешуйница

mods/ENTITIES/mobs_mc/rabbit.lua

@@ -99,7 +99,7 @@ killer_bunny.on_rightclick = nil
 killer_bunny.run_velocity = 6
 killer_bunny.do_custom = function(self)
 	if not self._killer_bunny_nametag_set then
-		self.nametag = "The Killer Bunny"
+		self.nametag = S("The Killer Bunny")
 		self._killer_bunny_nametag_set = true
 	end
 end

mods/HUD/mcl_experience/init.lua

@@ -263,7 +263,7 @@ function mcl_experience.add_experience(player, experience)
 		local can = final_candidates[math.random(#final_candidates)]
 		local stack, list, index, wear = can.stack, can.list, can.index, can.wear
 		local unbreaking_level = mcl_enchanting.get_enchantment(stack, "unbreaking")
-		local uses = mcl_util.calculate_durability(itemstack)
+		local uses = mcl_util.calculate_durability(stack)
 		local multiplier = 2 * 65535 / uses
 		local repair = experience * multiplier
 		local new_wear = wear - repair

mods/ITEMS/mcl_potions/functions.lua

@@ -689,7 +689,7 @@ function mcl_potions.healing_func(player, hp)
 			hp = -1
 		end
 
-		mcl_util.deal_damage(obj, -hp, {type = "magic"})
+		mcl_util.deal_damage(player, -hp, {type = "magic"})
 	end
 
 end