From 675c2dd66a0992864de77fb775d00de8cc57c200 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Fri, 16 Dec 2022 22:47:20 +0800 Subject: [PATCH 1/7] Update zh_cn.json --- .../every-compat/everycomp/lang/zh_cn.json | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json index 9f1ff6037e59..afbd8810dfae 100644 --- a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json +++ b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json @@ -791,6 +791,33 @@ "leaves_type.terraqueous.peach": "桃树", "leaves_type.terraqueous.pear": "梨树", "leaves_type.terraqueous.plum": "李树", + "wood_type.terrestria.cypress": "柏木", + "wood_type.terrestria.hemlock": "铁杉木", + "wood_type.terrestria.japanese_maple": "日本枫木", + "wood_type.terrestria.rainbow_eucalyptus": "彩虹桉木", + "wood_type.terrestria.redwood": "红杉木", + "wood_type.terrestria.rubber": "橡胶木", + "wood_type.terrestria.sakura": "樱花木", + "wood_type.terrestria.willow": "柳木", + "wood_type.terrestria.yucca_palm": "丝兰棕榈木", + "leaves_type.terrestria.cypress": "柏树", + "leaves_type.terrestria.hemlock": "铁杉", + "leaves_type.terrestria.japanese_maple": "日本枫", + "leaves_type.terrestria.rainbow_eucalyptus": "彩虹桉", + "leaves_type.terrestria.redwood": "红杉", + "leaves_type.terrestria.rubber": "橡胶", + "leaves_type.terrestria.sakura": "樱花", + "leaves_type.terrestria.willow": "柳树", + "leaves_type.terrestria.yucca_palm": "丝兰棕榈", + "leaves_type.terrestria.jungle_palm": "丛林棕榈", + "leaves_type.terrestria.dark_japanese_maple": "日本红枫", + "leaves_type.terrestria.japanese_maple_shrub": "日本枫木灌木", + "wood_type.traverse.fir": "冷杉木", + "leaves_type.traverse.fir": "冷杉", + "leaves_type.traverse.red_autumnal: "红色秋", + "leaves_type.traverse.brown_autumnal": "棕色秋", + "leaves_type.traverse.orange_autumnal": "橙色秋", + "leaves_type.traverse.yellow_autumnal": "黄色秋", "leaves_type.tofucraft.tofu": "豆腐", "wood_type.twigs.bamboo": "竹", "leaves_type.twigs.bamboo": "竹叶", @@ -828,4 +855,4 @@ "wood_type.windswept.chestnut": "栗木", "leaves_type.windswept.holly": "冬青", "leaves_type.windswept.chestnut": "栗树" -} \ No newline at end of file +} From bde4a3d458bedcd6bd8dcd1ed7314af996ff8ecf Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Fri, 16 Dec 2022 22:51:35 +0800 Subject: [PATCH 2/7] fix --- projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json index afbd8810dfae..420faf93dda3 100644 --- a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json +++ b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json @@ -814,7 +814,7 @@ "leaves_type.terrestria.japanese_maple_shrub": "日本枫木灌木", "wood_type.traverse.fir": "冷杉木", "leaves_type.traverse.fir": "冷杉", - "leaves_type.traverse.red_autumnal: "红色秋", + "leaves_type.traverse.red_autumnal": "红色秋", "leaves_type.traverse.brown_autumnal": "棕色秋", "leaves_type.traverse.orange_autumnal": "橙色秋", "leaves_type.traverse.yellow_autumnal": "黄色秋", From 8b30267c5eef77789be2d7d13c91a700a483f154 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Sat, 17 Dec 2022 02:00:49 +0800 Subject: [PATCH 3/7] Apply suggestions from code review Co-authored-by: Wren --- projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json index 420faf93dda3..3b9e16ae7621 100644 --- a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json +++ b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json @@ -793,7 +793,7 @@ "leaves_type.terraqueous.plum": "李树", "wood_type.terrestria.cypress": "柏木", "wood_type.terrestria.hemlock": "铁杉木", - "wood_type.terrestria.japanese_maple": "日本枫木", + "wood_type.terrestria.japanese_maple": "日本红枫木", "wood_type.terrestria.rainbow_eucalyptus": "彩虹桉木", "wood_type.terrestria.redwood": "红杉木", "wood_type.terrestria.rubber": "橡胶木", @@ -802,7 +802,7 @@ "wood_type.terrestria.yucca_palm": "丝兰棕榈木", "leaves_type.terrestria.cypress": "柏树", "leaves_type.terrestria.hemlock": "铁杉", - "leaves_type.terrestria.japanese_maple": "日本枫", + "leaves_type.terrestria.japanese_maple": "日本红枫", "leaves_type.terrestria.rainbow_eucalyptus": "彩虹桉", "leaves_type.terrestria.redwood": "红杉", "leaves_type.terrestria.rubber": "橡胶", From b52cb4fe7d9b6a02c3e778f8ff4a25c264872d41 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Sat, 17 Dec 2022 20:21:32 +0800 Subject: [PATCH 4/7] Apply suggestions from code review Co-authored-by: Wren --- projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json index 3b9e16ae7621..e57e2a03abbc 100644 --- a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json +++ b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json @@ -810,8 +810,8 @@ "leaves_type.terrestria.willow": "柳树", "leaves_type.terrestria.yucca_palm": "丝兰棕榈", "leaves_type.terrestria.jungle_palm": "丛林棕榈", - "leaves_type.terrestria.dark_japanese_maple": "日本红枫", - "leaves_type.terrestria.japanese_maple_shrub": "日本枫木灌木", + "leaves_type.terrestria.dark_japanese_maple": "暗色日本红枫", + "leaves_type.terrestria.japanese_maple_shrub": "日本红枫灌木", "wood_type.traverse.fir": "冷杉木", "leaves_type.traverse.fir": "冷杉", "leaves_type.traverse.red_autumnal": "红色秋", From 827d3f532163d70c2d6b5a4847b1da7a499b7a7e Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Thu, 22 Dec 2022 10:14:41 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=A9=BA=E8=A1=8C=E8=A1=A5=E5=92=8C?= =?UTF-8?q?=E6=A0=91=E5=90=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../every-compat/everycomp/lang/zh_cn.json | 100 +++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json index e57e2a03abbc..7201f8d73720 100644 --- a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json +++ b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json @@ -1,9 +1,13 @@ { "itemGroup.everycomp": "泛用兼容", "itemGroup.everycomp.everycomp": "泛用兼容", + "block_type.twigs.table": "%s桌", + "block_type.missingwilds.fallen_log": "倒下的%s原木", + "block_type.campchair.camp_chair": "%s小凳", + "block_type.another_furniture.table": "%s桌", "block_type.another_furniture.chair": "%s椅子", "block_type.another_furniture.shelf": "%s架子", @@ -11,6 +15,7 @@ "block_type.another_furniture.planter_box": "%s花箱", "block_type.another_furniture.drawer": "%s橱柜", "block_type.another_furniture.bench": "%s长椅", + "block_type.buildersaddition.arcade": "%s街机", "block_type.buildersaddition.bench": "%s长凳", "block_type.buildersaddition.bedside_table": "%s床头柜", @@ -30,13 +35,17 @@ "block_type.buildersaddition.support_bracket": "%s支撑架", "block_type.buildersaddition.table": "%s桌子", "block_type.buildersaddition.vertical_slab": "%s竖直台阶", + "block_type.graveyard.coffin": "%s棺材", + "block_type.decorative_blocks.palisade": "%s实心栅栏", "block_type.decorative_blocks.support": "%s支架", "block_type.decorative_blocks.beam": "%s支撑柱", "block_type.decorative_blocks.seat": "%s板凳", "block_type.decorative_winter.snowy_palisade": "覆雪的%s实心栅栏", + "block_type.farmersdelight.cabinet": "%s厨柜", + "block_type.furnish.bedside_table": "%s床头柜", "block_type.furnish.bench": "%s长椅", "block_type.furnish.cabinet": "%s柜", @@ -53,19 +62,25 @@ "block_type.furnish.stool": "%s凳", "block_type.furnish.table": "%s桌", "block_type.furnish.wardrobe": "%s立柜", + "block_type.mosaic_carpentry.mosaic": "%s马赛克", "block_type.mosaic_carpentry.mosaic_stairs": "%s马赛克楼梯", "block_type.mosaic_carpentry.mosaic_slab": "%s马赛克台阶", + "block_type.friendsandfoes.beehive": "%s蜂箱", + "block_type.dramaticdoors.tall_door": "高%s门", + "block_type.pokecube_legends.distortic_planks": "扭曲%s板", "block_type.pokecube_legends.distortic_stairs": "扭曲%s楼梯", "block_type.pokecube_legends.distortic_slab": "扭曲%s台阶", + "block_type.twilightforest.hollow_log": "空心%s原木", "block_type.twilightforest.hollow_log_vertical": "空心%s原木", "block_type.twilightforest.hollow_log_horizontal": "空心%s原木", "block_type.twilightforest.hollow_log_climbable": "空心%s原木", "block_type.twilightforest.banister": "%s栏杆", + "block_type.quark.stripped_post": "去皮%s杆", "block_type.quark.post": "%s杆", "block_type.quark.hedge": "%s树叶篱", @@ -74,11 +89,15 @@ "block_type.quark.trapped_chest": "%s陷阱箱", "block_type.quark.bookshelf": "%s书架", "block_type.quark.vertical_planks": "竖纹%s木板", + "block_type.architects_palette.railing": "%s扶手", "block_type.architects_palette.boards": "%s宽木板", + "block_type.valhelsia_structures.cut_post": "分割%s杆", "block_type.valhelsia_structures.post": "%s杆", + "block_type.backpacked.backpack_shelf": "%s背包架", + "block_type.mcwbridges.rail_bridge": "%s铁轨桥", "block_type.mcwbridges.bridge_pier": "%s桥梁支架", "block_type.mcwbridges.log_bridge_middle": "%s桥", @@ -87,6 +106,7 @@ "block_type.mcwbridges.rope_bridge": "%s索桥", "block_type.mcwbridges.bridge_rope": "%s索桥", "block_type.mcwbridges.wired_fence": "%s铁丝栅栏", + "block_type.mcwdoors.bark_glass_door": "%s树皮玻璃门", "block_type.mcwdoors.barn_door": "%s谷仓门", "block_type.mcwdoors.barn_glass_door": "%s玻璃谷仓门", @@ -106,12 +126,14 @@ "block_type.mcwdoors.swamp_door": "%s沼泽风格门", "block_type.mcwdoors.tropical_door": "%s热带风格门", "block_type.mcwdoors.western_door": "%s西部百叶门", + "block_type.mcwfences.picket_fence": "%s篱栅", "block_type.mcwfences.stockade_fence": "%s栅栏墙", "block_type.mcwfences.horse_fence": "%s马场栅栏", "block_type.mcwfences.wired_fence": "%s铁丝栅栏", "block_type.mcwfences.pyramid_gate": "%s斜板栅栏门", "block_type.mcwfences.highley_gate": "%s海利栅栏门", + "block_type.mcwfurnitures.bookshelf": "%s书架", "block_type.mcwfurnitures.bookshelf_cupboard": "%s带橱柜书架", "block_type.mcwfurnitures.bookshelf_drawer": "%s带书架横排柜", @@ -166,9 +188,12 @@ "block_type.mcwfurnitures.table": "%s桌", "block_type.mcwfurnitures.triple_drawer": "%s三重横排柜", "block_type.mcwfurnitures.wardrobe": "%s衣柜", + "block_type.mcwlights.soul_tiki_torch": "%s灵魂提基火把", "block_type.mcwlights.tiki_torch": "%s提基火把", + "block_type.mcwpaths.planks_path": "%s木板小径", + "block_type.mcwroofs.attic_roof": "%s天窗屋顶", "block_type.mcwroofs.lower_roof": "%s平缓屋顶底端", "block_type.mcwroofs.planks_attic_roof": "%s木板天窗屋顶", @@ -183,6 +208,7 @@ "block_type.mcwroofs.top_roof": "%s屋顶顶端", "block_type.mcwroofs.upper_lower_roof": "%s平缓屋顶顶端", "block_type.mcwroofs.upper_steep_roof": "%s陡峭屋顶顶端", + "block_type.mcwtrpdoors.bark_trapdoor": "%s树皮活板门", "block_type.mcwtrpdoors.barn_trapdoor": "%s谷仓活板门", "block_type.mcwtrpdoors.barred_trapdoor": "%s栅纹活板门", @@ -196,6 +222,7 @@ "block_type.mcwtrpdoors.ranch_trapdoor": "%s农场活板门", "block_type.mcwtrpdoors.swamp_trapdoor": "%s沼泽活板门", "block_type.mcwtrpdoors.tropical_trapdoor": "%s热带活板门", + "block_type.mcwwindows.blinds": "%s百叶窗", "block_type.mcwwindows.four_window": "%s四格窗户", "block_type.mcwwindows.log_parapet": "%s护台", @@ -211,9 +238,12 @@ "block_type.mcwwindows.window": "%s窗户", "block_type.mcwwindows.window_pane": "%s窗户板", "block_type.mcwwindows.window2": "%s双格窗户", + "block_type.benched.bench": "%s野餐桌", + "block_type.create.window": "%s窗户", "block_type.create.window_pane": "%s窗户板", + "block_type.cfm.window": "%s窗户", "block_type.cfm.backpack_shelf": "%s背包架", "block_type.cfm.bedside_cabinet": "%s床头柜", @@ -269,6 +299,7 @@ "block_type.cfm.upgraded_fence": "%s升级栅栏", "block_type.cfm.upgraded_gate": "%s升级门", "block_type.cfm.vertical_planks": "竖纹%s木板", + "block_type.projectbrazier.armrest_chair": "%s扶手椅", "block_type.projectbrazier.bench": "%s长凳", "block_type.projectbrazier.bottom_platform": "%s平台", @@ -299,6 +330,7 @@ "block_type.projectbrazier.top_platform_stairs": "%s台梯", "block_type.projectbrazier.vertical_lattice": "%s竖杆格栅", "block_type.projectbrazier.zipline_anchor": "%s滑索绳锚", + "block_type.storagedrawers.full_drawers_1": "1x1%s抽屉", "block_type.storagedrawers.full_drawers_2": "1x2%s抽屉", "block_type.storagedrawers.full_drawers_4": "2x2%s抽屉", @@ -306,11 +338,14 @@ "block_type.storagedrawers.half_drawers_2": "1x2小型%s抽屉", "block_type.storagedrawers.half_drawers_4": "2x2小型%s抽屉", "block_type.storagedrawers.trim": "%s桥接方块", + "block_type.woodworks.boards": "%s直木板", "block_type.woodworks.bookshelf": "%s书架", "block_type.woodworks.ladder": "%s梯子", "block_type.woodworks.beehive": "%s蜂箱", "block_type.woodworks.leaf_pile": "%s树叶堆", + + "wood_type.minecraft.oak": "橡木", "wood_type.minecraft.spruce": "云杉木", "wood_type.minecraft.birch": "白桦木", @@ -327,10 +362,12 @@ "leaves_type.minecraft.acacia": "金合欢", "leaves_type.minecraft.azalea": "杜鹃", "leaves_type.minecraft.flowering_azalea": "盛开的杜鹃", + "wood_type.ad_astra.aeronos": "空果木", "wood_type.ad_astra.strophar": "孑节木", "wood_type.ad_astra.glacian": "融冰木", "leaves_type.ad_astra.glacian": "融冰", + "wood_type.aether.skyroot": "天根木", "leaves_type.aether.skyroot": "天根", "leaves_type.aether.golden_oak": "金琥珀", @@ -338,6 +375,7 @@ "leaves_type.aether.crystal_fruit": "结实的水晶", "leaves_type.aether.holiday": "节庆", "leaves_type.aether.decorated_holiday": "节庆装饰", + "wood_type.aoa3.achony": "桉格尼木", "wood_type.aoa3.churry": "樱桃木", "wood_type.aoa3.creep": "蠕变木", @@ -379,15 +417,20 @@ "leaves_type.aoa3.shadowblood": "血影", "leaves_type.aoa3.bright_shyre": "闪耀塞尔瑞", "leaves_type.aoa3.vein": "血脉", + "wood_type.appletreesrev.apple": "苹果木", "leaves_type.appletreesrev.apple": "苹果", + "wood_type.architects_palette.twisted": "扭曲木", "leaves_type.architects_palette.twisted": "扭曲", - "leaves_type.ars_elemental.yellow_archwood": "闪熠至高", + + "leaves_type.ars_elemental.yellow_archwood": "闪耀至高", + "leaves_type.ars_nouveau.blue_archwood": "奔流至高", "leaves_type.ars_nouveau.red_archwood": "烈焰至高", "leaves_type.ars_nouveau.green_archwood": "繁茂至高", "leaves_type.ars_nouveau.purple_archwood": "恼人至高", + "wood_type.bewitchment.juniper": "杜松木", "wood_type.bewitchment.cypress": "柏木", "wood_type.bewitchment.elder": "接骨木", @@ -396,6 +439,7 @@ "leaves_type.bewitchment.cypress": "柏树", "leaves_type.bewitchment.elder": "接骨", "leaves_type.bewitchment.dragons_blood": "龙血", + "wood_type.biomemakeover.blighted_balsa": "染菌轻木", "wood_type.biomemakeover.willow": "柳木", "wood_type.biomemakeover.swamp_cypress": "沼泽柏木", @@ -404,6 +448,7 @@ "leaves_type.biomemakeover.willow": "柳树", "leaves_type.biomemakeover.swamp_cypress": "沼泽柏", "leaves_type.biomemakeover.ancient_oak": "远古橡树", + "wood_type.biomesoplenty.fir": "杉木", "wood_type.biomesoplenty.redwood": "红木", "wood_type.biomesoplenty.cherry": "樱桃木", @@ -433,6 +478,7 @@ "leaves_type.biomesoplenty.maple": "枫树", "leaves_type.biomesoplenty.white_cherry": "白色樱桃", "leaves_type.biomesoplenty.pink_cherry": "粉红色樱桃", + "wood_type.blue_skies.bluebright": "蓝辉木", "wood_type.blue_skies.starlit": "星荧木", "wood_type.blue_skies.frostbright": "霜耀木", @@ -448,8 +494,10 @@ "leaves_type.blue_skies.maple": "枫树", "leaves_type.blue_skies.cherry": "樱桃", "leaves_type.blue_skies.crescent_fruit": "新月果", + "wood_type.botania.livingwood": "活木", "wood_type.botania.dreamwood": "梦之木", + "wood_type.byg.aspen": "白杨木", "wood_type.byg.baobab": "猴面包木", "wood_type.byg.blue_enchanted": "蓝色魔法木", @@ -537,29 +585,39 @@ "leaves_type.byg.withering_oak": "凋零橡树", "leaves_type.byg.flowering_nightshade": "盛开的夜影", "leaves_type.byg.firecracker": "鸟尾花", + "wood_type.caupona.walnut": "核桃木", "leaves_type.caupona.walnut": "核桃", "leaves_type.caupona.fig": "无花果", "leaves_type.caupona.wolfberry": "枸杞", + "wood_type.ceilands.ceiltrunk": "垂顶木", "wood_type.ceilands.luzawood": "蓝碧木", "leaves_type.ceilands.ceiltrunk": "垂顶", "leaves_type.ceilands.luzawood": "蓝碧", + "wood_type.cinderscapes.scorched": "焦灼木", "wood_type.cinderscapes.umbral": "暗影木", + "leaves_type.croptopia.cinnamon": "肉桂", + "leaves_type.culturaldelights.avocado": "牛油果", + "wood_type.darkerdepths.petrified": "石化木", + "wood_type.domum_ornamentum.cactus": "仙人掌", "wood_type.domum_ornamentum.green_cactus": "绿色仙人掌", + "wood_type.ecologics.coconut": "椰木", "wood_type.ecologics.walnut": "核桃木", "wood_type.ecologics.azalea": "杜鹃木", "wood_type.ecologics.flowering_azalea": "杜鹃花木", "leaves_type.ecologics.coconut": "椰树", "leaves_type.ecologics.walnut": "核桃", + "wood_type.enhanced_mushrooms.red_mushroom": "红色蘑菇", "wood_type.enhanced_mushrooms.brown_mushroom": "棕色蘑菇", + "wood_type.eternal_tales.hyacinthum": "风信蓝木", "wood_type.eternal_tales.petrified": "惊悚木", "wood_type.eternal_tales.mandarin_orange": "中华橙木", @@ -577,10 +635,12 @@ "leaves_type.eternal_tales.khagris": "哈格里斯", "leaves_type.eternal_tales.lychee": "荔枝", "leaves_type.eternal_tales.amberwood": "琥珀", + "wood_type.extendedmushrooms.mushroom": "蘑菇", "wood_type.extendedmushrooms.glowshroom": "荧光菇", "wood_type.extendedmushrooms.poisonous_mushroom": "毒蘑菇", "wood_type.extendedmushrooms.honey_fungus": "蜂蜜菌", + "wood_type.forbidden_arcanus.cherrywood": "樱桃木", "wood_type.forbidden_arcanus.edelwood": "埃德木", "wood_type.forbidden_arcanus.mysterywood": "神秘木", @@ -588,8 +648,10 @@ "leaves_type.forbidden_arcanus.cherrywood": "樱桃木", "leaves_type.forbidden_arcanus.mysterywood": "神秘木", "leaves_type.forbidden_arcanus.nuggety_mysterywood": "浑金神秘木", + "wood_type.forcecraft.force": "力量木", "leaves_type.forcecraft.force": "力量", + "wood_type.fruittrees.cherry": "樱木", "wood_type.fruittrees.citrus": "柑橘木", "leaves_type.fruittrees.cherry": "樱桃", @@ -602,44 +664,60 @@ "leaves_type.fruittrees.lemon": "柠檬", "leaves_type.fruittrees.grapefruit": "西柚", "leaves_type.fruittrees.apple": "苹果橡树", + "wood_type.greekfantasy.olive": "橄榄木", "wood_type.greekfantasy.pomegranate": "石榴木", "leaves_type.greekfantasy.olive": "橄榄", "leaves_type.greekfantasy.pomegranate": "石榴", "leaves_type.greekfantasy.golden": "金苹果", + "wood_type.habitat.fairy_ring_mushroom": "仙环菇", + "wood_type.hexcasting.akashic": "启迪木", + "wood_type.hexerei.mahogany": "桃花心木", "wood_type.hexerei.willow": "柳木", "leaves_type.hexerei.mahogany": "桃花心", "leaves_type.hexerei.willow": "柳树", + "wood_type.integrateddynamics.menril": "门瑞欧木", "leaves_type.integrateddynamics.menril": "门瑞欧", + "wood_type.malum.runewood": "符文木", "wood_type.malum.soulwood": "灵魂木", "leaves_type.malum.runewood": "符文", "leaves_type.malum.soulwood": "灵魂", + "wood_type.morecraft.netherwood": "下界木", "leaves_type.morecraft.netherwood": "下界", + "leaves_type.mythicbotany.dreamwood": "梦之木", + "wood_type.mysticalworld.charred": "烧焦的", + "wood_type.nethers_exoticism.ramboutan": "红毛丹木", "leaves_type.nethers_exoticism.ramboutan": "红毛丹", "leaves_type.nethers_exoticism.jaboticaba": "嘉宝果", + "wood_type.newworld.fir": "冷杉木", "leaves_type.newworld.fir": "冷杉", + "wood_type.nourished_end.verdant": "翠绿木", "wood_type.nourished_end.cerulean": "晶蓝木", "wood_type.nourished_end.seldge": "塞尔奇木", "wood_type.nourished_end.cosmic": "星宙木", "leaves_type.nourished_end.cosmic": "星宙", + "leaves_type.occultism.otherworld": "异界", + "wood_type.phantasm.pream": "虚兰木", "wood_type.phantasm.ebony": "乌木", "leaves_type.phantasm.pream": "虚兰", + "wood_type.pizzacraft.olive": "橄榄木", "leaves_type.pizzacraft.olive": "橄榄", "leaves_type.pizzacraft.fruit_olive": "结果的橄榄", + "wood_type.pokecube.enigma": "谜芝果木", "wood_type.pokecube.leppa": "苹野木", "wood_type.pokecube.nanab": "蕉香木", @@ -658,6 +736,7 @@ "leaves_type.pokecube.grepa": "萄葡", "leaves_type.pokecube.kelpsy": "藻根", "leaves_type.pokecube.pomeg": "榴石", + "wood_type.pokecube_legends.concrete": "凝结木", "wood_type.pokecube_legends.aged": "陈年木", "wood_type.pokecube_legends.corrupted": "腐坏木", @@ -671,6 +750,7 @@ "leaves_type.pokecube_legends.inverted": "反转", "leaves_type.pokecube_legends.mirage": "幻象", "leaves_type.pokecube_legends.temporal": "尘青", + "wood_type.premium_wood.maple": "枫木", "wood_type.premium_wood.tiger": "虎木", "wood_type.premium_wood.magic": "魔法木", @@ -684,23 +764,28 @@ "leaves_type.premium_wood.willow": "柳树", "leaves_type.premium_wood.silverbell": "银钟", "leaves_type.premium_wood.purple_heart": "紫心", + "wood_type.primalmagick.sunwood": "太阳木", "wood_type.primalmagick.moonwood": "月亮木", "wood_type.primalmagick.hallowood": "神圣木", "leaves_type.primalmagick.sunwood": "太阳", "leaves_type.primalmagick.moonwood": "月亮", "leaves_type.primalmagick.hallowood": "神圣", + "wood_type.projectbrazier.apple": "苹果木", "wood_type.projectbrazier.orange": "橘木", + "wood_type.promenade.cherry_oak": "樱桃橡木", "wood_type.promenade.dark_amaranth": "暗紫木", "wood_type.promenade.palm": "棕榈木", "leaves_type.promenade.cherry_oak": "樱桃橡树", "leaves_type.promenade.dark_amaranth": "暗紫", "leaves_type.promenade.palm": "棕榈", + "wood_type.pyromancer.pyrowood": "炽木", "wood_type.pyromancer.rotten": "朽腐木", "leaves_type.pyromancer.pyrowood": "炽树", + "wood_type.quark.blossom": "花木", "wood_type.quark.azalea": "杜鹃木", "leaves_type.quark.blue_blossom": "雪霜花", @@ -709,6 +794,7 @@ "leaves_type.quark.pink_blossom": "甜蜜花", "leaves_type.quark.yellow_blossom": "阳光花", "leaves_type.quark.red_blossom": "火热花", + "wood_type.rankine.cedar": "雪松木", "wood_type.rankine.balsam_fir": "胶枞", "wood_type.rankine.eastern_hemlock": "东方铁杉木", @@ -749,14 +835,17 @@ "leaves_type.rankine.honey_locust": "皂荚", "leaves_type.rankine.weeping_willow": "垂柳", "leaves_type.rankine.erythrina": "刺桐", + "wood_type.sakura.sakura": "樱木", "wood_type.sakura.maple": "枫木", + "wood_type.tconstruct.greenheart": "绿心木", "wood_type.tconstruct.skyroot": "天根木", "wood_type.tconstruct.bloodshroom": "血菌木", "leaves_type.tconstruct.earth_slime": "黏性", "leaves_type.tconstruct.sky_slime": "黏性", "leaves_type.tconstruct.ender_slime": "黏性", + "wood_type.terraincognita.apple": "苹果木", "wood_type.terraincognita.hazel": "榛木", "wood_type.terraincognita.larch": "落叶松木", @@ -766,6 +855,7 @@ "leaves_type.terraincognita.larch": "落叶松", "leaves_type.terraincognita.gingko": "银杏", "leaves_type.terraincognita.blossoming_apple": "开花苹果", + "wood_type.terraqueous.storm_cloud": "乌雷云朵", "wood_type.terraqueous.light_cloud": "轻柔云朵", "wood_type.terraqueous.dense_cloud": "浓厚云朵", @@ -791,6 +881,7 @@ "leaves_type.terraqueous.peach": "桃树", "leaves_type.terraqueous.pear": "梨树", "leaves_type.terraqueous.plum": "李树", + "wood_type.terrestria.cypress": "柏木", "wood_type.terrestria.hemlock": "铁杉木", "wood_type.terrestria.japanese_maple": "日本红枫木", @@ -812,15 +903,19 @@ "leaves_type.terrestria.jungle_palm": "丛林棕榈", "leaves_type.terrestria.dark_japanese_maple": "暗色日本红枫", "leaves_type.terrestria.japanese_maple_shrub": "日本红枫灌木", + "wood_type.traverse.fir": "冷杉木", "leaves_type.traverse.fir": "冷杉", "leaves_type.traverse.red_autumnal": "红色秋", "leaves_type.traverse.brown_autumnal": "棕色秋", "leaves_type.traverse.orange_autumnal": "橙色秋", "leaves_type.traverse.yellow_autumnal": "黄色秋", + "leaves_type.tofucraft.tofu": "豆腐", + "wood_type.twigs.bamboo": "竹", "leaves_type.twigs.bamboo": "竹叶", + "wood_type.twilightforest.twilight_oak": "暮色橡木", "wood_type.twilightforest.canopy": "苍穹木", "wood_type.twilightforest.mangrove": "红木", @@ -840,17 +935,20 @@ "leaves_type.twilightforest.thorn": "荆棘", "leaves_type.twilightforest.beanstalk": "豆茎", "leaves_type.twilightforest.rainbow_oak": "彩虹橡树", + "wood_type.undergarden.smogstem": "烟梗木", "wood_type.undergarden.wigglewood": "摇蜿木", "wood_type.undergarden.grongle": "油绿木", "leaves_type.undergarden.smogstem": "烟梗", "leaves_type.undergarden.wigglewood": "摇蜿", "leaves_type.undergarden.grongle": "油绿", + "wood_type.wilds.baobab": "猴面包木", "wood_type.wilds.cypress": "柏木", "leaves_type.wilds.baobab": "猴面包", "leaves_type.wilds.cypress": "柏树", "leaves_type.wilds.eucalyptus": "桉树", + "wood_type.windswept.holly": "冬青木", "wood_type.windswept.chestnut": "栗木", "leaves_type.windswept.holly": "冬青", From 01f07bfafa55660515da145d981dfe4e2b9e2979 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Fri, 23 Dec 2022 00:47:19 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=B4=AF=E7=A7=AF=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.18/assets/every-compat/everycomp/lang/zh_cn.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json index 7201f8d73720..cc50378f5559 100644 --- a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json +++ b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json @@ -479,6 +479,9 @@ "leaves_type.biomesoplenty.white_cherry": "白色樱桃", "leaves_type.biomesoplenty.pink_cherry": "粉红色樱桃", + "wood_type.blocksplus.bamboo": "竹木", + "wood_type.blocksplus.mushroom": "蘑菇", + "wood_type.blue_skies.bluebright": "蓝辉木", "wood_type.blue_skies.starlit": "星荧木", "wood_type.blue_skies.frostbright": "霜耀木", @@ -710,9 +713,9 @@ "leaves_type.occultism.otherworld": "异界", - "wood_type.phantasm.pream": "虚兰木", - "wood_type.phantasm.ebony": "乌木", - "leaves_type.phantasm.pream": "虚兰", + "wood_type.phantasm.pream": "梦兰木", + "wood_type.phantasm.ebony": "黑漆木", + "leaves_type.phantasm.pream": "梦兰", "wood_type.pizzacraft.olive": "橄榄木", "leaves_type.pizzacraft.olive": "橄榄", From bfcf70f7c4d45e4466f580c80186767886181823 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Sat, 24 Dec 2022 17:10:08 +0800 Subject: [PATCH 7/7] fix --- .../every-compat/everycomp/lang/zh_cn.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json index cc50378f5559..8ce4aa3719b2 100644 --- a/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json +++ b/projects/1.18/assets/every-compat/everycomp/lang/zh_cn.json @@ -88,7 +88,7 @@ "block_type.quark.chest": "%s箱子", "block_type.quark.trapped_chest": "%s陷阱箱", "block_type.quark.bookshelf": "%s书架", - "block_type.quark.vertical_planks": "竖纹%s木板", + "block_type.quark.vertical_planks": "竖纹%s板", "block_type.architects_palette.railing": "%s扶手", "block_type.architects_palette.boards": "%s宽木板", @@ -192,17 +192,17 @@ "block_type.mcwlights.soul_tiki_torch": "%s灵魂提基火把", "block_type.mcwlights.tiki_torch": "%s提基火把", - "block_type.mcwpaths.planks_path": "%s木板小径", + "block_type.mcwpaths.planks_path": "%s板小径", "block_type.mcwroofs.attic_roof": "%s天窗屋顶", "block_type.mcwroofs.lower_roof": "%s平缓屋顶底端", - "block_type.mcwroofs.planks_attic_roof": "%s木板天窗屋顶", - "block_type.mcwroofs.planks_lower_roof": "%s木板平缓屋顶底端", - "block_type.mcwroofs.planks_roof": "%s木板屋顶", - "block_type.mcwroofs.planks_steep_roof": "%s木板陡峭屋顶底端", - "block_type.mcwroofs.planks_top_roof": "%s木板屋顶顶端", - "block_type.mcwroofs.planks_upper_lower_roof": "%s木板平缓屋顶顶端", - "block_type.mcwroofs.planks_upper_steep_roof": "%s木板陡峭屋顶顶端", + "block_type.mcwroofs.planks_attic_roof": "%s板天窗屋顶", + "block_type.mcwroofs.planks_lower_roof": "%s板平缓屋顶底端", + "block_type.mcwroofs.planks_roof": "%s板屋顶", + "block_type.mcwroofs.planks_steep_roof": "%s板陡峭屋顶底端", + "block_type.mcwroofs.planks_top_roof": "%s板屋顶顶端", + "block_type.mcwroofs.planks_upper_lower_roof": "%s板平缓屋顶顶端", + "block_type.mcwroofs.planks_upper_steep_roof": "%s板陡峭屋顶顶端", "block_type.mcwroofs.roof": "%s屋顶", "block_type.mcwroofs.steep_roof": "%s陡峭屋顶底端", "block_type.mcwroofs.top_roof": "%s屋顶顶端", @@ -227,10 +227,10 @@ "block_type.mcwwindows.four_window": "%s四格窗户", "block_type.mcwwindows.log_parapet": "%s护台", "block_type.mcwwindows.louvered_shutter": "%s百叶窗扇", - "block_type.mcwwindows.plank_four_window": "%s木板四格窗户", - "block_type.mcwwindows.plank_parapet": "%s木板护台", - "block_type.mcwwindows.plank_window": "%s木板窗户", - "block_type.mcwwindows.plank_window2": "%s木板双格窗户", + "block_type.mcwwindows.plank_four_window": "%s板四格窗户", + "block_type.mcwwindows.plank_parapet": "%s板护台", + "block_type.mcwwindows.plank_window": "%s板窗户", + "block_type.mcwwindows.plank_window2": "%s板双格窗户", "block_type.mcwwindows.shutter": "%s窗扇", "block_type.mcwwindows.stripped_log_four_window": "去皮%s四格窗户", "block_type.mcwwindows.stripped_log_window": "去皮%s窗户", @@ -267,9 +267,9 @@ "block_type.cfm.mail_box": "%s信箱", "block_type.cfm.park_bench": "%s公园长椅", "block_type.cfm.picket_fence": "%s尖桩篱笆", - "block_type.cfm.plank_parapet": "%s木板护台", - "block_type.cfm.plank_window": "%s木板窗户", - "block_type.cfm.plank_window2": "%s木板窗棂窗户", + "block_type.cfm.plank_parapet": "%s板护台", + "block_type.cfm.plank_window": "%s板窗户", + "block_type.cfm.plank_window2": "%s板窗棂窗户", "block_type.cfm.post": "%s杆", "block_type.cfm.pyramid_gate": "%s斜板栅栏门", "block_type.cfm.railing": "%s扶手", @@ -298,7 +298,7 @@ "block_type.cfm.table": "%s桌", "block_type.cfm.upgraded_fence": "%s升级栅栏", "block_type.cfm.upgraded_gate": "%s升级门", - "block_type.cfm.vertical_planks": "竖纹%s木板", + "block_type.cfm.vertical_planks": "竖纹%s板", "block_type.projectbrazier.armrest_chair": "%s扶手椅", "block_type.projectbrazier.bench": "%s长凳", @@ -316,7 +316,7 @@ "block_type.projectbrazier.log_bench": "%s原木长椅", "block_type.projectbrazier.log_chair": "%s原木椅", "block_type.projectbrazier.open_barrel": "敞口%s桶", - "block_type.projectbrazier.plank_chair": "%s木板椅", + "block_type.projectbrazier.plank_chair": "%s板椅", "block_type.projectbrazier.platform": "%s平台", "block_type.projectbrazier.white_polstered_bench": "带白色垫座的%s长凳", "block_type.projectbrazier.orange_polstered_bench": "带橙色垫座的%s长凳",