From b74078a06cd76b3fca66348398dd1f1cdb7cb602 Mon Sep 17 00:00:00 2001 From: jordan4ibanez Date: Thu, 29 Apr 2021 17:42:06 -0400 Subject: [PATCH 1/7] Feature freeze begins here --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 7c3cecece..102912e97 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ +# ______ +# | ___| +# | |_ _ __ ___ _______ _ __ +# | _| '__/ _ \_ / _ \ '_ \ +# | | | | | (_) / / __/ | | | +# \_| |_| \___/___\___|_| |_| + # 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. From 55177c03ec15f2d4cc4c4144bc72080778b59edf Mon Sep 17 00:00:00 2001 From: jordan4ibanez Date: Thu, 29 Apr 2021 17:42:43 -0400 Subject: [PATCH 2/7] Fix feature freeze text --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 102912e97..ca4d01959 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,4 @@ -# ______ -# | ___| -# | |_ _ __ ___ _______ _ __ -# | _| '__/ _ \_ / _ \ '_ \ -# | | | | | (_) / / __/ | | | -# \_| |_| \___/___\___|_| |_| +# (Currently in feature freeze) # MineClone 2 An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils. From 7e3dd715af7bf7a5781a08234cbcd0c82a5294ad Mon Sep 17 00:00:00 2001 From: kay27 Date: Fri, 30 Apr 2021 16:51:34 +0400 Subject: [PATCH 3/7] Fix https://git.minetest.land/MineClone2/MineClone2/issues/1681 by @cora --- mods/HUD/mcl_experience/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index 47db77bca..fd78534fc 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/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 From ae1212be7f7ea9eb517999d40937af0f2abc332e Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Fri, 30 Apr 2021 16:29:45 +0200 Subject: [PATCH 4/7] Add anon5's fix to prevent get_light crashes --- .../ENTITIES/mcl_mobs/api/mob_functions/backup_code_api.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/backup_code_api.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/backup_code_api.lua index c7c4ad27c..76c062a40 100644 --- a/mods/ENTITIES/mcl_mobs/api/mob_functions/backup_code_api.lua +++ b/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 lightfunc = minetest.get_natural_light or minetest.get_node_light - return lightfunc(pos, tod) + local ok, light = pcall(minetest.get_natural_light or minetest.get_node_light, pos, tod) + if ok then + return light else return 0 end From 8cccbd7caad680cfbe97ef0effd24b07e7fca7c2 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Fri, 30 Apr 2021 16:38:53 +0200 Subject: [PATCH 5/7] Fix harming potion crash --- mods/ITEMS/mcl_potions/functions.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_potions/functions.lua b/mods/ITEMS/mcl_potions/functions.lua index 9a1e38d99..55a98ba9d 100644 --- a/mods/ITEMS/mcl_potions/functions.lua +++ b/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 From a77f99a1eca537c8eb84ca8baadefcf2f39296a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sch=C3=B6tz?= Date: Sun, 18 Apr 2021 23:54:40 +0200 Subject: [PATCH 6/7] Sets killerbunny-label in a translateable way --- mods/ENTITIES/mobs_mc/locale/mobs_mc.de.tr | 1 + mods/ENTITIES/mobs_mc/rabbit.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/ENTITIES/mobs_mc/locale/mobs_mc.de.tr b/mods/ENTITIES/mobs_mc/locale/mobs_mc.de.tr index 24d3fa324..6598cd481 100644 --- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.de.tr +++ b/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 diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua index 90d5c27bf..3214925ac 100644 --- a/mods/ENTITIES/mobs_mc/rabbit.lua +++ b/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 From f528b31d48f8dfc67abc34b82d5467bdad3fa3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sch=C3=B6tz?= Date: Mon, 19 Apr 2021 20:43:18 +0200 Subject: [PATCH 7/7] Added french, spanish, russian translation for killerbunny-nametag --- mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr | 1 + mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr | 1 + mods/ENTITIES/mobs_mc/locale/mobs_mc.ru.tr | 1 + 3 files changed, 3 insertions(+) diff --git a/mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr b/mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr index 240e7759f..c61c09943 100644 --- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr +++ b/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 diff --git a/mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr b/mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr index ff1e2b9c0..4c8bd562d 100644 --- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr +++ b/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 diff --git a/mods/ENTITIES/mobs_mc/locale/mobs_mc.ru.tr b/mods/ENTITIES/mobs_mc/locale/mobs_mc.ru.tr index 73807c001..8857dda97 100644 --- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.ru.tr +++ b/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=Чешуйница