From e2599590e35b9facb81e506d95fb8df0a4f38f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E8=8C=82=E6=BA=90?= Date: Thu, 2 Oct 2025 15:47:08 +0800 Subject: [PATCH 1/5] fix: fix zh_cn patchouli_books alignments. --- .../field_guide/zh_cn/entries/waterflasks/bladders.json | 8 ++++---- .../field_guide/zh_cn/entries/waterflasks/recipes.json | 2 +- src/main/resources/assets/waterflasks/lang/zh_cn.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json index eeb89fb..fd8eed9 100644 --- a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json +++ b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json @@ -10,19 +10,19 @@ }, { "type": "patchouli:text", - "text": "$(br)$(bold)动物____________概率$(br)$()绵羊___________________10%$(br)羊驼__________________10%$(br)山羊____________________10%$(br)鹿____________________10%$(br)马____________________20%$(br)熊___________________20%$(br)牛____________________50%$(br)驼鹿___________________50%$(br)$(br)若要提高获取概率，请使用伤害更高的武器屠宰动物。" + "text": "$(br)$(bold)动物___________________概率$(br)$()绵羊____________________10%$(br)羊驼____________________10%$(br)山羊____________________10%$(br)鹿______________________10%$(br)马______________________20%$(br)熊______________________20%$(br)牛______________________50%$(br)驼鹿____________________50%$(br)$(br)若要提高获取概率，请使用伤害更高的武器屠宰动物。" }, { "type": "patchouli:spotlight", "item": "waterflasks:leather_side", - "title": "皮革水壶的侧边", + "title": "皮革水壶外壳", "link_recipes": false, - "text": "水壶侧边部件可用于制作两种水壶。" + "text": "水壶外壳部件可用于制作两种水壶。" }, { "type": "tfc:knapping_recipe", "recipe": "waterflasks:leather_knapping/leather_side", - "text": "将皮革凿制成皮革水壶侧边，用以保护膀胱避免刺穿。" + "text": "将皮革凿制成皮革水壶外壳，用以保护膀胱避免刺穿。" } ], "read_by_default": true, diff --git a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json index 4c38997..a597b9d 100644 --- a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json +++ b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json @@ -6,7 +6,7 @@ "pages": [ { "type": "patchouli:text", - "text": "水壶共有三个等级。$(br)皮革水壶可盛装 5 次饮用量，耐久度为 100 次使用。$(br)铁制水壶可盛装 20 次饮用量，耐久度为 400 次使用。$(br)红钢水壶可盛装 20 次饮用量，且永久耐用。$(br)皮革水壶和铁制水壶均可修复。" + "text": "水壶共有三个等级。$(br)皮革水壶可盛装 5 次饮用量，耐久度为 100 次使用。$(br)锻铁水壶可盛装 20 次饮用量，耐久度为 400 次使用。$(br)红钢水壶可盛装 20 次饮用量，且永久耐用。$(br)皮革水壶和锻铁水壶均可修复。" }, { "type": "patchouli:crafting", diff --git a/src/main/resources/assets/waterflasks/lang/zh_cn.json b/src/main/resources/assets/waterflasks/lang/zh_cn.json index bb36bd8..4dbe499 100644 --- a/src/main/resources/assets/waterflasks/lang/zh_cn.json +++ b/src/main/resources/assets/waterflasks/lang/zh_cn.json @@ -1,7 +1,7 @@ { "_comment1": "材料", "item.waterflasks.bladder": "动物膀胱", - "item.waterflasks.leather_side": "皮革水壶侧边", + "item.waterflasks.leather_side": "皮革水壶外壳", "waterflasks.item.flaskbreak": "水壶破裂", "_comment2": "皮革制品", From 154eafc4a6c1abe4139adb9cc133c37a30d83a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E8=8C=82=E6=BA=90?= <115050813@qq.com> Date: Sat, 11 Oct 2025 11:59:20 +0800 Subject: [PATCH 2/5] fix: fix mistakes in zh_cn.json --- .../zh_cn/entries/waterflasks/bladders.json | 8 ++++---- .../zh_cn/entries/waterflasks/recipes.json | 2 +- .../resources/assets/waterflasks/lang/zh_cn.json | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json index eeb89fb..257a76a 100644 --- a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json +++ b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json @@ -6,7 +6,7 @@ "pages": [ { "type": "patchouli:text", - "text": "高效储水的核心在于重复利用曾经储存过水（或类似液体）的东西。$(br2)$(bold) 动物膀胱！$()$(br)只有特定动物的膀胱适合此用途，且某些物种的膀胱比其他物种更容易获取。" + "text": "高效储水的核心在于重复利用曾经储存过水（或类似液体）的东西。$(br2)$(bold) 膀胱！$()$(br)只有特定动物的膀胱适合此用途，且某些物种的膀胱比其他物种更容易获取。" }, { "type": "patchouli:text", @@ -15,14 +15,14 @@ { "type": "patchouli:spotlight", "item": "waterflasks:leather_side", - "title": "皮革水壶的侧边", + "title": "皮革水壶外壳", "link_recipes": false, - "text": "水壶侧边部件可用于制作两种水壶。" + "text": "水壶外壳可用于制作各种水壶。" }, { "type": "tfc:knapping_recipe", "recipe": "waterflasks:leather_knapping/leather_side", - "text": "将皮革凿制成皮革水壶侧边，用以保护膀胱避免刺穿。" + "text": "将皮革凿制成皮革水壶外壳，用以保护膀胱避免刺穿。" } ], "read_by_default": true, diff --git a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json index 4c38997..a597b9d 100644 --- a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json +++ b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json @@ -6,7 +6,7 @@ "pages": [ { "type": "patchouli:text", - "text": "水壶共有三个等级。$(br)皮革水壶可盛装 5 次饮用量，耐久度为 100 次使用。$(br)铁制水壶可盛装 20 次饮用量，耐久度为 400 次使用。$(br)红钢水壶可盛装 20 次饮用量，且永久耐用。$(br)皮革水壶和铁制水壶均可修复。" + "text": "水壶共有三个等级。$(br)皮革水壶可盛装 5 次饮用量，耐久度为 100 次使用。$(br)锻铁水壶可盛装 20 次饮用量，耐久度为 400 次使用。$(br)红钢水壶可盛装 20 次饮用量，且永久耐用。$(br)皮革水壶和锻铁水壶均可修复。" }, { "type": "patchouli:crafting", diff --git a/src/main/resources/assets/waterflasks/lang/zh_cn.json b/src/main/resources/assets/waterflasks/lang/zh_cn.json index bb36bd8..3403cd4 100644 --- a/src/main/resources/assets/waterflasks/lang/zh_cn.json +++ b/src/main/resources/assets/waterflasks/lang/zh_cn.json @@ -1,22 +1,22 @@ { "_comment1": "材料", - "item.waterflasks.bladder": "动物膀胱", - "item.waterflasks.leather_side": "皮革水壶侧边", + "item.waterflasks.bladder": "膀胱", + "item.waterflasks.leather_side": "皮革水壶外壳", "waterflasks.item.flaskbreak": "水壶破裂", "_comment2": "皮革制品", - "item.waterflasks.leather_flask.filled": "%s皮革水壶", + "item.waterflasks.leather_flask.filled": "皮革水壶 (%s)", "item.waterflasks.leather_flask": "皮革水壶", - "item.waterflasks.broken_leather_flask": "破损的皮革水壶", + "item.waterflasks.broken_leather_flask": "损坏的皮革水壶", "_comment3": "铁制品", - "item.waterflasks.iron_flask.filled": "%s锻铁水壶", + "item.waterflasks.iron_flask.filled": "锻铁水壶 (%s)", "item.waterflasks.iron_flask": "锻铁水壶", "item.waterflasks.unfinished_iron_flask": "未完成的锻铁水壶", "item.waterflasks.broken_iron_flask": "损坏的锻铁水壶", "_comment4": "红钢制品", - "item.waterflasks.red_steel_flask.filled": "%s红钢水壶", + "item.waterflasks.red_steel_flask.filled": "红钢水壶 (%s)", "item.waterflasks.red_steel_flask": "红钢水壶", "item.waterflasks.unfinished_red_steel_flask": "未完成的红钢水壶" } \ No newline at end of file From 7554270c88d5ba40db0a18d793de71b8d94d1568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E8=8C=82=E6=BA=90?= <115050813@qq.com> Date: Sat, 11 Oct 2025 12:02:16 +0800 Subject: [PATCH 3/5] resolve conflicts --- src/main/resources/assets/waterflasks/lang/zh_cn.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/resources/assets/waterflasks/lang/zh_cn.json b/src/main/resources/assets/waterflasks/lang/zh_cn.json index f33dd26..4c5652d 100644 --- a/src/main/resources/assets/waterflasks/lang/zh_cn.json +++ b/src/main/resources/assets/waterflasks/lang/zh_cn.json @@ -1,10 +1,6 @@ { "_comment1": "材料", -<<<<<<< HEAD "item.waterflasks.bladder": "膀胱", -======= - "item.waterflasks.bladder": "动物膀胱", ->>>>>>> a7402539ecc06bab5cf86c0ffbcc7805b4bdb756 "item.waterflasks.leather_side": "皮革水壶外壳", "waterflasks.item.flaskbreak": "水壶破裂", @@ -13,7 +9,7 @@ "item.waterflasks.leather_flask": "皮革水壶", "item.waterflasks.broken_leather_flask": "损坏的皮革水壶", - "_comment3": "铁制品", + "_comment3": "锻铁制品", "item.waterflasks.iron_flask.filled": "锻铁水壶 (%s)", "item.waterflasks.iron_flask": "锻铁水壶", "item.waterflasks.unfinished_iron_flask": "未完成的锻铁水壶", From c49b447ba8b8808d9104b4b32238fabd15eae729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E8=8C=82=E6=BA=90?= <115050813@qq.com> Date: Sat, 11 Oct 2025 12:21:01 +0800 Subject: [PATCH 4/5] fix: update zh_cn name for Iron Flask --- .../field_guide/zh_cn/entries/waterflasks/recipes.json | 2 +- src/main/resources/assets/waterflasks/lang/zh_cn.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json index a597b9d..9cf967e 100644 --- a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json +++ b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json @@ -6,7 +6,7 @@ "pages": [ { "type": "patchouli:text", - "text": "水壶共有三个等级。$(br)皮革水壶可盛装 5 次饮用量，耐久度为 100 次使用。$(br)锻铁水壶可盛装 20 次饮用量，耐久度为 400 次使用。$(br)红钢水壶可盛装 20 次饮用量，且永久耐用。$(br)皮革水壶和锻铁水壶均可修复。" + "text": "水壶共有三个等级。$(br)皮革水壶可盛装 5 次饮用量，耐久度为 100 次使用。$(br)铁水壶可盛装 20 次饮用量，耐久度为 400 次使用。$(br)红钢水壶可盛装 20 次饮用量，且永久耐用。$(br)皮革水壶和铁水壶均可修复。" }, { "type": "patchouli:crafting", diff --git a/src/main/resources/assets/waterflasks/lang/zh_cn.json b/src/main/resources/assets/waterflasks/lang/zh_cn.json index 4c5652d..651644d 100644 --- a/src/main/resources/assets/waterflasks/lang/zh_cn.json +++ b/src/main/resources/assets/waterflasks/lang/zh_cn.json @@ -9,11 +9,11 @@ "item.waterflasks.leather_flask": "皮革水壶", "item.waterflasks.broken_leather_flask": "损坏的皮革水壶", - "_comment3": "锻铁制品", - "item.waterflasks.iron_flask.filled": "锻铁水壶 (%s)", - "item.waterflasks.iron_flask": "锻铁水壶", - "item.waterflasks.unfinished_iron_flask": "未完成的锻铁水壶", - "item.waterflasks.broken_iron_flask": "损坏的锻铁水壶", + "_comment3": "铁制品", + "item.waterflasks.iron_flask.filled": "铁水壶 (%s)", + "item.waterflasks.iron_flask": "铁水壶", + "item.waterflasks.unfinished_iron_flask": "未完成的铁水壶", + "item.waterflasks.broken_iron_flask": "损坏的铁水壶", "_comment4": "红钢制品", "item.waterflasks.red_steel_flask.filled": "红钢水壶 (%s)", From 6f8637e4fc896638f325a1add3c346b028c22a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E8=8C=82=E6=BA=90?= <115050813@qq.com> Date: Mon, 27 Oct 2025 20:11:57 +0800 Subject: [PATCH 5/5] fix: update zh_cn.json --- .../field_guide/zh_cn/entries/waterflasks/bladders.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json index 68d5c85..4919a1a 100644 --- a/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json +++ b/src/main/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json @@ -22,7 +22,7 @@ { "type": "tfc:knapping_recipe", "recipe": "waterflasks:leather_knapping/leather_side", - "text": "将皮革凿制成皮革水壶外壳，用以保护膀胱避免刺穿。" + "text": "将皮革剥制成皮革水壶外壳，用以保护膀胱避免刺穿。" } ], "read_by_default": true,