Skip to content
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.

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

Tropicraft 翻译提交 & 译名修正 #4487

Merged
merged 46 commits into from
Aug 17, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
7cf84b7
tropicraft 1.18 zh_CN.json
SummerFleur2997 Jul 8, 2024
57af8dd
tropicraft 1.18 en_US.json
SummerFleur2997 Jul 8, 2024
6fc3834
tropicraft 1.19 zh_CN.json
SummerFleur2997 Jul 8, 2024
38cfc4a
tropicraft 1.19 zh_CN.json
SummerFleur2997 Jul 8, 2024
5b7ee74
tropicraft 1.19 en_US.json
SummerFleur2997 Jul 8, 2024
6debe5d
tropicraft 1.20 zh_CN.json
SummerFleur2997 Jul 8, 2024
15f205e
tropicraft 1.20 en_US.json
SummerFleur2997 Jul 8, 2024
0cf1c17
Rename zh_CN.json to zh_cn.json
SummerFleur2997 Jul 8, 2024
820f743
Rename zh_CN.json to zh_cn.json
SummerFleur2997 Jul 8, 2024
ec9db03
Update and rename zh_CN.json to zh_cn.json
SummerFleur2997 Jul 8, 2024
2155a19
Update zh_cn.json
SummerFleur2997 Jul 12, 2024
1d9cd50
Update zh_cn.json
SummerFleur2997 Jul 12, 2024
76fc402
Update zh_cn.json
SummerFleur2997 Jul 12, 2024
e9e28ec
Update zh_cn.json
SummerFleur2997 Jul 12, 2024
a882ae0
Update zh_cn.json
SummerFleur2997 Jul 12, 2024
527f1d3
Update zh_cn.json
SummerFleur2997 Jul 13, 2024
8988d47
Update zh_cn.json
SummerFleur2997 Jul 13, 2024
ed16b21
Update zh_cn.json
SummerFleur2997 Jul 13, 2024
12eab2b
Merge branch 'CFPAOrg:main' into tropicraft-1.18-to-1.20
SummerFleur2997 Jul 13, 2024
e1c1adf
Update projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json
SummerFleur2997 Jul 20, 2024
e2e6f53
Update zh_cn.json
SummerFleur2997 Jul 20, 2024
e4629ff
Update zh_cn.json
SummerFleur2997 Jul 20, 2024
070280b
Update zh_cn.json
SummerFleur2997 Jul 20, 2024
b4dfafe
Update zh_cn.json
SummerFleur2997 Jul 20, 2024
6424ac5
Update projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json
SummerFleur2997 Jul 21, 2024
34e9288
Update projects/1.19/assets/tropicraft/tropicraft/lang/zh_cn.json
SummerFleur2997 Jul 21, 2024
80cecb7
Update projects/1.18/assets/tropicraft/tropicraft/lang/zh_cn.json
SummerFleur2997 Jul 21, 2024
4407860
1.18 同步所有更改
SummerFleur2997 Jul 24, 2024
d42a6ff
Revert "1.18 同步所有更改"
SummerFleur2997 Jul 24, 2024
f39279e
1.18 同步更改
SummerFleur2997 Jul 24, 2024
6aec55a
问题小修
SummerFleur2997 Jul 24, 2024
95a7ba7
1.19 & 1.20 同步更改
SummerFleur2997 Jul 24, 2024
0743ebf
墙壁物品 -> 墙上的物品
SummerFleur2997 Jul 28, 2024
5bef3b6
椰子片 -> 椰子碎块
SummerFleur2997 Jul 29, 2024
adb19ab
Merge branch 'tropicraft-1.18-to-1.20' of https://github.com/SummerFl…
SummerFleur2997 Jul 29, 2024
c5517e7
墙壁物品 -> 墙上的物品
SummerFleur2997 Jul 29, 2024
6582f8e
Merge branch 'main' into pr/4487
SlimeSB Aug 1, 2024
ee55a53
Merge remote-tracking branch 'upstream/main' into pr/4487
SlimeSB Aug 1, 2024
cc4b617
桃花心木树叶 -> 桃花心树叶
SummerFleur2997 Aug 3, 2024
0dc5e34
Merge branch 'tropicraft-1.18-to-1.20' of https://github.com/SummerFl…
SummerFleur2997 Aug 3, 2024
381a090
Revert "桃花心木树叶 -> 桃花心树叶"
SummerFleur2997 Aug 3, 2024
0c75c41
桃花心木相关修改
SummerFleur2997 Aug 3, 2024
d9585fc
二笔时刻
SlimeSB Aug 15, 2024
327155c
非 Fire Resistance 不必进行更改
SlimeSB Aug 15, 2024
33695b9
小修小改
SummerFleur2997 Aug 15, 2024
f2836ee
打包器
SlimeSB Aug 15, 2024
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
539 changes: 539 additions & 0 deletions projects/1.18/assets/tropicraft/tropicraft/lang/en_US.json

Large diffs are not rendered by default.

545 changes: 545 additions & 0 deletions projects/1.18/assets/tropicraft/tropicraft/lang/zh_cn.json

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions projects/1.19/assets/tropicraft/tropicraft/lang/en_US.json

Large diffs are not rendered by default.

545 changes: 545 additions & 0 deletions projects/1.19/assets/tropicraft/tropicraft/lang/zh_cn.json

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions projects/1.20/assets/tropicraft/tropicraft/lang/en_US.json

Large diffs are not rendered by default.

548 changes: 548 additions & 0 deletions projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json

Large diffs are not rendered by default.

Loading