Skip to content

Fix alignments in patchouli_books, fix name of "Leather Flask side". #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmecn wants to merge 7 commits into
base: 1.20
Choose a base branch
from
Open

Fix alignments in patchouli_books, fix name of "Leather Flask side". #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e259959
fix: fix zh_cn patchouli_books alignments.
Oct 2, 2025
a740253
Merge branch '1.20' of github.com:jmecn/WaterFlasks into 1.20
Oct 2, 2025
154eafc
fix: fix mistakes in zh_cn.json
jmecn Oct 11, 2025
b67feed
resolve conflicts
jmecn Oct 11, 2025
7554270
resolve conflicts
jmecn Oct 11, 2025
c49b447
fix: update zh_cn name for Iron Flask
jmecn Oct 11, 2025
6f8637e
fix: update zh_cn.json
jmecn Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .../resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/bladders.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
"pages": [
{
"type": "patchouli:text",
"text": "高效储水的核心在于重复利用曾经储存过水（或类似液体）的东西。$(br2)$(bold) 动物膀胱！$()$(br)只有特定动物的膀胱适合此用途，且某些物种的膀胱比其他物种更容易获取。"
"text": "高效储水的核心在于重复利用曾经储存过水（或类似液体）的东西。$(br2)$(bold) 膀胱！$()$(br)只有特定动物的膀胱适合此用途，且某些物种的膀胱比其他物种更容易获取。"
},
{
"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,
Expand Down
2 changes: 1 addition & 1 deletion ...n/resources/assets/tfc/patchouli_books/field_guide/zh_cn/entries/waterflasks/recipes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 9 additions & 9 deletions src/main/resources/assets/waterflasks/lang/zh_cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": "锻铁水壶",
"item.waterflasks.unfinished_iron_flask": "未完成的锻铁水壶",
"item.waterflasks.broken_iron_flask": "损坏的锻铁水壶",
"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": "未完成的红钢水壶"
}