Merge remote-tracking branch 'origin/latest-stable' into latest-stable

Khazoda · Nov 1, 2024 · 9a2cfd9 · 9a2cfd9
2 parents d8d5459 + beff125
commit 9a2cfd9
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/src/main/resources/assets/basicweapons/lang/pt_br.json b/src/main/resources/assets/basicweapons/lang/pt_br.json
@@ -38,5 +38,38 @@
   "tag.item.c.tools.quarterstaves": "Bastões",
   "tag.item.basicweapons.spears": "Lanças",
   "tag.item.c.tools.spears": "Lanças",
-  "tag.item.c.tools.hammers": "Martelos"
+  "tag.item.c.tools.hammers": "Martelos",
+  "enchantment.minecraft.might": "Potência",
+  "item.basicweapons.bronze_dagger": "Adaga de bronze",
+  "item.basicweapons.bronze_hammer": "Martelo de bronze",
+  "item.basicweapons.bronze_club": "Clava de bronze",
+  "item.basicweapons.bronze_spear": "Lança de bronze",
+  "item.basicweapons.bronze_quarterstaff": "Bastão de bronze",
+  "tag.item.c.bronze_ingots": "Barras de bronze",
+  "tag.item.c.enchantable.smite_supported": "Encantamento Julgamento Aplicável",
+  "tag.item.c.enchantable.might_supported": "Encantamento Potência Aplicável",
+  "tag.item.c.enchantable.smite_primary": "Encantamento Julgamento Primário",
+  "tag.item.c.enchantable.fire_aspect_supported": "Aspecto Flamejante Aplicável",
+  "tag.item.c.enchantable.might_primary": "Encantamento Potência Primário",
+  "tag.item.c.enchantable.looting_supported": "Encantamento Saque Aplicável",
+  "tag.item.basicweapons.enchantable.sharp_basic_weapon": "Armas Básicas Arma Afiada",
+  "tag.item.c.enchantable.sweeping_edge_supported": "Encantamento Alcance Aplicável",
+  "tag.item.basicweapons.enchantable.blunt_basic_weapon": "Armas Básicas Arma Contundente",
+  "tag.item.c.enchantable.fire_aspect_primary": "Aspecto Flamejante Primário",
+  "tag.item.c.enchantable.bane_of_arthropods_supported": "Ruína dos Artrópodes Aplicável",
+  "tag.item.basicweapons.enchantable.basic_weapon": "Armas Básicas Arma",
+  "tag.item.c.enchantable.knockback_supported": "Encantamento Repulsão Aplicável",
+  "tag.item.c.enchantable.unbreaking_supported": "Encantamento Inquebrável Aplicável",
+  "tag.item.c.enchantable.sharpness_supported": "Encantamento Afiação Aplicável",
+  "tag.item.c.enchantable.sharpness_primary": "Encantamento Afiação Primário",
+  "tag.item.c.enchantable.bane_of_arthropods_primary": "Ruína dos Artrópodes Primário",
+  "item.basicweapons.wooden_glaive": "Alabarda de madeira",
+  "item.basicweapons.stone_glaive": "Alabarda de pedra",
+  "item.basicweapons.iron_glaive": "Alabarda de ferro",
+  "item.basicweapons.bronze_glaive": "Alabarda de bronze",
+  "item.basicweapons.golden_glaive": "Alabarda de ouro",
+  "item.basicweapons.diamond_glaive": "Alabarda de diamante",
+  "item.basicweapons.netherite_glaive": "Alabarda de netherita",
+  "tag.item.basicweapons.glaives": "Alabardas",
+  "tag.item.c.tools.glaives": "Alabardas"
 }
diff --git a/src/main/resources/assets/basicweapons/lang/vi_vn.json b/src/main/resources/assets/basicweapons/lang/vi_vn.json
@@ -62,5 +62,14 @@
   "tag.item.c.enchantable.unbreaking_supported": "Hỗ Trợ Phù Phép Chậm Hỏng",
   "tag.item.c.enchantable.sharpness_supported": "Hỗ Trợ Phù Phép Sắc Bén",
   "tag.item.c.enchantable.sharpness_primary": "Phù Phép Sắc Bén Chính",
-  "tag.item.c.enchantable.bane_of_arthropods_primary": "Phù Phép Hại Loài Chân Đốt Chính"
+  "tag.item.c.enchantable.bane_of_arthropods_primary": "Phù Phép Hại Loài Chân Đốt Chính",
+  "item.basicweapons.wooden_glaive": "Đoản Kiếm Gỗ",
+  "item.basicweapons.stone_glaive": "Đoản Kiếm Đá",
+  "item.basicweapons.iron_glaive": "Đoản Kiếm Sắt",
+  "item.basicweapons.bronze_glaive": "Đoản Kiếm Đồng",
+  "item.basicweapons.golden_glaive": "Đoản Kiếm Vàng",
+  "item.basicweapons.diamond_glaive": "Đoản Kiếm Kim Cương",
+  "item.basicweapons.netherite_glaive": "Đoản Kiếm Nethit",
+  "tag.item.basicweapons.glaives": "Đoản Kiếm",
+  "tag.item.c.tools.glaives": "Đoản Kiếm"
 }