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.

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

Jump to bottom

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

Merged
merged 46 commits into from
Aug 17, 2024
Merged

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

merged 46 commits into from
Aug 17, 2024

Commits on Jul 8, 2024

  1. tropicraft 1.18 zh_CN.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    7cf84b7 View commit details
    Browse the repository at this point in the history

  2. tropicraft 1.18 en_US.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    57af8dd View commit details
    Browse the repository at this point in the history

  3. tropicraft 1.19 zh_CN.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    6fc3834 View commit details
    Browse the repository at this point in the history

  4. tropicraft 1.19 zh_CN.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    38cfc4a View commit details
    Browse the repository at this point in the history

  5. tropicraft 1.19 en_US.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5b7ee74 View commit details
    Browse the repository at this point in the history

  6. tropicraft 1.20 zh_CN.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    6debe5d View commit details
    Browse the repository at this point in the history

  7. tropicraft 1.20 en_US.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    15f205e View commit details
    Browse the repository at this point in the history

  8. Rename zh_CN.json to zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    0cf1c17 View commit details
    Browse the repository at this point in the history

  9. Rename zh_CN.json to zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    820f743 View commit details
    Browse the repository at this point in the history

  10. Update and rename zh_CN.json to zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    ec9db03 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    2155a19 View commit details
    Browse the repository at this point in the history

  2. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    1d9cd50 View commit details
    Browse the repository at this point in the history

  3. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    76fc402 View commit details
    Browse the repository at this point in the history

  4. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    e9e28ec View commit details
    Browse the repository at this point in the history

  5. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    a882ae0 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    527f1d3 View commit details
    Browse the repository at this point in the history

  2. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    8988d47 View commit details
    Browse the repository at this point in the history

  3. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    ed16b21 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'CFPAOrg:main' into tropicraft-1.18-to-1.20

    @SummerFleur2997
    SummerFleur2997 committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    12eab2b View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. Update projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json 

    Co-authored-by: ChuijkYahus <[email protected]>
    @SummerFleur2997 @ChuijkYahus
    SummerFleur2997 and ChuijkYahus committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    e1c1adf View commit details
    Browse the repository at this point in the history

  2. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    e2e6f53 View commit details
    Browse the repository at this point in the history

  3. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    e4629ff View commit details
    Browse the repository at this point in the history

  4. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    070280b View commit details
    Browse the repository at this point in the history

  5. Update zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    b4dfafe View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Update projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    6424ac5 View commit details
    Browse the repository at this point in the history

  2. Update projects/1.19/assets/tropicraft/tropicraft/lang/zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    34e9288 View commit details
    Browse the repository at this point in the history

  3. Update projects/1.18/assets/tropicraft/tropicraft/lang/zh_cn.json

    @SummerFleur2997
    SummerFleur2997 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    80cecb7 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. 1.18 同步所有更改

    @SummerFleur2997
    SummerFleur2997 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    4407860 View commit details
    Browse the repository at this point in the history

  2. Revert "1.18 同步所有更改" 

    This reverts commit 4407860.
    @SummerFleur2997
    SummerFleur2997 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    d42a6ff View commit details
    Browse the repository at this point in the history

  3. 1.18 同步更改

    @SummerFleur2997
    SummerFleur2997 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    f39279e View commit details
    Browse the repository at this point in the history

  4. 问题小修

    @SummerFleur2997
    SummerFleur2997 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    6aec55a View commit details
    Browse the repository at this point in the history

  5. 1.19 & 1.20 同步更改

    @SummerFleur2997
    SummerFleur2997 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    95a7ba7 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. 墙壁物品 -> 墙上的物品 

    Co-authored-by: mamaruo <[email protected]>
    @SummerFleur2997 @mamaruo
    SummerFleur2997 and mamaruo committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    0743ebf View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. 椰子片 -> 椰子碎块

    @SummerFleur2997
    SummerFleur2997 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    5bef3b6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'tropicraft-1.18-to-1.20' of https://github.com/SummerFl… 

    …eur2997/Minecraft-Mod-Language-Package into tropicraft-1.18-to-1.20
    @SummerFleur2997
    SummerFleur2997 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    adb19ab View commit details
    Browse the repository at this point in the history

  3. 墙壁物品 -> 墙上的物品

    @SummerFleur2997
    SummerFleur2997 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    c5517e7 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Merge branch 'main' into pr/4487

    @SlimeSB
    SlimeSB committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    6582f8e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into pr/4487

    @SlimeSB
    SlimeSB committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    ee55a53 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. 桃花心木树叶 -> 桃花心树叶 

    桃花心木树叶 -> 桃花心树叶
1.16 版本此键翻译无误，未更改
    @SummerFleur2997
    SummerFleur2997 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    cc4b617 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'tropicraft-1.18-to-1.20' of https://github.com/SummerFl… 

    …eur2997/Minecraft-Mod-Language-Package into tropicraft-1.18-to-1.20
    @SummerFleur2997
    SummerFleur2997 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    0dc5e34 View commit details
    Browse the repository at this point in the history

  3. Revert "桃花心木树叶 -> 桃花心树叶" 

    This reverts commit cc4b617.
    @SummerFleur2997
    SummerFleur2997 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    381a090 View commit details
    Browse the repository at this point in the history

  4. 桃花心木相关修改 

    桃花心树叶 -> 桃花心木树叶（仅 1.16）
桃花心原木 -> 桃花心木原木（all）
桃花心树苗 -> 桃花心木树苗（all）
    @SummerFleur2997
    SummerFleur2997 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    0c75c41 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. 二笔时刻

    @SlimeSB
    SlimeSB committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    d9585fc View commit details
    Browse the repository at this point in the history

  2. 非 Fire Resistance 不必进行更改

    @SlimeSB
    SlimeSB committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    327155c View commit details
    Browse the repository at this point in the history

  3. 小修小改 

    抗火盔甲 -> 防火盔甲
蛇怪蜥刷怪蛋 -> 蛇怪蜥蜴刷怪蛋
    @SummerFleur2997
    SummerFleur2997 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    33695b9 View commit details
    Browse the repository at this point in the history

  4. 打包器

    @SlimeSB
    SlimeSB committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f2836ee View commit details
    Browse the repository at this point in the history