From 5c29f7147f5bc59c84f21eefa59943b2aaf65ba9 Mon Sep 17 00:00:00 2001 From: Andy Zhang <37402126+AnzhiZhang@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:24:16 +0100 Subject: [PATCH 1/4] =?UTF-8?q?`=E5=87=A4=E6=A2=A8`=20->=20`=E8=8F=A0?= =?UTF-8?q?=E8=90=9D`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang | 6 +++--- projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang b/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang index cd9c454c4d1c..a1565f7673a2 100644 --- a/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang +++ b/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang @@ -990,7 +990,7 @@ item.zangetsu_dj_gun_taiken_mode.name=DJ枪（斩月大剑模式） item.kagematsu.name=影松 item.donkachi.name=团胜锤 item.melon_defender.name=蜜瓜护盾 -item.pine_iron.name=凤梨链锤 +item.pine_iron.name=菠萝链锤 item.ichigo_kunai.name=草莓苦无 item.daidaimaru.name=大橙丸 item.blood_daidaimaru.name=大橙丸（血橙版） @@ -1040,7 +1040,7 @@ item.matsubokkuri_lockseed.name=松果锁种 item.kurumi_lockseed.name=胡桃锁种 item.donguri_lockseed.name=橡果锁种 item.melon_lockseed.name=蜜瓜锁种 -item.pine_lockseed.name=凤梨锁种 +item.pine_lockseed.name=菠萝锁种 item.ichigo_lockseed.name=草莓锁种 item.orange_lockseed.name=橙子锁种 item.banana_lockseed.name=香蕉锁种 @@ -1731,7 +1731,7 @@ item.lemon_lockseed.name=柠檬锁种 item.dragon_fruits_energy_lockseed.name=火龙果能量锁种 item.drive_lockseed.name=Drive锁种 item.fresh_orange_lockseed.name=新鲜橙子锁种 -item.fresh_pine_lockseed.name=新鲜凤梨锁种 +item.fresh_pine_lockseed.name=新鲜菠萝锁种 item.suika_lockseed.name=西瓜锁种 item.lychee_lockseed.name=荔枝锁种 diff --git a/projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json b/projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json index 946a30f40e31..ac90c4c5a70f 100644 --- a/projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json +++ b/projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json @@ -416,7 +416,7 @@ "item.tropicraft.orangeade": "橙汁", "item.tropicraft.pab_shell": "Pab贝壳", "item.tropicraft.pianguas": "扇贝", - "item.tropicraft.pina_colada": "凤梨可乐达", + "item.tropicraft.pina_colada": "菠萝可乐达", "item.tropicraft.pineapple_cubes": "菠萝果粒", "item.tropicraft.pink_beach_float": "粉红色沙滩浮排", "item.tropicraft.pink_chair": "粉红色椅子", From 90df65d97da32236b9aa544a44aa057f5417c779 Mon Sep 17 00:00:00 2001 From: Andy Zhang <37402126+AnzhiZhang@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:57:27 +0100 Subject: [PATCH 2/4] =?UTF-8?q?`=E5=A5=87=E5=BC=82=E6=9E=9C`=20->=20`?= =?UTF-8?q?=E7=8C=95=E7=8C=B4=E6=A1=83`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.12.2/assets/1UNKNOWN/pmp/lang/zh_cn.lang | 4 ++-- .../kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/pmp/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/pmp/lang/zh_cn.lang index e852fc25d790..3998d5bf1401 100644 --- a/projects/1.12.2/assets/1UNKNOWN/pmp/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/pmp/lang/zh_cn.lang @@ -307,7 +307,7 @@ item.fruit_cherr.name=樱桃 item.fruit_cocon.name=椰子 item.fruit_grapf.name=柚子 item.fruit_grnap.name=青苹果 -item.fruit_kiwi.name=奇异果 +item.fruit_kiwi.name=猕猴桃 item.fruit_lemon.name=柠檬 item.fruit_lime.name=青柠檬 item.fruit_mango.name=芒果 @@ -545,7 +545,7 @@ tile.climb_cgrpv.name=葡萄藤 tile.climb_gldho.name=蛇麻 tile.climb_hyacb.name=扁豆 tile.climb_japcr.name=日本爬行藤 -tile.climb_kiwi.name=奇异果 +tile.climb_kiwi.name=猕猴桃 tile.climb_maidf.name=美国铁线蕨 tile.climb_porce.name=瓷色浆果 tile.climb_swpea_blu.name=蓝天鹅甜豌豆 diff --git a/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang b/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang index cd9c454c4d1c..944de408739d 100644 --- a/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang +++ b/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang @@ -1047,7 +1047,7 @@ item.banana_lockseed.name=香蕉锁种 item.budou_lockseed.name=葡萄锁种 item.mango_lockseed.name=芒果锁种 item.durian_lockseed.name=榴莲锁种 -item.kiwi_lockseed.name=奇异果锁种 +item.kiwi_lockseed.name=猕猴桃锁种 item.sakura_hurricane.name=樱花飓风定锁载具 item.rose_attacker.name=玫瑰攻击者定锁载具 @@ -1579,7 +1579,7 @@ item.philosophers_stone.name=贤者之石 item.budou_ryuhou.name=葡萄龙炮 item.mango_punisher.name=芒果惩戒者 item.duri_noko.name=榴锯剑 -item.kiwi_gekirin.name=奇异果击轮 +item.kiwi_gekirin.name=猕猴桃击轮 item.shine_donkachi.name=闪耀橡金锤 From db7b7729171ff5b64b60c0c372d6f5d60c447b5c Mon Sep 17 00:00:00 2001 From: Andy Zhang <37402126+AnzhiZhang@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:46:08 +0100 Subject: [PATCH 3/4] Update projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang --- .../assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang b/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang index a1565f7673a2..61f78e58b954 100644 --- a/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang +++ b/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang @@ -990,7 +990,7 @@ item.zangetsu_dj_gun_taiken_mode.name=DJ枪（斩月大剑模式） item.kagematsu.name=影松 item.donkachi.name=团胜锤 item.melon_defender.name=蜜瓜护盾 -item.pine_iron.name=菠萝链锤 +item.pine_iron.name=凤梨链锤 item.ichigo_kunai.name=草莓苦无 item.daidaimaru.name=大橙丸 item.blood_daidaimaru.name=大橙丸（血橙版） From 2beab85167698070515dd6f281e58513ed2b02f1 Mon Sep 17 00:00:00 2001 From: SlimeSB <86453765+SlimeSB@users.noreply.github.com> Date: Tue, 22 Oct 2024 21:53:04 +0800 Subject: [PATCH 4/4] revert kamenrider --- .../kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang b/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang index 5ab9a9cc1348..cd9c454c4d1c 100644 --- a/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang +++ b/projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang @@ -1040,14 +1040,14 @@ item.matsubokkuri_lockseed.name=松果锁种 item.kurumi_lockseed.name=胡桃锁种 item.donguri_lockseed.name=橡果锁种 item.melon_lockseed.name=蜜瓜锁种 -item.pine_lockseed.name=菠萝锁种 +item.pine_lockseed.name=凤梨锁种 item.ichigo_lockseed.name=草莓锁种 item.orange_lockseed.name=橙子锁种 item.banana_lockseed.name=香蕉锁种 item.budou_lockseed.name=葡萄锁种 item.mango_lockseed.name=芒果锁种 item.durian_lockseed.name=榴莲锁种 -item.kiwi_lockseed.name=猕猴桃锁种 +item.kiwi_lockseed.name=奇异果锁种 item.sakura_hurricane.name=樱花飓风定锁载具 item.rose_attacker.name=玫瑰攻击者定锁载具 @@ -1579,7 +1579,7 @@ item.philosophers_stone.name=贤者之石 item.budou_ryuhou.name=葡萄龙炮 item.mango_punisher.name=芒果惩戒者 item.duri_noko.name=榴锯剑 -item.kiwi_gekirin.name=猕猴桃击轮 +item.kiwi_gekirin.name=奇异果击轮 item.shine_donkachi.name=闪耀橡金锤 @@ -1731,7 +1731,7 @@ item.lemon_lockseed.name=柠檬锁种 item.dragon_fruits_energy_lockseed.name=火龙果能量锁种 item.drive_lockseed.name=Drive锁种 item.fresh_orange_lockseed.name=新鲜橙子锁种 -item.fresh_pine_lockseed.name=新鲜菠萝锁种 +item.fresh_pine_lockseed.name=新鲜凤梨锁种 item.suika_lockseed.name=西瓜锁种 item.lychee_lockseed.name=荔枝锁种