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 all 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
15 changes: 15 additions & 0 deletions projects/1.16/assets/tropicraft/tropicraft/lang/zh_cn-fix.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"block.tropicraft.bamboo_potted_azure_bluet": "竹制茜草花盆栽",
"biome.tropicraft.rainforest_hills": "雨林丘陵",
"biome.tropicraft.rainforest_island_mountains": "雨林岛屿山地",
"biome.tropicraft.rainforest_mountains": "雨林山地",
"biome.tropicraft.rainforest_plains": "雨林平原",
"biome.tropicraft.tropics_beach": "热带沙滩",
"biome.tropicraft.tropics_ocean": "热带海洋",
"biome.tropicraft.tropics_river": "热带河流",
"biome.tropicraft.z_bamboo_rainforest": "竹雨林",
"biome.tropicraft.z_mangroves": "红树林",
"biome.tropicraft.z_osa_rainforest": "奥萨雨林",
"biome.tropicraft.z_overgrown_mangroves": "杂草盘生的红树林",
"tropicraft.coconutBombWarning": "你没有权限来投掷这玩意儿!若想获得权限,请编辑服务器配置文件中的椰子炸弹白名单"
}
11 changes: 11 additions & 0 deletions projects/1.16/assets/tropicraft/tropicraft/packer-policy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
{
"type": "singleton",
"source": "projects/1.16/assets/tropicraft/tropicraft/lang/zh_cn-fix.json",
"relativePath": "lang/zh_cn.json"
},
{
"type": "indirect",
"source": "projects/1.19/assets/tropicraft/tropicraft"
}
]
539 changes: 539 additions & 0 deletions projects/1.18/assets/tropicraft/tropicraft/lang/en_US.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions projects/1.18/assets/tropicraft/tropicraft/packer-policy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"type": "indirect",
"source": "projects/1.19/assets/tropicraft/tropicraft"
}
]
539 changes: 539 additions & 0 deletions projects/1.19/assets/tropicraft/tropicraft/lang/en_US.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"block.tropicraft.bamboo_potted_wither_rose": "竹制凋零玫瑰盆栽",
"itemGroup.tropicraft": "热带世界"
}
11 changes: 11 additions & 0 deletions projects/1.19/assets/tropicraft/tropicraft/packer-policy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
{
"type": "singleton",
"source": "projects/1.19/assets/tropicraft/tropicraft/lang/zh_cn-fix.json",
"relativePath": "lang/zh_cn.json"
},
{
"type": "indirect",
"source": "projects/1.20/assets/tropicraft/tropicraft"
}
]
539 changes: 539 additions & 0 deletions projects/1.20/assets/tropicraft/tropicraft/lang/en_US.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"attribute.name.swim_speed": "游泳速度",
"biome.tropicraft.bamboo_rainforest": "竹雨林",
"biome.tropicraft.beach": "海滩",
"biome.tropicraft.kelp_forest": "海藻森林",
"biome.tropicraft.mangroves": "红树林",
"biome.tropicraft.ocean": "海洋",
"biome.tropicraft.osa_rainforest": "奥萨雨林",
"biome.tropicraft.overgrown_mangroves": "杂草盘生的红树林",
"biome.tropicraft.rainforest": "热带雨林",
"biome.tropicraft.river": "河流",
"biome.tropicraft.tropical_peaks": "热带山峰",
"biome.tropicraft.tropics": "热带地区",
"block.tropicraft.acai_vine": "巴西莓藤蔓",
"block.tropicraft.air_compressor": "空气压缩机",
Expand All @@ -10,6 +19,7 @@
"block.tropicraft.azurite_ore": "石青矿石",
"block.tropicraft.bamboo_boardwalk": "竹栈道",
"block.tropicraft.bamboo_bundle": "竹堆",
"block.tropicraft.bamboo_button": "竹按钮",
"block.tropicraft.bamboo_chest": "竹箱子",
"block.tropicraft.bamboo_door": "竹门",
"block.tropicraft.bamboo_fence": "竹栅栏",
Expand All @@ -20,7 +30,7 @@
"block.tropicraft.bamboo_potted_acai_vine": "竹制巴西莓藤蔓盆栽",
"block.tropicraft.bamboo_potted_allium": "竹制绒球葱盆栽",
"block.tropicraft.bamboo_potted_anemone": "竹制银莲花盆栽",
"block.tropicraft.bamboo_potted_azure_bluet": "竹制茜草花盆栽",
"block.tropicraft.bamboo_potted_azure_bluet": "竹制蓝花美耳草盆栽",
"block.tropicraft.bamboo_potted_birch_sapling": "竹制白桦树苗盆栽",
"block.tropicraft.bamboo_potted_blue_orchid": "竹制兰花盆栽",
"block.tropicraft.bamboo_potted_bromeliad": "竹制凤梨花盆栽",
Expand Down Expand Up @@ -61,7 +71,9 @@
"block.tropicraft.bamboo_potted_spruce_sapling": "竹制云杉树苗盆栽",
"block.tropicraft.bamboo_potted_tropical_fern": "竹制热带蕨盆栽",
"block.tropicraft.bamboo_potted_white_tulip": "竹制白色郁金香盆栽",
"block.tropicraft.bamboo_potted_wither_rose": "竹制凋零玫瑰盆栽",
"block.tropicraft.bamboo_potted_wither_rose": "竹制凋灵玫瑰盆栽",
"block.tropicraft.bamboo_pressure_plate": "竹压力板",
"block.tropicraft.bamboo_sign": "竹告示牌",
"block.tropicraft.bamboo_slab": "竹台阶",
"block.tropicraft.bamboo_stairs": "竹楼梯",
"block.tropicraft.bamboo_trapdoor": "竹活板门",
Expand Down Expand Up @@ -108,23 +120,29 @@
"block.tropicraft.lime_sapling": "青柠树苗",
"block.tropicraft.magic_mushroom": "奇幻菇",
"block.tropicraft.mahogany_boardwalk": "桃花心木栈道",
"block.tropicraft.mahogany_button": "桃花心木按钮",
"block.tropicraft.mahogany_door": "桃花心木门",
"block.tropicraft.mahogany_fence": "桃花心木栅栏",
"block.tropicraft.mahogany_fence_gate": "桃花心木栅栏门",
"block.tropicraft.mahogany_leaves": "桃花心树叶",
"block.tropicraft.mahogany_log": "桃花心原木",
"block.tropicraft.mahogany_leaves": "桃花心木树叶",
"block.tropicraft.mahogany_log": "桃花心木原木",
"block.tropicraft.mahogany_planks": "桃花心木板",
"block.tropicraft.mahogany_sapling": "桃花心树苗",
"block.tropicraft.mahogany_pressure_plate": "桃花心木压力板",
"block.tropicraft.mahogany_sapling": "桃花心木树苗",
"block.tropicraft.mahogany_sign": "桃花心木告示牌",
"block.tropicraft.mahogany_slab": "桃花心木台阶",
"block.tropicraft.mahogany_stairs": "桃花心木楼梯",
"block.tropicraft.mahogany_trapdoor": "桃花心木活板门",
"block.tropicraft.manganese_block": "锰块",
"block.tropicraft.manganese_ore": "锰矿石",
"block.tropicraft.mangrove_boardwalk": "红树木栈道",
"block.tropicraft.mangrove_button": "红树木按钮",
"block.tropicraft.mangrove_door": "红树木门",
"block.tropicraft.mangrove_fence": "红树木栅栏",
"block.tropicraft.mangrove_fence_gate": "红树木栅栏门",
"block.tropicraft.mangrove_planks": "红树木板",
"block.tropicraft.mangrove_pressure_plate": "红树木压力板",
"block.tropicraft.mangrove_sign": "红树木告示牌",
"block.tropicraft.mangrove_slab": "红树木台阶",
"block.tropicraft.mangrove_stairs": "红树木楼梯",
"block.tropicraft.mangrove_trapdoor": "红树木活板门",
Expand All @@ -145,7 +163,9 @@
"block.tropicraft.palm_leaves": "棕榈树叶",
"block.tropicraft.palm_log": "棕榈原木",
"block.tropicraft.palm_planks": "棕榈木板",
"block.tropicraft.palm_pressure_plate": "棕榈木压力板",
"block.tropicraft.palm_sapling": "棕榈树苗",
"block.tropicraft.palm_sign": "棕榈木告示牌",
"block.tropicraft.palm_slab": "棕榈木台阶",
"block.tropicraft.palm_stairs": "棕榈木楼梯",
"block.tropicraft.palm_trapdoor": "棕榈木活板门",
Expand Down Expand Up @@ -204,9 +224,12 @@
"block.tropicraft.tea_mangrove_propagule": "茶红树胎生苗",
"block.tropicraft.tea_mangrove_propagule.desc": "假红树",
"block.tropicraft.thatch_bundle": "茅草堆",
"block.tropicraft.thatch_button": "茅草按钮",
"block.tropicraft.thatch_door": "茅草门",
"block.tropicraft.thatch_fence": "茅草栅栏",
"block.tropicraft.thatch_fence_gate": "茅草栅栏门",
"block.tropicraft.thatch_pressure_plate": "茅草压力板",
"block.tropicraft.thatch_sign": "茅草告示牌",
"block.tropicraft.thatch_slab": "茅草台阶",
"block.tropicraft.thatch_stairs": "茅草楼梯",
"block.tropicraft.thatch_stairs_fuzzy": "茅草屋顶",
Expand Down Expand Up @@ -336,7 +359,7 @@
"item.tropicraft.gray_beach_float": "灰色沙滩浮排",
"item.tropicraft.gray_chair": "灰色椅子",
"item.tropicraft.gray_umbrella": "灰色伞",
"item.tropicraft.green_basilisk_lizard_spawn_egg": "绿色蛇怪蜥蜴怪蛋",
"item.tropicraft.green_basilisk_lizard_spawn_egg": "绿色蛇怪蜥蜴刷怪蛋",
"item.tropicraft.green_beach_float": "绿色沙滩浮排",
"item.tropicraft.green_chair": "绿色椅子",
"item.tropicraft.green_umbrella": "绿色伞",
Expand Down Expand Up @@ -471,7 +494,7 @@
"item.tropicraft.zirconium_pickaxe": "锆镐",
"item.tropicraft.zirconium_shovel": "锆锹",
"item.tropicraft.zirconium_sword": "锆剑",
"itemGroup.tropicraft": "热带世界",
"itemGroup.tropicraft.tropicraft": "热带世界",
"scuba.tropicraft.air_time": "剩余空气:%s",
"scuba.tropicraft.depth": "当前深度:%s",
"scuba.tropicraft.dive_time": "潜水时间:%s",
Expand All @@ -480,17 +503,46 @@
"tropicraft.container.bambooChest": "竹箱子",
"tropicraft.container.bambooChestDouble": "大型竹箱子",

