From e0b61123204494d757dd3098ac56cfcc99a1f596 Mon Sep 17 00:00:00 2001 From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com> Date: Tue, 19 Dec 2023 06:13:04 +0000 Subject: [PATCH 01/12] Tweak Esperanto translation (#128) --- 3d_armor/locale/3d_armor.eo.tr | 2 +- 3d_armor_ip/locale/3d_armor_ip.eo.tr | 2 +- 3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr | 2 +- 3d_armor_stand/locale/3d_armor_stand.eo.tr | 8 ++++---- 3d_armor_ui/locale/3d_armor_ui.eo.tr | 6 +++--- armor_admin/locale/armor_admin.eo.tr | 4 ++-- armor_bronze/locale/armor_bronze.eo.tr | 4 ++-- armor_cactus/locale/armor_cactus.eo.tr | 4 ++-- armor_crystal/locale/armor_crystal.eo.tr | 4 ++-- armor_diamond/locale/armor_diamond.eo.tr | 4 ++-- armor_gold/locale/armor_gold.eo.tr | 4 ++-- armor_mithril/locale/armor_mithril.eo.tr | 4 ++-- armor_nether/locale/armor_nether.eo.tr | 4 ++-- armor_steel/locale/armor_steel.eo.tr | 4 ++-- armor_wood/locale/armor_wood.eo.tr | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/3d_armor/locale/3d_armor.eo.tr b/3d_armor/locale/3d_armor.eo.tr index 1ed486c..e3e1a2d 100644 --- a/3d_armor/locale/3d_armor.eo.tr +++ b/3d_armor/locale/3d_armor.eo.tr @@ -1,7 +1,7 @@ # textdomain: 3d_armor Radiation=Radiado Level=Nivelo -Heal=Sanigi +Heal=Blokŝanco Fire=Fajro Your @1 is almost broken!=Via @1 estas preskaŭ rompita! Your @1 got destroyed!=Via @1 detruiĝis! diff --git a/3d_armor_ip/locale/3d_armor_ip.eo.tr b/3d_armor_ip/locale/3d_armor_ip.eo.tr index a49642f..f84e706 100644 --- a/3d_armor_ip/locale/3d_armor_ip.eo.tr +++ b/3d_armor_ip/locale/3d_armor_ip.eo.tr @@ -1,3 +1,3 @@ # textdomain: 3d_armor_ip Back=Dorso -Armor=Kiraso +Armor=Armaĵo diff --git a/3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr b/3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr index 5b7a141..7cc47ce 100644 --- a/3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr +++ b/3d_armor_sfinv/locale/3d_armor_sfinv.eo.tr @@ -1,2 +1,2 @@ # textdomain: 3d_armor_sfinv -Armor=Kiraso +Armor=Armaĵoj diff --git a/3d_armor_stand/locale/3d_armor_stand.eo.tr b/3d_armor_stand/locale/3d_armor_stand.eo.tr index bad7cf3..47a17ab 100644 --- a/3d_armor_stand/locale/3d_armor_stand.eo.tr +++ b/3d_armor_stand/locale/3d_armor_stand.eo.tr @@ -1,5 +1,5 @@ # textdomain: 3d_armor_stand -Armor Stand Top=Kirasstando Supro -Armor Stand=Kirasstando -Locked Armor Stand=Ŝlosita Kirasstando -Armor Stand (owned by @1)=Kirasstando (posedata de @1) +Armor Stand Top=Armaĵtenila Supro +Armor Stand=Armaĵtenilo +Locked Armor Stand=Ŝlosita Armaĵtenilo +Armor Stand (owned by @1)=Ŝlosita Armaĵtenilo (posedata de @1) diff --git a/3d_armor_ui/locale/3d_armor_ui.eo.tr b/3d_armor_ui/locale/3d_armor_ui.eo.tr index 96061aa..7c31cbd 100644 --- a/3d_armor_ui/locale/3d_armor_ui.eo.tr +++ b/3d_armor_ui/locale/3d_armor_ui.eo.tr @@ -1,7 +1,7 @@ # textdomain: 3d_armor_ui -3D Armor=3D Kiraso -Armor not initialized!=Kiraso ne pravigita! -Armor=Kiraso +3D Armor=3D Armaĵoj +Armor not initialized!=Armaĵoj ne pretigitaj! +Armor=Armaĵo Level=Nivelo Heal=Sanigi Fire=Fajro diff --git a/armor_admin/locale/armor_admin.eo.tr b/armor_admin/locale/armor_admin.eo.tr index 97cc3b2..ee050eb 100644 --- a/armor_admin/locale/armor_admin.eo.tr +++ b/armor_admin/locale/armor_admin.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_admin Admin Helmet=Administra Kasko -Admin Chestplate=Administra Brustkiraso +Admin Chestplate=Administra Kiraso Admin Leggings=Administra Pantalono -Admin Boots=Administra Botoj +Admin Boots=Administraj Botoj diff --git a/armor_bronze/locale/armor_bronze.eo.tr b/armor_bronze/locale/armor_bronze.eo.tr index 38f3855..f7a13c2 100644 --- a/armor_bronze/locale/armor_bronze.eo.tr +++ b/armor_bronze/locale/armor_bronze.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_bronze Bronze Helmet=Bronza Kasko -Bronze Chestplate=Bronza Brustkiraso +Bronze Chestplate=Bronza Kiraso Bronze Leggings=Bronza Pantalono -Bronze Boots=Bronza Botoj +Bronze Boots=Bronzaj Botoj diff --git a/armor_cactus/locale/armor_cactus.eo.tr b/armor_cactus/locale/armor_cactus.eo.tr index 240ed03..fffcd5d 100644 --- a/armor_cactus/locale/armor_cactus.eo.tr +++ b/armor_cactus/locale/armor_cactus.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_cactus Cactus Helmet=Kakta Kasko -Cactus Chestplate=Kakta Brustkiraso +Cactus Chestplate=Kakta Kiraso Cactus Leggings=Kakta Pantalono -Cactus Boots=Kakta Botoj +Cactus Boots=Kaktaj Botoj diff --git a/armor_crystal/locale/armor_crystal.eo.tr b/armor_crystal/locale/armor_crystal.eo.tr index 36bbe20..7fae4ea 100644 --- a/armor_crystal/locale/armor_crystal.eo.tr +++ b/armor_crystal/locale/armor_crystal.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_crystal Crystal Helmet=Kristala Kasko -Crystal Chestplate=Kristala Brustkiraso +Crystal Chestplate=Kristala Kiraso Crystal Leggings=Kristala Pantalono -Crystal Boots=Kristala Botoj +Crystal Boots=Kristalaj Botoj diff --git a/armor_diamond/locale/armor_diamond.eo.tr b/armor_diamond/locale/armor_diamond.eo.tr index dad6866..48e5768 100644 --- a/armor_diamond/locale/armor_diamond.eo.tr +++ b/armor_diamond/locale/armor_diamond.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_diamond Diamond Helmet=Diamanta Kasko -Diamond Chestplate=Diamanta Brustkiraso +Diamond Chestplate=Diamanta Kiraso Diamond Leggings=Diamanta Pantalono -Diamond Boots=Diamanta Botoj +Diamond Boots=Diamantaj Botoj diff --git a/armor_gold/locale/armor_gold.eo.tr b/armor_gold/locale/armor_gold.eo.tr index 98a9ad2..58916f1 100644 --- a/armor_gold/locale/armor_gold.eo.tr +++ b/armor_gold/locale/armor_gold.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_gold Gold Helmet=Ora Kasko -Gold Chestplate=Ora Brustkiraso +Gold Chestplate=Ora Kiraso Gold Leggings=Ora Pantalono -Gold Boots=Ora Botoj +Gold Boots=Oraj Botoj diff --git a/armor_mithril/locale/armor_mithril.eo.tr b/armor_mithril/locale/armor_mithril.eo.tr index ad75516..ae5c92d 100644 --- a/armor_mithril/locale/armor_mithril.eo.tr +++ b/armor_mithril/locale/armor_mithril.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_mithril Mithril Helmet=Mitrila Kasko -Mithril Chestplate=Mitrila Brustkiraso +Mithril Chestplate=Mitrila Kiraso Mithril Leggings=Mitrila Pantalono -Mithril Boots=Mitrila Botoj +Mithril Boots=Mitrilaj Botoj diff --git a/armor_nether/locale/armor_nether.eo.tr b/armor_nether/locale/armor_nether.eo.tr index eeaa158..cdf5c02 100644 --- a/armor_nether/locale/armor_nether.eo.tr +++ b/armor_nether/locale/armor_nether.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_nether Nether Helmet=Inferna Kasko -Nether Chestplate=Inferna Brustkiraso +Nether Chestplate=Inferna Kiraso Nether Leggings=Inferna Pantalono -Nether Boots=Inferna Botoj +Nether Boots=Infernaj Botoj diff --git a/armor_steel/locale/armor_steel.eo.tr b/armor_steel/locale/armor_steel.eo.tr index 7ce2f23..8c1d066 100644 --- a/armor_steel/locale/armor_steel.eo.tr +++ b/armor_steel/locale/armor_steel.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_steel Steel Helmet=Ŝtala Kasko -Steel Chestplate=Ŝtala Brustkiraso +Steel Chestplate=Ŝtala Kiraso Steel Leggings=Ŝtala Pantalono -Steel Boots=Ŝtala Botoj +Steel Boots=Ŝtalaj Botoj diff --git a/armor_wood/locale/armor_wood.eo.tr b/armor_wood/locale/armor_wood.eo.tr index acadb65..042ca7d 100644 --- a/armor_wood/locale/armor_wood.eo.tr +++ b/armor_wood/locale/armor_wood.eo.tr @@ -1,5 +1,5 @@ # textdomain: armor_wood Wood Helmet=Ligna Kasko -Wood Chestplate=Ligna Brustkiraso +Wood Chestplate=Ligna Kiraso Wood Leggings=Ligna Pantalono -Wood Boots=Ligna Botoj +Wood Boots=Lignaj Botoj From 467709c935a511912ee079cea352fc7c95b607e0 Mon Sep 17 00:00:00 2001 From: David Leal Date: Tue, 26 Dec 2023 11:34:43 -0600 Subject: [PATCH 02/12] Use `player_api` functions instead of `default` (#129) --- 3d_armor/api.lua | 2 +- 3d_armor/init.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3d_armor/api.lua b/3d_armor/api.lua index 7c71f89..888df17 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -352,7 +352,7 @@ armor.update_player_visuals = function(self, player) end local name = player:get_player_name() if self.textures[name] then - default.player_set_textures(player, { + player_api.set_textures(player, { self.textures[name].skin, self.textures[name].armor, self.textures[name].wielditem, diff --git a/3d_armor/init.lua b/3d_armor/init.lua index 57618d4..62ca087 100644 --- a/3d_armor/init.lua +++ b/3d_armor/init.lua @@ -322,7 +322,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end) minetest.register_on_joinplayer(function(player) - default.player_set_model(player, "3d_armor_character.b3d") + player_api.set_model(player, "3d_armor_character.b3d") init_player_armor(player) end) From f430395b64f32bfb34f5a5d06f6282dcff8da8ac Mon Sep 17 00:00:00 2001 From: BuckarooBanzay Date: Mon, 15 Jan 2024 10:15:49 +0100 Subject: [PATCH 03/12] resolve player object in async function again (different globalstep) fixes #132 --- 3d_armor/api.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/3d_armor/api.lua b/3d_armor/api.lua index 888df17..a692a8f 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -719,6 +719,8 @@ armor.unequip = function(self, player, armor_element) if self:get_element(stack:get_name()) == armor_element then armor_inv:set_stack("armor", i, "") minetest.after(0, function() + -- resolve player object again in async function + player = minetest.get_player_by_name(name) local inv = player:get_inventory() if inv:room_for_item("main", stack) then inv:add_item("main", stack) From 4bac73fc9e68ce22eeabb44887fe19bcb50052e7 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Wed, 17 Jan 2024 10:33:37 +0100 Subject: [PATCH 04/12] Make all admin armor to protect from drowning (#131) --- armor_admin/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/armor_admin/init.lua b/armor_admin/init.lua index 40a6e1d..a84ec62 100644 --- a/armor_admin/init.lua +++ b/armor_admin/init.lua @@ -41,7 +41,7 @@ armor:register_armor(":3d_armor:chestplate_admin", { description = S("Admin Chestplate"), inventory_image = "3d_armor_inv_chestplate_admin.png", armor_groups = {fleshy=100}, - groups = {armor_torso=1, armor_heal=100, armor_use=0, + groups = {armor_torso=1, armor_heal=100, armor_use=0, armor_water=1, not_in_creative_inventory=1}, on_drop = function(itemstack, dropper, pos) return @@ -61,7 +61,7 @@ armor:register_armor(":3d_armor:leggings_admin", { description = S("Admin Leggings"), inventory_image = "3d_armor_inv_leggings_admin.png", armor_groups = {fleshy=100}, - groups = {armor_legs=1, armor_heal=100, armor_use=0, + groups = {armor_legs=1, armor_heal=100, armor_use=0, armor_water=1, not_in_creative_inventory=1}, on_drop = function(itemstack, dropper, pos) return @@ -82,7 +82,7 @@ armor:register_armor(":3d_armor:boots_admin", { inventory_image = "3d_armor_inv_boots_admin.png", armor_groups = {fleshy=100}, groups = {armor_feet=1, armor_heal=100, armor_use=0, physics_speed=1, - not_in_creative_inventory=1}, + armor_water=1, not_in_creative_inventory=1}, on_drop = function(itemstack, dropper, pos) return end, From 7fc313f911a71716aae90a60d0c862430bd4fa1e Mon Sep 17 00:00:00 2001 From: Luke aka SwissalpS Date: Thu, 29 Feb 2024 07:39:44 +0100 Subject: [PATCH 05/12] armorstand nodes are not ground content (#134) --- 3d_armor_stand/init.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/3d_armor_stand/init.lua b/3d_armor_stand/init.lua index b2d42b0..107c040 100644 --- a/3d_armor_stand/init.lua +++ b/3d_armor_stand/init.lua @@ -144,6 +144,7 @@ minetest.register_node("3d_armor_stand:top", { buildable_to = false, drop = "", groups = {not_in_creative_inventory = 1}, + is_ground_content = false, on_blast = function() end, tiles = {"3d_armor_trans.png"}, }) @@ -165,6 +166,7 @@ minetest.register_node("3d_armor_stand:armor_stand", { }, }, groups = {choppy=2, oddly_breakable_by_hand=2}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) @@ -234,6 +236,7 @@ minetest.register_node("3d_armor_stand:locked_armor_stand", { }, }, groups = {choppy=2, oddly_breakable_by_hand=2}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) @@ -316,6 +319,7 @@ minetest.register_node("3d_armor_stand:shared_armor_stand", { }, }, groups = {choppy=2, oddly_breakable_by_hand=2}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) From 25369e5165d46f9dcc205078ce72d85afea3cfc3 Mon Sep 17 00:00:00 2001 From: Niklp Date: Sun, 17 Mar 2024 09:11:03 +0100 Subject: [PATCH 06/12] Don't assume `hitter ~= nil` in on_punchplayer callback (#138) * Don't assume `hitter ~= nil` in on_punchplayer callback * Use early return --- 3d_armor/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/3d_armor/init.lua b/3d_armor/init.lua index 62ca087..1a4028a 100644 --- a/3d_armor/init.lua +++ b/3d_armor/init.lua @@ -394,6 +394,9 @@ end if armor.config.punch_damage == true then minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities) + if hitter == nil then + return + end local name = player:get_player_name() local hit_ip = hitter:is_player() if name and hit_ip and minetest.is_protected(player:get_pos(), "") then From 7bd77a7b80a80fc5db0c67253263bc3884f5fc22 Mon Sep 17 00:00:00 2001 From: Niklp Date: Tue, 19 Mar 2024 12:54:42 +0100 Subject: [PATCH 07/12] Call custom `on_punched` functions w/ `hitter = nil` too (#141) --- 3d_armor/init.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/3d_armor/init.lua b/3d_armor/init.lua index 1a4028a..1d67c63 100644 --- a/3d_armor/init.lua +++ b/3d_armor/init.lua @@ -394,14 +394,15 @@ end if armor.config.punch_damage == true then minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities) - if hitter == nil then - return - end local name = player:get_player_name() - local hit_ip = hitter:is_player() - if name and hit_ip and minetest.is_protected(player:get_pos(), "") then - return - elseif name then + if hitter then + local hit_ip = hitter:is_player() + if name and hit_ip and minetest.is_protected(player:get_pos(), "") then + return + end + end + + if name then armor:punch(player, hitter, time_from_last_punch, tool_capabilities) last_punch_time[name] = minetest.get_gametime() end From 20917da061aff70723b9dc3fb937fc8f5d3ccc45 Mon Sep 17 00:00:00 2001 From: Niklp Date: Fri, 22 Mar 2024 22:35:43 +0100 Subject: [PATCH 08/12] Fix armor radiation values were not not summed up (#139) --- 3d_armor/api.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3d_armor/api.lua b/3d_armor/api.lua index a692a8f..fa160ed 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -415,7 +415,7 @@ armor.set_player_armor = function(self, player) end -- DEPRECATED, use armor_groups instead if def.groups["armor_radiation"] and levels["radiation"] then - levels["radiation"] = def.groups["armor_radiation"] + levels["radiation"] = levels["radiation"] + def.groups["armor_radiation"] end end local item = stack:get_name() From fb86c02e432b8681606575e4ca4c08c4ea378a12 Mon Sep 17 00:00:00 2001 From: randomei Date: Mon, 25 Mar 2024 22:01:28 +0300 Subject: [PATCH 09/12] russian translation fixes (#142) --- 3d_armor_stand/locale/3d_armor_stand.ru.tr | 5 +++++ armor_admin/locale/armor_admin.ru.tr | 4 ++-- armor_bronze/locale/armor_bronze.ru.tr | 4 ++-- armor_cactus/locale/armor_cactus.ru.tr | 4 ++-- armor_crystal/locale/armor_crystal.ru.tr | 4 ++-- armor_diamond/locale/armor_diamond.ru.tr | 4 ++-- armor_gold/locale/armor_gold.ru.tr | 4 ++-- armor_mithril/locale/armor_mithril.ru.tr | 4 ++-- armor_nether/locale/armor_nether.ru.tr | 4 ++-- armor_steel/locale/armor_steel.ru.tr | 4 ++-- armor_wood/locale/armor_wood.ru.tr | 4 ++-- shields/locale/shields.ru.tr | 13 +++++++++++++ 12 files changed, 38 insertions(+), 20 deletions(-) create mode 100755 3d_armor_stand/locale/3d_armor_stand.ru.tr create mode 100755 shields/locale/shields.ru.tr diff --git a/3d_armor_stand/locale/3d_armor_stand.ru.tr b/3d_armor_stand/locale/3d_armor_stand.ru.tr new file mode 100755 index 0000000..5987eed --- /dev/null +++ b/3d_armor_stand/locale/3d_armor_stand.ru.tr @@ -0,0 +1,5 @@ +# textdomain: 3d_armor_stand +Armor Stand Top=верх стойки для брони +Armor Stand=стойка для брони +Locked Armor Stand=стойка для брони с замком +Armor Stand (owned by @1)=стойка для бони (владелец @1) diff --git a/armor_admin/locale/armor_admin.ru.tr b/armor_admin/locale/armor_admin.ru.tr index 23905d4..cd300fb 100644 --- a/armor_admin/locale/armor_admin.ru.tr +++ b/armor_admin/locale/armor_admin.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_admin Admin Helmet=шлем админа -Admin Chestplate=бронежилет админа -Admin Leggings=гамаши админа +Admin Chestplate=нагрудник админа +Admin Leggings=штаны админа Admin Boots=ботинки админа diff --git a/armor_bronze/locale/armor_bronze.ru.tr b/armor_bronze/locale/armor_bronze.ru.tr index ba506b3..61abdd4 100644 --- a/armor_bronze/locale/armor_bronze.ru.tr +++ b/armor_bronze/locale/armor_bronze.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_bronze Bronze Helmet=бронзовый шлем -Bronze Chestplate=бронзовый бронежилет -Bronze Leggings=бронзовые гамаши +Bronze Chestplate=бронзовый нагрудник +Bronze Leggings=бронзовые штаны Bronze Boots=бронзовые ботинки diff --git a/armor_cactus/locale/armor_cactus.ru.tr b/armor_cactus/locale/armor_cactus.ru.tr index cf36d21..5c7df36 100644 --- a/armor_cactus/locale/armor_cactus.ru.tr +++ b/armor_cactus/locale/armor_cactus.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_cactus Cactus Helmet=кактусовый шлем -Cactus Chestplate=кактусовый бронежилет -Cactus Leggings=кактусовые гамаши +Cactus Chestplate=кактусовый нагрудник +Cactus Leggings=кактусовые штаны Cactus Boots=кактусовые ботинки diff --git a/armor_crystal/locale/armor_crystal.ru.tr b/armor_crystal/locale/armor_crystal.ru.tr index 932ece9..4915198 100644 --- a/armor_crystal/locale/armor_crystal.ru.tr +++ b/armor_crystal/locale/armor_crystal.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_crystal Crystal Helmet=кристалловый шлем -Crystal Chestplate=кристалловый бронежилет -Crystal Leggings=кристалловые гамаши +Crystal Chestplate=кристалловый нагрудник +Crystal Leggings=кристалловые штаны Crystal Boots=кристалловые ботинки diff --git a/armor_diamond/locale/armor_diamond.ru.tr b/armor_diamond/locale/armor_diamond.ru.tr index 00fd3cd..0ee465b 100644 --- a/armor_diamond/locale/armor_diamond.ru.tr +++ b/armor_diamond/locale/armor_diamond.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_diamond Diamond Helmet=алмазный шлем -Diamond Chestplate=алмазный бронежилет -Diamond Leggings=алмазные гамаши +Diamond Chestplate=алмазный нагрудник +Diamond Leggings=алмазные штаны Diamond Boots=алмазные ботинки diff --git a/armor_gold/locale/armor_gold.ru.tr b/armor_gold/locale/armor_gold.ru.tr index f64fcf7..c25f20f 100644 --- a/armor_gold/locale/armor_gold.ru.tr +++ b/armor_gold/locale/armor_gold.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_gold Gold Helmet=золотой шлем -Gold Chestplate=золотой бронежилет -Gold Leggings=золотые гамаши +Gold Chestplate=золотой нагрудник +Gold Leggings=золотые штаны Gold Boots=золотые ботинки diff --git a/armor_mithril/locale/armor_mithril.ru.tr b/armor_mithril/locale/armor_mithril.ru.tr index 2962c34..3444f2f 100644 --- a/armor_mithril/locale/armor_mithril.ru.tr +++ b/armor_mithril/locale/armor_mithril.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_mithril Mithril Helmet=мифриловый шлем -Mithril Chestplate=мифриловый бронежилет -Mithril Leggings=мифриловые гамаши +Mithril Chestplate=мифриловый нагрудник +Mithril Leggings=мифриловые штаны Mithril Boots=мифриловые ботинки diff --git a/armor_nether/locale/armor_nether.ru.tr b/armor_nether/locale/armor_nether.ru.tr index e2d8a25..3ba213d 100644 --- a/armor_nether/locale/armor_nether.ru.tr +++ b/armor_nether/locale/armor_nether.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_nether Nether Helmet=адский шлем -Nether Chestplate=адский бронежилет -Nether Leggings=адские гамаши +Nether Chestplate=адский нагрудник +Nether Leggings=адские штаны Nether Boots=адские ботинки diff --git a/armor_steel/locale/armor_steel.ru.tr b/armor_steel/locale/armor_steel.ru.tr index 8f36881..ed836ce 100644 --- a/armor_steel/locale/armor_steel.ru.tr +++ b/armor_steel/locale/armor_steel.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_steel Steel Helmet=стальной шлем -Steel Chestplate=стальной бронежилет -Steel Leggings=стальные гамаши +Steel Chestplate=стальной нагрудник +Steel Leggings=стальные штаны Steel Boots=стальные ботинки diff --git a/armor_wood/locale/armor_wood.ru.tr b/armor_wood/locale/armor_wood.ru.tr index fda30b5..93fdb55 100644 --- a/armor_wood/locale/armor_wood.ru.tr +++ b/armor_wood/locale/armor_wood.ru.tr @@ -1,5 +1,5 @@ # textdomain: armor_wood Wood Helmet=деревянный шлем -Wood Chestplate=деревянный бронежилет -Wood Leggings=деревянные гамаши +Wood Chestplate=деревянный нагрудник +Wood Leggings=деревянные штаны Wood Boots=деревянные ботинки diff --git a/shields/locale/shields.ru.tr b/shields/locale/shields.ru.tr new file mode 100755 index 0000000..9e80ce6 --- /dev/null +++ b/shields/locale/shields.ru.tr @@ -0,0 +1,13 @@ +# textdomain: shields +Admin Shield=щит админа +Wooden Shield=деревянный щит +Enhanced Wood Shield=усиленный деревянный щит +Cactus Shield=кактусовый щит +Enhanced Cactus Shield=усиленный кактусовый щит +Steel Shield=стальной щит +Bronze Shield=бронзовый щит +Diamond Shield=алмазный щит +Gold Shield=золотой щит +Mithril Shield=мифриловый щит +Crystal Shield=кристальный щит +Nether Shield=адский щит From 1fcbf64d5342cac1d52b93da36bc860b90687398 Mon Sep 17 00:00:00 2001 From: Niklp Date: Thu, 4 Apr 2024 07:25:05 +0200 Subject: [PATCH 10/12] Replace `3d_armor_trans.png` w/ engine provided `blank.png` (#143) --- 3d_armor/api.lua | 2 +- 3d_armor/init.lua | 8 ++++---- 3d_armor/textures/3d_armor_trans.png | Bin 274 -> 0 bytes 3d_armor_stand/init.lua | 6 +++--- wieldview/get_texture.lua | 10 +++++----- wieldview/init.lua | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 3d_armor/textures/3d_armor_trans.png diff --git a/3d_armor/api.lua b/3d_armor/api.lua index fa160ed..49af808 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -373,7 +373,7 @@ armor.set_player_armor = function(self, player) local state = 0 local count = 0 local preview = armor:get_preview(name) - local texture = "3d_armor_trans.png" + local texture = "blank.png" local physics = {} local attributes = {} local levels = {} diff --git a/3d_armor/init.lua b/3d_armor/init.lua index 1d67c63..e12bc88 100644 --- a/3d_armor/init.lua +++ b/3d_armor/init.lua @@ -268,8 +268,8 @@ local function init_player_armor(initplayer) local skin = armor:get_player_skin(name) armor.textures[name] = { skin = skin, - armor = "3d_armor_trans.png", - wielditem = "3d_armor_trans.png", + armor = "blank.png", + wielditem = "blank.png", preview = armor.default_skin.."_preview.png", } local texture_path = minetest.get_modpath("player_textures") @@ -291,8 +291,8 @@ player_api.register_model("3d_armor_character.b3d", { animation_speed = 30, textures = { armor.default_skin..".png", - "3d_armor_trans.png", - "3d_armor_trans.png", + "blank.png", + "blank.png", }, animations = { stand = {x=0, y=79}, diff --git a/3d_armor/textures/3d_armor_trans.png b/3d_armor/textures/3d_armor_trans.png deleted file mode 100644 index 4a31242b54fceda3cea196c6083d758a5a8b9c74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx?BpA#)4xIr~Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8W<`RdP`(kYX@0Ff`XSG|)9P4l%T_GBLL@HrF;Vv@$T*WTH3$MMG|WN@iLm WZViVsXX*eoFnGH9xvX Date: Wed, 1 May 2024 07:24:49 +0200 Subject: [PATCH 11/12] Fix "player still online" check of `armor.unequip` (#146) --- 3d_armor/api.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/3d_armor/api.lua b/3d_armor/api.lua index 49af808..065f1f9 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -719,13 +719,14 @@ armor.unequip = function(self, player, armor_element) if self:get_element(stack:get_name()) == armor_element then armor_inv:set_stack("armor", i, "") minetest.after(0, function() - -- resolve player object again in async function - player = minetest.get_player_by_name(name) - local inv = player:get_inventory() - if inv:room_for_item("main", stack) then - inv:add_item("main", stack) - else - minetest.add_item(player:get_pos(), stack) + local pplayer = minetest.get_player_by_name(name) + if pplayer then -- player is still online + local inv = pplayer:get_inventory() + if inv:room_for_item("main", stack) then + inv:add_item("main", stack) + else + minetest.add_item(pplayer:get_pos(), stack) + end end end) self:run_callbacks("on_unequip", player, i, stack) From ab1bec3be8be8caaef5a9cc4e73a879861af5a59 Mon Sep 17 00:00:00 2001 From: Maurus <138634584+M4urus@users.noreply.github.com> Date: Tue, 25 Jun 2024 01:37:04 -0300 Subject: [PATCH 12/12] Added spanish translations to shields and stands, added "Shared Armor Stand" to template. (#147) * Create shields.es.tr Spanish translation for shields. * Create 3d_armor_stand.es.tr Spanish translation to armor stands. * Update template.txt Added "Shared Armor Stand" to template. --- 3d_armor_stand/locale/3d_armor_stand.es.tr | 6 ++++++ 3d_armor_stand/locale/template.txt | 1 + shields/locale/shields.es.tr | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 3d_armor_stand/locale/3d_armor_stand.es.tr create mode 100644 shields/locale/shields.es.tr diff --git a/3d_armor_stand/locale/3d_armor_stand.es.tr b/3d_armor_stand/locale/3d_armor_stand.es.tr new file mode 100644 index 0000000..32b8707 --- /dev/null +++ b/3d_armor_stand/locale/3d_armor_stand.es.tr @@ -0,0 +1,6 @@ +# textdomain: 3d_armor_stand +Armor Stand Top= +Armor Stand=Soporte de armadura +Locked Armor Stand=Soporte de armadura privado +Shared Armor Stand=Soporte de armadura compartido +Armor Stand (owned by @1)=Soporte de armadura (de @1) diff --git a/3d_armor_stand/locale/template.txt b/3d_armor_stand/locale/template.txt index ab0bae9..f9fcb5d 100644 --- a/3d_armor_stand/locale/template.txt +++ b/3d_armor_stand/locale/template.txt @@ -2,4 +2,5 @@ Armor Stand Top= Armor Stand= Locked Armor Stand= +Shared Armor Stand= Armor Stand (owned by @1)= diff --git a/shields/locale/shields.es.tr b/shields/locale/shields.es.tr new file mode 100644 index 0000000..962f130 --- /dev/null +++ b/shields/locale/shields.es.tr @@ -0,0 +1,13 @@ +# textdomain: shields +Admin Shield=Escudo de admin +Wooden Shield=Escudo de madera +Enhanced Wood Shield=Escudo de madera mejorado +Cactus Shield=Escudo de cactus +Enhanced Cactus Shield=Escudo de cactus mejorado +Steel Shield=Escudo de acero +Bronze Shield=Escudo de bronce +Diamond Shield=Escudo de diamante +Gold Shield=Escudo de oro +Mithril Shield=Escudo de mitrilo +Crystal Shield=Escudo de cristal +Nether Shield=Escudo de nether