"biome.tropicraft.rainforest_hills": "雨林丘陵",
"biome.tropicraft.rainforest_island_mountains": "雨林岛屿山地",
"biome.tropicraft.rainforest_mountains": "雨林山地",
"biome.tropicraft.rainforest_plains": "雨林平原",
"biome.tropicraft.tropics_beach": "热带沙滩",
"biome.tropicraft.tropics_ocean": "热带海洋",
"biome.tropicraft.tropics_river": "热带河流",
"biome.tropicraft.z_bamboo_rainforest": "竹雨林",
"biome.tropicraft.z_mangroves": "红树林",
"biome.tropicraft.z_osa_rainforest": "奥萨雨林",
"biome.tropicraft.z_overgrown_mangroves": "杂草盘生的红树林",

"tropicraft.coconutBombWarning": "你没有权限来投掷这玩意儿!若想获得权限,请编辑服务器配置文件中的椰子炸弹白名单"
"block.tropicraft.blue_flowering_leaves": "盛开的蓝色花叶",
"block.tropicraft.purple_flowering_leaves": "盛开的紫色花叶",
"block.tropicraft.red_flowering_leaves": "盛开的红色花叶",
"block.tropicraft.white_flowering_leaves": "盛开的白色花叶",
"block.tropicraft.yellow_flowering_leaves": "盛开的黄色花叶",

"block.tropicraft.eel_grass": "海菖蒲",
"block.tropicraft.eel_grass_block": "海菖蒲块",
"block.tropicraft.fern_seagrass": "喜盐草",
mamaruo marked this conversation as resolved.
Show resolved Hide resolved
"block.tropicraft.fern_seagrass_block": "喜盐草块",
"block.tropicraft.flowering_eel_grass": "盛开的海菖蒲",
"block.tropicraft.flowering_tall_eel_grass": "盛开的高海菖蒲",
"block.tropicraft.jigarbov_acacia_wall_torch": "Jigarbov金合欢木红石火把",
"block.tropicraft.jigarbov_birch_wall_torch": "Jigarbov白桦木红石火把",
"block.tropicraft.jigarbov_black_mangrove_wall_torch": "Jigarbov黑色红树木红石火把",
"block.tropicraft.jigarbov_dark_oak_wall_torch": "Jigarbov深色橡木红石火把",
"block.tropicraft.jigarbov_jungle_wall_torch": "Jigarbov丛林木红石火把",
"block.tropicraft.jigarbov_light_mangrove_wall_torch": "Jigarbov浅色红树木红石火把",
"block.tropicraft.jigarbov_oak_wall_torch": "Jigarbov橡木红石火把",
"block.tropicraft.jigarbov_red_mangrove_wall_torch": "Jigarbov红树木红石火把",
"block.tropicraft.jigarbov_spruce_wall_torch": "Jigarbov云杉木红石火把",
mamaruo marked this conversation as resolved.
Show resolved Hide resolved
"block.tropicraft.matted_eel_grass": "海菖蒲覆层砂",
"block.tropicraft.matted_fern_seagrass": "喜盐草覆层砂",
"block.tropicraft.matted_noodle_seagrass": "针叶藻覆层砂",
"block.tropicraft.matted_sickle_seagrass": "木秆藻覆层砂",
"block.tropicraft.noodle_seagrass": "针叶藻",
"block.tropicraft.noodle_seagrass_block": "针叶藻块",
"block.tropicraft.palm_button": "棕榈木按钮",
"block.tropicraft.portal_water": "热带世界传送门水",
"block.tropicraft.sickle_seagrass": "木秆藻",
ChuijkYahus marked this conversation as resolved.
Show resolved Hide resolved
"block.tropicraft.sickle_seagrass_block": "木秆藻块",
"block.tropicraft.tall_eel_grass": "高海菖蒲",
"block.tropicraft.tall_fern_seagrass": "高喜盐草",
"block.tropicraft.tall_sickle_seagrass": "高木秆藻",
"block.tropicraft.teleport_water": "热带世界传送门",
mamaruo marked this conversation as resolved.
Show resolved Hide resolved
"entity.tropicraft.fishing_bobber": "浮标",
"entity.tropicraft.hammerhead": "锤头鲨",
"entity.tropicraft.poison_blot": "毒液球",
"entity.tropicraft.spear": "竹矛",

"block.tropicraft.bamboo_potted_torchflower": "竹制火把花盆栽",
"block.tropicraft.bamboo_potted_pitcher_plant": "竹制瓶子草盆栽"
}
Loading