From 47ea41567b0b23464b95e445ad69379daa1b74e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=BD=E9=9B=AA=E9=B8=A6=E6=9D=80?= <38830216+luoxueyasha@users.noreply.github.com> Date: Sat, 7 Jun 2025 15:32:23 +0800 Subject: [PATCH 1/7] fix brazilian_fields --- .../brazilian_fields/lang/zh_cn.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/projects/1.18/assets/brazilian-fields/brazilian_fields/lang/zh_cn.json b/projects/1.18/assets/brazilian-fields/brazilian_fields/lang/zh_cn.json index 3c7092037361..c38e38e4e69d 100644 --- a/projects/1.18/assets/brazilian-fields/brazilian_fields/lang/zh_cn.json +++ b/projects/1.18/assets/brazilian-fields/brazilian_fields/lang/zh_cn.json @@ -2,15 +2,15 @@ "advancements.coxinha_dourada_advancement.descr": "金炸鸡肉面包！", "advancements.coxinha_dourada_advancement.title": "终极食物", "advancements.getriceandbeans.descr": "经典巴西美食", - "advancements.getriceandbeans.title": "巴西豆饭", + "advancements.getriceandbeans.title": "巴西煮豆", "advancements.your_rich.descr": "获得一些雷亚尔币", "advancements.your_rich.title": "真金不怕火炼", "biome.brazilian_fields.brazilian_city": "巴西都市", "biome.brazilian_fields.caatinga": "卡廷加群落", "biome.brazilian_fields.ipe_amarelo_plains": "风铃木平原", - "block.brazilian_fields.acai_growed": "阿萨伊浆果", - "block.brazilian_fields.acai_ice_cream_block": "阿萨伊浆果冰淇淋块", - "block.brazilian_fields.acai_palm_heart_log": "阿萨伊棕榈原木", + "block.brazilian_fields.acai_growed": "巴西莓", + "block.brazilian_fields.acai_ice_cream_block": "巴西莓冰淇淋块", + "block.brazilian_fields.acai_palm_heart_log": "巴西莓树原木", "block.brazilian_fields.asphalt_holes": "带洞沥青", "block.brazilian_fields.asphalt": "沥青", "block.brazilian_fields.caatinga_cactus": "卡廷加仙人掌", @@ -30,7 +30,7 @@ "block.brazilian_fields.ipe_amarelo_leaves": "黄花风铃木树叶", "block.brazilian_fields.mosaic_floor": "马赛克地砖", "block.brazilian_fields.mud_water_filter": "泥制过滤器", - "block.brazilian_fields.palm_heart_leaves": "阿萨伊棕榈树叶", + "block.brazilian_fields.palm_heart_leaves": "巴西莓树树叶", "block.brazilian_fields.soccer_ball": "足球", "entity.brazilian_fields.anta": "南美貘", "entity.brazilian_fields.capybara": "水豚", @@ -40,11 +40,11 @@ "entity.brazilian_fields.mico_leao_dourado": "金狮面狨", "entity.brazilian_fields.saci": "萨奇·佩雷雷", "entity.brazilian_fields.toucan": "巨嘴鸟", - "item.brazilian_fields.acai_berry": "阿萨伊浆果", - "item.brazilian_fields.acai_chocolate": "阿萨伊浆果巧克力", - "item.brazilian_fields.acai_ice_cream": "阿萨伊浆果冰淇淋", - "item.brazilian_fields.acai_juice": "阿萨伊浆果汁", - "item.brazilian_fields.acai_milkshake": "阿萨伊浆果奶昔", + "item.brazilian_fields.acai_berry": "巴西莓", + "item.brazilian_fields.acai_chocolate": "巴西莓巧克力", + "item.brazilian_fields.acai_ice_cream": "巴西莓冰淇淋", + "item.brazilian_fields.acai_juice": "巴西莓汁", + "item.brazilian_fields.acai_milkshake": "巴西莓奶昔", "item.brazilian_fields.acai_palm_heart_pie": "棕榈心派", "item.brazilian_fields.acai_palm_heart": "棕榈心", "item.brazilian_fields.anta_spawn_egg": "南美貘刷怪蛋", @@ -110,7 +110,7 @@ "item.brazilian_fields.red_slipper_chestplate": "人字拖", "item.brazilian_fields.red_slipper_helmet": "人字拖", "item.brazilian_fields.red_slipper_leggings": "人字拖", - "item.brazilian_fields.rice_and_beans": "巴西豆饭", + "item.brazilian_fields.rice_and_beans": "巴西煮豆", "item.brazilian_fields.saci_spawn_egg": "萨奇·佩雷雷刷怪蛋", "item.brazilian_fields.toucan_spawn_egg": "巨嘴鸟刷怪蛋", "item.brazilian_fields.white_slipper_boots": "人字拖", From 438816181b5fc04bec8873ccb1788f4fb0d62c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=BD=E9=9B=AA=E9=B8=A6=E6=9D=80?= <38830216+luoxueyasha@users.noreply.github.com> Date: Sat, 7 Jun 2025 15:34:58 +0800 Subject: [PATCH 2/7] port from https://github.com/danbrown/braziliandelight/pull/6 --- .../braziliandelight/lang/zh_cn.json | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json index 960b69966a52..628a0357b76b 100644 --- a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json +++ b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json @@ -1,32 +1,32 @@ { - "advancements.braziliandelight.acai_berry_item.description": "获得阿萨伊浆果", - "advancements.braziliandelight.acai_berry_item.title": "阿萨伊乐事", - "advancements.braziliandelight.acai_cream_craft.description": "制作阿萨伊浆果奶油球", + "advancements.braziliandelight.acai_berry_item.description": "获得巴西莓", + "advancements.braziliandelight.acai_berry_item.title": "巴西莓乐事", + "advancements.braziliandelight.acai_cream_craft.description": "制作巴西莓奶油球", "advancements.braziliandelight.acai_cream_craft.title": "和睦热带", "advancements.braziliandelight.beans_crop.description": "种植和收获豆荚", "advancements.braziliandelight.beans_crop.title": "感豆身授！", "advancements.braziliandelight.brigadeiro_craft.description": "制作巴西巧克力球", "advancements.braziliandelight.brigadeiro_craft.title": "巧克力珍宝", - "advancements.braziliandelight.cassava_crop.description": "种植和收获木薯", - "advancements.braziliandelight.cassava_crop.title": "复苏的根茎！", + "advancements.braziliandelight.cassava_crop.description": "种植并收获木薯", + "advancements.braziliandelight.cassava_crop.title": "根源复兴！", "advancements.braziliandelight.cassava_fritters_craft.description": "制作炸木薯酪饼", - "advancements.braziliandelight.cassava_fritters_craft.title": "可口的根茎", + "advancements.braziliandelight.cassava_fritters_craft.title": "风味根茎", "advancements.braziliandelight.cheese_bread_craft.description": "制作奶酪面包", "advancements.braziliandelight.cheese_bread_craft.title": "哇塞！", - "advancements.braziliandelight.cheese_making.description": "在锅里把细盐、柠檬和重奶油混合在一起制作奶酪！", + "advancements.braziliandelight.cheese_making.description": "在锅里把盐、柠檬和重奶油混合在一起制作奶酪！", "advancements.braziliandelight.cheese_making.title": "手工奶酪", "advancements.braziliandelight.chimarrao_craft.description": "制作马黛茶", "advancements.braziliandelight.chimarrao_craft.title": "高乔烹茶", "advancements.braziliandelight.coconut_cream_craft.description": "制作椰子奶油球", "advancements.braziliandelight.coconut_cream_craft.title": "奶油味椰子", - "advancements.braziliandelight.coconut_drink_craft.description": "制作椰饮", - "advancements.braziliandelight.coconut_drink_craft.title": "桑巴啜饮", + "advancements.braziliandelight.coconut_drink_craft.description": "制作椰子汁", + "advancements.braziliandelight.coconut_drink_craft.title": "一日海滨", "advancements.braziliandelight.coconut_item.description": "获得椰子", "advancements.braziliandelight.coconut_item.title": "坚如磐石！", "advancements.braziliandelight.coffee_crop.description": "种植和收获咖啡浆果", "advancements.braziliandelight.coffee_crop.title": "冲泡觉醒！", "advancements.braziliandelight.collard_greens_crop.description": "种植和收获羽衣甘蓝", - "advancements.braziliandelight.collard_greens_crop.title": "绿色环保！", + "advancements.braziliandelight.collard_greens_crop.title": "绿色顺滑！", "advancements.braziliandelight.condensed_milk_craft.description": "制作炼乳", "advancements.braziliandelight.condensed_milk_craft.title": "甜蜜精华", "advancements.braziliandelight.corn_crop.description": "种植和收获玉米", @@ -37,16 +37,16 @@ "advancements.braziliandelight.coxinha_craft.title": "什么东西这么咸？", "advancements.braziliandelight.feijoada_craft.description": "制作腓秀雅杂", "advancements.braziliandelight.feijoada_craft.title": "腓秀雅杂盛宴", - "advancements.braziliandelight.fish_moqueca_craft.description": "制作巴西炖鱼", - "advancements.braziliandelight.fish_moqueca_craft.title": "大师级炖鱼", - "advancements.braziliandelight.fried_fish_with_acai_craft.description": "制作炸鱼配阿萨伊浆果", + "advancements.braziliandelight.fish_moqueca_craft.description": "制作莫奎卡炖鱼", + "advancements.braziliandelight.fish_moqueca_craft.title": "莫贵鱼此", + "advancements.braziliandelight.fried_fish_with_acai_craft.description": "制作炸鱼配巴西莓", "advancements.braziliandelight.fried_fish_with_acai_craft.title": "亚马孙盛宴", "advancements.braziliandelight.garlic_crop.description": "种植并收获大蒜", - "advancements.braziliandelight.garlic_crop.title": "欲言又止！", - "advancements.braziliandelight.garlic_repugnant.description": "用大蒜头制作厌恶之箭", + "advancements.braziliandelight.garlic_crop.title": "回敬一口！", + "advancements.braziliandelight.garlic_repugnant.description": "用大蒜制作厌恶之箭", "advancements.braziliandelight.garlic_repugnant.title": "口气真重！", - "advancements.braziliandelight.green_soup_craft.description": "制作青豆酱汤", - "advancements.braziliandelight.green_soup_craft.title": "青翠乐事", + "advancements.braziliandelight.green_soup_craft.description": "制作翡翠浓汤", + "advancements.braziliandelight.green_soup_craft.title": "健康美味！", "advancements.braziliandelight.guarana_crop.description": "种植和收获瓜拉纳", "advancements.braziliandelight.guarana_crop.title": "提神醒脑！", "advancements.braziliandelight.guarana_drink_craft.description": "制作瓜拉纳汽水", @@ -57,32 +57,32 @@ "advancements.braziliandelight.lemon_item.title": "如果生活给你柠檬……", "advancements.braziliandelight.milk_pot.description": "将奶桶放入厨锅，现在试着搅拌它！", "advancements.braziliandelight.milk_pot.title": "乳白银河", - "advancements.braziliandelight.pudding_craft.description": "制作甜布丁", + "advancements.braziliandelight.pudding_craft.description": "制作布丁", "advancements.braziliandelight.pudding_craft.title": "节庆甜品", "advancements.braziliandelight.root.description": "欢迎来到巴西乐事！", "advancements.braziliandelight.root.title": "巴西乐事", - "advancements.braziliandelight.salt_bucket_craft.description": "通过蒸发水获取细盐桶", + "advancements.braziliandelight.salt_bucket_craft.description": "通过蒸发水获取盐桶", "advancements.braziliandelight.salt_bucket_craft.title": "咸味十足的储备", "advancements.braziliandelight.tropical_saplings.description": "获得巴西乐事的任意一种树苗", - "advancements.braziliandelight.tropical_saplings.title": "来自热带的树苗", + "advancements.braziliandelight.tropical_saplings.title": "热带树苗", "advancements.braziliandelight.tropical_seeds.description": "于巴西乐事中获取所有种子", - "advancements.braziliandelight.tropical_seeds.title": "来自热带的种子", + "advancements.braziliandelight.tropical_seeds.title": "热带种子", "advancements.braziliandelight.white_kernels_crop.description": "种植和收获白玉米粒", - "advancements.braziliandelight.white_kernels_crop.title": "白色金粒", + "advancements.braziliandelight.white_kernels_crop.title": "白色黄金", "advancements.braziliandelight.yerba_mate_crop.description": "获得马黛茶叶", "advancements.braziliandelight.yerba_mate_crop.title": "马黛大丰收", - "block.braziliandelight.acai_berries": "阿萨伊棕榈嫩芽", - "block.braziliandelight.acai_berries_crate": "箱装阿萨伊浆果", - "block.braziliandelight.acai_branch": "阿萨伊棕榈树枝", - "block.braziliandelight.acai_palm_leaves": "阿萨伊棕榈树叶", - "block.braziliandelight.acai_palm_sapling": "阿萨伊棕榈树苗", + "block.braziliandelight.acai_berries": "巴西莓嫩芽", + "block.braziliandelight.acai_berries_crate": "箱装巴西莓", + "block.braziliandelight.acai_branch": "巴西莓嫩枝", + "block.braziliandelight.acai_palm_leaves": "巴西莓树树叶", + "block.braziliandelight.acai_palm_sapling": "巴西莓树树苗", "block.braziliandelight.bean_pod_crate": "箱装豆荚", "block.braziliandelight.bean_vine": "豆蔓", - "block.braziliandelight.black_beans": "发芽的黑豆植株", + "block.braziliandelight.black_beans": "黑豆植株", "block.braziliandelight.black_beans_bag": "袋装黑豆", - "block.braziliandelight.budding_coconut_palm_leaves": "发芽的椰子棕榈树叶", + "block.braziliandelight.budding_coconut_palm_leaves": "发芽的椰树树叶", "block.braziliandelight.budding_lemon_leaves": "发芽的柠檬树叶", - "block.braziliandelight.carioca_beans": "发芽的斑豆植株", + "block.braziliandelight.carioca_beans": "斑豆植株", "block.braziliandelight.carioca_beans_bag": "袋装斑豆", "block.braziliandelight.carrot_cake": "胡萝卜蛋糕", "block.braziliandelight.carrot_cake_with__candle": "插上蜡烛的胡萝卜蛋糕", @@ -121,7 +121,7 @@ "block.braziliandelight.carrot_cake_with_white_candle": "插上白色蜡烛的胡萝卜蛋糕", "block.braziliandelight.carrot_cake_with_yellow_candle": "插上黄色蜡烛的胡萝卜蛋糕", "block.braziliandelight.cassava_crate": "箱装木薯", - "block.braziliandelight.cassava_root": "发芽的木薯块根", + "block.braziliandelight.cassava_root": "木薯植株", "block.braziliandelight.chicken_pot_pie": "鸡肉派", "block.braziliandelight.coconut": "椰子", "block.braziliandelight.coconut_crate": "箱装椰子", @@ -129,29 +129,29 @@ "block.braziliandelight.coconut_palm_sapling": "椰子棕榈树苗", "block.braziliandelight.coffee_beans_bag": "袋装咖啡豆", "block.braziliandelight.coffee_berries_crate": "箱装咖啡浆果", - "block.braziliandelight.coffee_seeds": "发芽的咖啡作物", + "block.braziliandelight.coffee_seeds": "咖啡作物", "block.braziliandelight.collard_greens_crate": "箱装羽衣甘蓝", "block.braziliandelight.collard_greens_seeds": "羽衣甘蓝作物", "block.braziliandelight.corn_crate": "箱装玉米", "block.braziliandelight.falling_coconut": "下落的椰子", "block.braziliandelight.feijoada_pot": "锅装腓秀雅杂", - "block.braziliandelight.fish_moqueca_pot": "锅装巴西炖鱼", - "block.braziliandelight.garlic_bulb_crate": "箱装大蒜头", + "block.braziliandelight.fish_moqueca_pot": "锅装莫奎卡炖鱼", + "block.braziliandelight.garlic_bulb_crate": "箱装大蒜", "block.braziliandelight.garlic_clove": "大蒜作物", "block.braziliandelight.green_coconut": "椰青", "block.braziliandelight.green_coconut_crate": "箱装椰青", - "block.braziliandelight.green_soup_pot": "锅装青豆酱汤", + "block.braziliandelight.green_soup_pot": "锅装翡翠浓汤", "block.braziliandelight.guarana_fruit_crate": "箱装瓜拉纳果", - "block.braziliandelight.guarana_seeds": "发芽的瓜拉纳植株", + "block.braziliandelight.guarana_seeds": "瓜拉纳植株", "block.braziliandelight.heavy_cream_pot": "锅装重奶油", - "block.braziliandelight.kernels": "发芽的玉米植株", + "block.braziliandelight.kernels": "玉米植株", "block.braziliandelight.lemon_crate": "箱装柠檬", "block.braziliandelight.lemon_leaves": "柠檬树叶", "block.braziliandelight.lemon_sapling": "柠檬树苗", "block.braziliandelight.milk_pot": "锅装奶", "block.braziliandelight.minas_cheese": "米纳斯奶酪", "block.braziliandelight.minas_cheese_pot": "锅装米纳斯奶酪", - "block.braziliandelight.placeable_food.use_container": "你需要%s来食用.", + "block.braziliandelight.placeable_food.use_container": "你需要%s来食用。", "block.braziliandelight.potted_acai_palm_sapling": "阿萨伊棕榈树苗盆栽", "block.braziliandelight.potted_coconut_palm_sapling": "椰子棕榈树苗盆栽", "block.braziliandelight.potted_lemon_sapling": "柠檬树苗盆栽", @@ -165,7 +165,7 @@ "block.braziliandelight.tall_corn": "高大玉米植株", "block.braziliandelight.tall_guarana": "高大瓜拉纳植株", "block.braziliandelight.tall_sparse_dry_grass": "高大稀疏干草丛", - "block.braziliandelight.white_kernels": "发芽的玉米植株", + "block.braziliandelight.white_kernels": "玉米植株", "block.braziliandelight.wild_beans": "野生豆子", "block.braziliandelight.wild_cassava": "野生木薯", "block.braziliandelight.wild_coffee_bush": "野生咖啡灌木", @@ -176,14 +176,14 @@ "block.braziliandelight.yerba_mate_bush": "马黛树丛", "effect.braziliandelight.repugnant": "厌恶", "farmersdelight.tooltip.coconut_milk": "清除1种效果", - "item.braziliandelight.acai_berries": "阿萨伊浆果", - "item.braziliandelight.acai_cream": "阿萨伊浆果奶油球", - "item.braziliandelight.acai_tea_with_guarana": "阿萨伊浆果瓜拉纳茶", + "item.braziliandelight.acai_berries": "巴西莓", + "item.braziliandelight.acai_cream": "巴西莓奶油球", + "item.braziliandelight.acai_tea_with_guarana": "巴西莓瓜拉纳茶", "item.braziliandelight.angu": "玉米糊", "item.braziliandelight.bean_pod": "豆荚", "item.braziliandelight.black_beans": "黑豆", "item.braziliandelight.brazil_flag": "巴西国旗", - "item.braziliandelight.brazilian_dinner": "巴西式正餐", + "item.braziliandelight.brazilian_dinner": "巴西式晚餐", "item.braziliandelight.brigadeiro_cream": "巴西巧克力球", "item.braziliandelight.broa": "布罗阿", "item.braziliandelight.butter": "黄油", @@ -191,7 +191,7 @@ "item.braziliandelight.carioca_beans": "斑豆", "item.braziliandelight.carrot_cake_slice": "胡萝卜蛋糕切片", "item.braziliandelight.carrot_cake_with_chocolate_slice": "巧克力胡萝卜蛋糕切片", - "item.braziliandelight.cassava_flour": "木薯淀粉", + "item.braziliandelight.cassava_flour": "木薯粉", "item.braziliandelight.cassava_fritters": "炸木薯酪饼", "item.braziliandelight.cassava_root": "木薯根茎", "item.braziliandelight.cheese_bread": "奶酪面包", @@ -211,19 +211,19 @@ "item.braziliandelight.collard_greens_seeds": "羽衣甘蓝种子", "item.braziliandelight.collard_lemonade": "羽衣甘蓝柠檬水", "item.braziliandelight.condensed_milk": "炼乳", - "item.braziliandelight.cooked_black_beans": "熟黑豆饭", - "item.braziliandelight.cooked_carioca_beans": "熟斑豆饭", + "item.braziliandelight.cooked_black_beans": "煮黑豆", + "item.braziliandelight.cooked_carioca_beans": "煮斑豆", "item.braziliandelight.cooked_corn": "烤玉米", - "item.braziliandelight.cooked_shrimp": "熟褐虾", + "item.braziliandelight.cooked_shrimp": "熟虾", "item.braziliandelight.corn": "玉米", - "item.braziliandelight.corn_flour": "玉米淀粉", + "item.braziliandelight.corn_flour": "玉米粉", "item.braziliandelight.couscous": "古斯米", "item.braziliandelight.coxinha": "炸鸡肉包", "item.braziliandelight.dried_yerba_mate": "干燥的马黛茶叶", "item.braziliandelight.fried_cassava_with_butter": "黄油炸木薯粉", - "item.braziliandelight.fried_fish_with_acai": "炸鱼配阿萨伊浆果", + "item.braziliandelight.fried_fish_with_acai": "炸鱼配巴西莓", "item.braziliandelight.garapa": "格拉帕酒", - "item.braziliandelight.garlic_bulb": "大蒜头", + "item.braziliandelight.garlic_bulb": "大蒜", "item.braziliandelight.garlic_clove": "大蒜瓣", "item.braziliandelight.grilled_cheese_on_a_stick": "香烤米纳斯奶酪棒", "item.braziliandelight.guarana_fruit": "瓜拉纳果", @@ -239,19 +239,19 @@ "item.braziliandelight.minas_cheese_on_a_stick": "米纳斯奶酪棒", "item.braziliandelight.minas_cheese_slice": "米纳斯奶酪切块", "item.braziliandelight.plate_of_feijoada": "盘装腓秀雅杂", - "item.braziliandelight.plate_of_fish_moqueca": "盘装巴西炖鱼", - "item.braziliandelight.plate_of_green_soup": "盘装青豆酱汤", - "item.braziliandelight.plate_of_stroganoff": "盘装奶油炖肉", - "item.braziliandelight.pudding_slice": "甜布丁切块", + "item.braziliandelight.plate_of_fish_moqueca": "盘装莫奎卡炖鱼", + "item.braziliandelight.plate_of_green_soup": "盘装翡翠浓汤", + "item.braziliandelight.plate_of_stroganoff": "盘装斯特罗加诺夫炖肉", + "item.braziliandelight.pudding_slice": "布丁切块", "item.braziliandelight.raw_cassava_fritters": "生木薯酪饼", "item.braziliandelight.raw_coxinha": "生炸鸡肉包", "item.braziliandelight.repugnant_arrow": "厌恶之箭", - "item.braziliandelight.roasted_garlic": "烤大蒜头", + "item.braziliandelight.roasted_garlic": "烤大蒜", "item.braziliandelight.salpicao": "巴西鸡肉沙拉", - "item.braziliandelight.salt": "细盐", - "item.braziliandelight.salt_bucket": "细盐桶", - "item.braziliandelight.shrimp": "褐虾", - "item.braziliandelight.sweet_love_apple": "蜜恋糖苹果", + "item.braziliandelight.salt": "盐", + "item.braziliandelight.salt_bucket": "盐桶", + "item.braziliandelight.shrimp": "虾", + "item.braziliandelight.sweet_love_apple": "苹果糖", "item.braziliandelight.tropeiro_beans": "驮夫斑豆炖", "item.braziliandelight.tucupi": "发酵木薯汁", "item.braziliandelight.white_kernels": "白玉米粒", From abab916afc9f611b7dc36059fd592f7d10b89a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=BD=E9=9B=AA=E9=B8=A6=E6=9D=80?= <38830216+luoxueyasha@users.noreply.github.com> Date: Sat, 7 Jun 2025 15:52:10 +0800 Subject: [PATCH 3/7] update en_us.json --- .../braziliandelight/lang/en_us.json | 59 +++++++------------ .../braziliandelight/lang/zh_cn.json | 12 +++- 2 files changed, 31 insertions(+), 40 deletions(-) diff --git a/projects/1.20/assets/braziliandelight/braziliandelight/lang/en_us.json b/projects/1.20/assets/braziliandelight/braziliandelight/lang/en_us.json index fe249d3edc1c..fbb4627fcd84 100644 --- a/projects/1.20/assets/braziliandelight/braziliandelight/lang/en_us.json +++ b/projects/1.20/assets/braziliandelight/braziliandelight/lang/en_us.json @@ -71,18 +71,17 @@ "advancements.braziliandelight.white_kernels_crop.title": "White Gold", "advancements.braziliandelight.yerba_mate_crop.description": "Obtain Yerba Mate", "advancements.braziliandelight.yerba_mate_crop.title": "Mate Harvest", - "block.braziliandelight.acai_berries": "Budding Acai Branch", + "block.braziliandelight.acai_berries": "Budding Acai Crop", "block.braziliandelight.acai_berries_crate": "Acai Berries Crate", "block.braziliandelight.acai_branch": "Acai Branch", "block.braziliandelight.acai_palm_leaves": "Acai Palm Leaves", "block.braziliandelight.acai_palm_sapling": "Acai Palm Sapling", "block.braziliandelight.bean_pod_crate": "Bean Pod Crate", - "block.braziliandelight.bean_vine": "Bean Vine", - "block.braziliandelight.black_beans": "Budding Beans Crop", + "block.braziliandelight.black_beans": "Black Beans", "block.braziliandelight.black_beans_bag": "Black Beans Bag", "block.braziliandelight.budding_coconut_palm_leaves": "Budding Coconut Palm Leaves", "block.braziliandelight.budding_lemon_leaves": "Budding Lemon Leaves", - "block.braziliandelight.carioca_beans": "Budding Beans Crop", + "block.braziliandelight.carioca_beans": "Carioca Beans", "block.braziliandelight.carioca_beans_bag": "Carioca Beans Bag", "block.braziliandelight.carrot_cake": "Carrot Cake", "block.braziliandelight.carrot_cake_with__candle": "Carrot Cake with Candle", @@ -121,7 +120,8 @@ "block.braziliandelight.carrot_cake_with_white_candle": "Carrot Cake with White Candle", "block.braziliandelight.carrot_cake_with_yellow_candle": "Carrot Cake with Yellow Candle", "block.braziliandelight.cassava_crate": "Cassava Crate", - "block.braziliandelight.cassava_root": "Budding Cassava Crop", + "block.braziliandelight.cassava_crop": "Cassava Crop", + "block.braziliandelight.cassava_root": "Cassava Crop", "block.braziliandelight.chicken_pot_pie": "Chicken Pot Pie", "block.braziliandelight.coconut": "Coconut", "block.braziliandelight.coconut_crate": "Coconut Crate", @@ -129,22 +129,25 @@ "block.braziliandelight.coconut_palm_sapling": "Coconut Palm Sapling", "block.braziliandelight.coffee_beans_bag": "Coffee Beans Bag", "block.braziliandelight.coffee_berries_crate": "Coffee Berries Crate", - "block.braziliandelight.coffee_seeds": "Budding Coffee Crop", + "block.braziliandelight.coffee_crop": "Coffee Crop", + "block.braziliandelight.coffee_seeds": "Coffee Crop", "block.braziliandelight.collard_greens_crate": "Collard Greens Crate", - "block.braziliandelight.collard_greens_seeds": "Collard Greens Crops", + "block.braziliandelight.collard_greens_seeds": "Collard Greens Seeds", "block.braziliandelight.corn_crate": "Corn Crate", + "block.braziliandelight.corn_crop": "Corn Crop", "block.braziliandelight.falling_coconut": "Falling Coconut", "block.braziliandelight.feijoada_pot": "Feijoada Pot", "block.braziliandelight.fish_moqueca_pot": "Fish Moqueca Pot", "block.braziliandelight.garlic_bulb_crate": "Garlic Bulb Crate", - "block.braziliandelight.garlic_clove": "Garlic Crops", + "block.braziliandelight.garlic_clove": "Garlic Clove", "block.braziliandelight.green_coconut": "Green Coconut", "block.braziliandelight.green_coconut_crate": "Green Coconut Crate", "block.braziliandelight.green_soup_pot": "Green Soup Pot", + "block.braziliandelight.guarana_crop": "Guarana Crop", "block.braziliandelight.guarana_fruit_crate": "Guarana Fruit Crate", - "block.braziliandelight.guarana_seeds": "Budding Guarana Crop", + "block.braziliandelight.guarana_seeds": "Guarana Crop", "block.braziliandelight.heavy_cream_pot": "Heavy Cream Pot", - "block.braziliandelight.kernels": "Budding Corn Crop", + "block.braziliandelight.kernels": "Corn Crop", "block.braziliandelight.lemon_crate": "Lemon Crate", "block.braziliandelight.lemon_leaves": "Lemon Leaves", "block.braziliandelight.lemon_sapling": "Lemon Sapling", @@ -157,15 +160,9 @@ "block.braziliandelight.potted_lemon_sapling": "Potted Lemon Sapling", "block.braziliandelight.potted_yerba_mate_bush": "Potted Yerba Mate Bush", "block.braziliandelight.pudding": "Pudding", - "block.braziliandelight.sparse_dry_grass": "Sparse Dry Grass", "block.braziliandelight.stroganoff_pot": "Stroganoff Pot", "block.braziliandelight.sweet_love_apple_tray": "Sweet Love Apple Tray", - "block.braziliandelight.tall_cassava": "Tall Cassava", - "block.braziliandelight.tall_coffee": "Tall Coffee", - "block.braziliandelight.tall_corn": "Tall Corn", - "block.braziliandelight.tall_guarana": "Tall Guarana", - "block.braziliandelight.tall_sparse_dry_grass": "Tall Sparse Dry Grass", - "block.braziliandelight.white_kernels": "Budding Corn Crop", + "block.braziliandelight.white_kernels": "Corn Crop", "block.braziliandelight.wild_beans": "Wild Beans", "block.braziliandelight.wild_cassava": "Wild Cassava", "block.braziliandelight.wild_coffee_bush": "Wild Coffee Bush", @@ -174,21 +171,23 @@ "block.braziliandelight.wild_garlic": "Wild Garlic", "block.braziliandelight.wild_guarana": "Wild Guarana", "block.braziliandelight.yerba_mate_bush": "Yerba Mate Bush", + "braziliandelight.tooltip.coconut_milk": "Clears 1 Effect", "effect.braziliandelight.repugnant": "Repugnant", - "farmersdelight.tooltip.coconut_milk": "Clears 1 Effect", + "entity.braziliandelight.coconut": "Coconut", + "entity.braziliandelight.repugnant_arrow": "Repugnant Arrow", "item.braziliandelight.acai_berries": "Acai Berries", "item.braziliandelight.acai_cream": "Acai Cream", "item.braziliandelight.acai_tea_with_guarana": "Acai Tea with Guarana", "item.braziliandelight.angu": "Angu", "item.braziliandelight.bean_pod": "Bean Pod", - "item.braziliandelight.black_beans": "Black Beans", + "item.braziliandelight.black_beans": "Black Beans Crop", "item.braziliandelight.brazil_flag": "Brazil Flag", "item.braziliandelight.brazilian_dinner": "Brazilian Dinner", "item.braziliandelight.brigadeiro_cream": "Brigadeiro Cream", "item.braziliandelight.broa": "Broa", "item.braziliandelight.butter": "Butter", "item.braziliandelight.buttered_corn": "Buttered Corn", - "item.braziliandelight.carioca_beans": "Carioca Beans", + "item.braziliandelight.carioca_beans": "Carioca Beans Crop", "item.braziliandelight.carrot_cake_slice": "Carrot Cake Slice", "item.braziliandelight.carrot_cake_with_chocolate_slice": "Carrot Cake with Chocolate Slice", "item.braziliandelight.cassava_flour": "Cassava Flour", @@ -208,7 +207,7 @@ "item.braziliandelight.collard_greens": "Collard Greens", "item.braziliandelight.collard_greens_farofa": "Collard Greens Farofa", "item.braziliandelight.collard_greens_salad": "Collard Greens Salad", - "item.braziliandelight.collard_greens_seeds": "Collard Greens Seeds", + "item.braziliandelight.collard_greens_seeds": "Collard Greens Crop", "item.braziliandelight.collard_lemonade": "Collard Lemonade", "item.braziliandelight.condensed_milk": "Condensed Milk", "item.braziliandelight.cooked_black_beans": "Cooked Black Beans", @@ -224,7 +223,7 @@ "item.braziliandelight.fried_fish_with_acai": "Fried Fish with Acai", "item.braziliandelight.garapa": "Garapa", "item.braziliandelight.garlic_bulb": "Garlic Bulb", - "item.braziliandelight.garlic_clove": "Garlic Clove", + "item.braziliandelight.garlic_clove": "Garlic Crop", "item.braziliandelight.grilled_cheese_on_a_stick": "Grilled Cheese on a Stick", "item.braziliandelight.guarana_fruit": "Guarana Fruit", "item.braziliandelight.guarana_juice": "Guarana Juice", @@ -256,21 +255,7 @@ "item.braziliandelight.tucupi": "Tucupi", "item.braziliandelight.white_kernels": "White Kernels", "item.braziliandelight.yerba_mate_leaves": "Yerba Mate Leaves", - "item.minecraft.lingering_potion.effect.repugnant": "Lingering Potion of Repugnant", - "item.minecraft.lingering_potion.effect.strong_repugnant": "Lingering Potion of Repugnant II", - "item.minecraft.lingering_potion.effect.stronger_repugnant": "Lingering Potion of Repugnant III", - "item.minecraft.potion.effect.repugnant": "Potion of Repugnant", - "item.minecraft.potion.effect.strong_repugnant": "Potion of Repugnant II", - "item.minecraft.potion.effect.stronger_repugnant": "Potion of Repugnant III", - "item.minecraft.splash_potion.effect.repugnant": "Splash Potion of Repugnant", - "item.minecraft.splash_potion.effect.strong_repugnant": "Splash Potion of Repugnant II", - "item.minecraft.splash_potion.effect.stronger_repugnant": "Splash Potion of Repugnant III", - "item.minecraft.tipped_arrow.effect.repugnant": "Arrow of Repugnant", - "item.minecraft.tipped_arrow.effect.strong_repugnant": "Arrow of Repugnant II", - "item.minecraft.tipped_arrow.effect.stronger_repugnant": "Arrow of Repugnant III", - "itemGroup.braziliandelight.creative_tab": "Brazilian Delight", - "painting.braziliandelight.brazilian_miku.author": "Arbeet", - "painting.braziliandelight.brazilian_miku.title": "Brazilian Miku", + "itemGroup.braziliandelight.braziliandelight": "Brazilian Delight", "tooltip.deltaboxlib.braziliandelight.coffee_beans": "Work in progress", "tooltip.deltaboxlib.braziliandelight.coffee_berries": "Work in progress", "tooltip.deltaboxlib.braziliandelight.repugnant_arrow": "Nobody wants to be near this", diff --git a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json index 628a0357b76b..aa2cf3c0f849 100644 --- a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json +++ b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json @@ -121,6 +121,7 @@ "block.braziliandelight.carrot_cake_with_white_candle": "插上白色蜡烛的胡萝卜蛋糕", "block.braziliandelight.carrot_cake_with_yellow_candle": "插上黄色蜡烛的胡萝卜蛋糕", "block.braziliandelight.cassava_crate": "箱装木薯", + "block.braziliandelight.cassava_crop": "木薯植株", "block.braziliandelight.cassava_root": "木薯植株", "block.braziliandelight.chicken_pot_pie": "鸡肉派", "block.braziliandelight.coconut": "椰子", @@ -129,10 +130,12 @@ "block.braziliandelight.coconut_palm_sapling": "椰子棕榈树苗", "block.braziliandelight.coffee_beans_bag": "袋装咖啡豆", "block.braziliandelight.coffee_berries_crate": "箱装咖啡浆果", + "block.braziliandelight.coffee_crop": "咖啡作物", "block.braziliandelight.coffee_seeds": "咖啡作物", "block.braziliandelight.collard_greens_crate": "箱装羽衣甘蓝", "block.braziliandelight.collard_greens_seeds": "羽衣甘蓝作物", "block.braziliandelight.corn_crate": "箱装玉米", + "block.braziliandelight.corn_crop": "玉米植株", "block.braziliandelight.falling_coconut": "下落的椰子", "block.braziliandelight.feijoada_pot": "锅装腓秀雅杂", "block.braziliandelight.fish_moqueca_pot": "锅装莫奎卡炖鱼", @@ -141,6 +144,7 @@ "block.braziliandelight.green_coconut": "椰青", "block.braziliandelight.green_coconut_crate": "箱装椰青", "block.braziliandelight.green_soup_pot": "锅装翡翠浓汤", + "block.braziliandelight.guarana_crop": "瓜拉纳植株", "block.braziliandelight.guarana_fruit_crate": "箱装瓜拉纳果", "block.braziliandelight.guarana_seeds": "瓜拉纳植株", "block.braziliandelight.heavy_cream_pot": "锅装重奶油", @@ -159,7 +163,7 @@ "block.braziliandelight.pudding": "甜布丁", "block.braziliandelight.sparse_dry_grass": "稀疏干草丛", "block.braziliandelight.stroganoff_pot": "锅装奶油炖肉", - "block.braziliandelight.sweet_love_apple_tray": "盘装蜜恋糖苹果", + "block.braziliandelight.sweet_love_apple_tray": "盘装苹果糖", "block.braziliandelight.tall_cassava": "高大木薯植株", "block.braziliandelight.tall_coffee": "高大咖啡植株", "block.braziliandelight.tall_corn": "高大玉米植株", @@ -174,8 +178,10 @@ "block.braziliandelight.wild_garlic": "野生大蒜", "block.braziliandelight.wild_guarana": "野生瓜拉纳", "block.braziliandelight.yerba_mate_bush": "马黛树丛", - "effect.braziliandelight.repugnant": "厌恶", "farmersdelight.tooltip.coconut_milk": "清除1种效果", + "effect.braziliandelight.repugnant": "厌恶", + "entity.braziliandelight.coconut": "椰子", + "entity.braziliandelight.repugnant_arrow": "厌恶之箭", "item.braziliandelight.acai_berries": "巴西莓", "item.braziliandelight.acai_cream": "巴西莓奶油球", "item.braziliandelight.acai_tea_with_guarana": "巴西莓瓜拉纳茶", @@ -275,4 +281,4 @@ "tooltip.deltaboxlib.braziliandelight.coffee_berries": "Work in progress", "tooltip.deltaboxlib.braziliandelight.repugnant_arrow": "没人愿意接近这支箭", "tooltip.deltaboxlib.braziliandelight.white_kernels": "Work in progress" -} +} \ No newline at end of file From c4978e276bff485715eb6eb7266ffbc2579d2b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=BD=E9=9B=AA=E9=B8=A6=E6=9D=80?= <38830216+luoxueyasha@users.noreply.github.com> Date: Sat, 7 Jun 2025 15:54:15 +0800 Subject: [PATCH 4/7] fix --- .../assets/braziliandelight/braziliandelight/lang/zh_cn.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json index aa2cf3c0f849..cee7ea95bfae 100644 --- a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json +++ b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json @@ -179,6 +179,7 @@ "block.braziliandelight.wild_guarana": "野生瓜拉纳", "block.braziliandelight.yerba_mate_bush": "马黛树丛", "farmersdelight.tooltip.coconut_milk": "清除1种效果", + "braziliandelight.tooltip.coconut_milk": "清除1种效果", "effect.braziliandelight.repugnant": "厌恶", "entity.braziliandelight.coconut": "椰子", "entity.braziliandelight.repugnant_arrow": "厌恶之箭", @@ -275,6 +276,7 @@ "item.minecraft.tipped_arrow.effect.strong_repugnant": "厌恶之箭II", "item.minecraft.tipped_arrow.effect.stronger_repugnant": "厌恶之箭III", "itemGroup.braziliandelight.creative_tab": "巴西乐事", + "itemGroup.braziliandelight.braziliandelight": "巴西乐事", "painting.braziliandelight.brazilian_miku.author": "Arbeet", "painting.braziliandelight.brazilian_miku.title": "Brazilian Miku", "tooltip.deltaboxlib.braziliandelight.coffee_beans": "Work in progress", From c72f6a8fdbd31fffbab02387bb138a4fd9b3ba29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=BD=E9=9B=AA=E9=B8=A6=E6=9D=80?= <38830216+luoxueyasha@users.noreply.github.com> Date: Sat, 7 Jun 2025 15:55:07 +0800 Subject: [PATCH 5/7] remove deprecated lines --- .../braziliandelight/lang/zh_cn.json | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json index cee7ea95bfae..f29201d9b200 100644 --- a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json +++ b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json @@ -161,14 +161,8 @@ "block.braziliandelight.potted_lemon_sapling": "柠檬树苗盆栽", "block.braziliandelight.potted_yerba_mate_bush": "马黛树丛盆栽", "block.braziliandelight.pudding": "甜布丁", - "block.braziliandelight.sparse_dry_grass": "稀疏干草丛", "block.braziliandelight.stroganoff_pot": "锅装奶油炖肉", "block.braziliandelight.sweet_love_apple_tray": "盘装苹果糖", - "block.braziliandelight.tall_cassava": "高大木薯植株", - "block.braziliandelight.tall_coffee": "高大咖啡植株", - "block.braziliandelight.tall_corn": "高大玉米植株", - "block.braziliandelight.tall_guarana": "高大瓜拉纳植株", - "block.braziliandelight.tall_sparse_dry_grass": "高大稀疏干草丛", "block.braziliandelight.white_kernels": "玉米植株", "block.braziliandelight.wild_beans": "野生豆子", "block.braziliandelight.wild_cassava": "野生木薯", @@ -178,7 +172,6 @@ "block.braziliandelight.wild_garlic": "野生大蒜", "block.braziliandelight.wild_guarana": "野生瓜拉纳", "block.braziliandelight.yerba_mate_bush": "马黛树丛", - "farmersdelight.tooltip.coconut_milk": "清除1种效果", "braziliandelight.tooltip.coconut_milk": "清除1种效果", "effect.braziliandelight.repugnant": "厌恶", "entity.braziliandelight.coconut": "椰子", @@ -263,22 +256,7 @@ "item.braziliandelight.tucupi": "发酵木薯汁", "item.braziliandelight.white_kernels": "白玉米粒", "item.braziliandelight.yerba_mate_leaves": "马黛茶叶", - "item.minecraft.lingering_potion.effect.repugnant": "滞留型厌恶药水", - "item.minecraft.lingering_potion.effect.strong_repugnant": "滞留型厌恶药水II", - "item.minecraft.lingering_potion.effect.stronger_repugnant": "滞留型厌恶药水III", - "item.minecraft.potion.effect.repugnant": "厌恶药水", - "item.minecraft.potion.effect.strong_repugnant": "厌恶药水II", - "item.minecraft.potion.effect.stronger_repugnant": "厌恶药水III", - "item.minecraft.splash_potion.effect.repugnant": "喷溅型厌恶药水", - "item.minecraft.splash_potion.effect.strong_repugnant": "喷溅型厌恶药水II", - "item.minecraft.splash_potion.effect.stronger_repugnant": "喷溅型厌恶药水III", - "item.minecraft.tipped_arrow.effect.repugnant": "厌恶之箭", - "item.minecraft.tipped_arrow.effect.strong_repugnant": "厌恶之箭II", - "item.minecraft.tipped_arrow.effect.stronger_repugnant": "厌恶之箭III", - "itemGroup.braziliandelight.creative_tab": "巴西乐事", "itemGroup.braziliandelight.braziliandelight": "巴西乐事", - "painting.braziliandelight.brazilian_miku.author": "Arbeet", - "painting.braziliandelight.brazilian_miku.title": "Brazilian Miku", "tooltip.deltaboxlib.braziliandelight.coffee_beans": "Work in progress", "tooltip.deltaboxlib.braziliandelight.coffee_berries": "Work in progress", "tooltip.deltaboxlib.braziliandelight.repugnant_arrow": "没人愿意接近这支箭", From 0f14a23eb5b4e4d49c6667e5b8ea3c972a01b53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=BD=E9=9B=AA=E9=B8=A6=E6=9D=80?= <38830216+luoxueyasha@users.noreply.github.com> Date: Sat, 7 Jun 2025 15:56:12 +0800 Subject: [PATCH 6/7] fix --- .../assets/braziliandelight/braziliandelight/lang/zh_cn.json | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json index f29201d9b200..8d7ee4b7688a 100644 --- a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json +++ b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json @@ -77,7 +77,6 @@ "block.braziliandelight.acai_palm_leaves": "巴西莓树树叶", "block.braziliandelight.acai_palm_sapling": "巴西莓树树苗", "block.braziliandelight.bean_pod_crate": "箱装豆荚", - "block.braziliandelight.bean_vine": "豆蔓", "block.braziliandelight.black_beans": "黑豆植株", "block.braziliandelight.black_beans_bag": "袋装黑豆", "block.braziliandelight.budding_coconut_palm_leaves": "发芽的椰树树叶", From 7ca7a11199b2cd3198940025b4df9ae042b74b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=BD=E9=9B=AA=E9=B8=A6=E6=9D=80?= <38830216+luoxueyasha@users.noreply.github.com> Date: Sat, 7 Jun 2025 16:36:46 +0800 Subject: [PATCH 7/7] fix of acai --- .../braziliandelight/braziliandelight/lang/zh_cn.json | 8 ++++---- .../1.20/assets/every-compat/everycomp/lang/zh_cn.json | 2 +- .../productivetrees/productivetrees/lang/zh_cn-base.json | 6 +++--- .../productivetrees/lang/zh_cn-composition.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json index 8d7ee4b7688a..3f851d12ce5a 100644 --- a/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json +++ b/projects/1.20/assets/braziliandelight/braziliandelight/lang/zh_cn.json @@ -125,8 +125,8 @@ "block.braziliandelight.chicken_pot_pie": "鸡肉派", "block.braziliandelight.coconut": "椰子", "block.braziliandelight.coconut_crate": "箱装椰子", - "block.braziliandelight.coconut_palm_leaves": "椰子棕榈树叶", - "block.braziliandelight.coconut_palm_sapling": "椰子棕榈树苗", + "block.braziliandelight.coconut_palm_leaves": "椰树树叶", + "block.braziliandelight.coconut_palm_sapling": "椰树树苗", "block.braziliandelight.coffee_beans_bag": "袋装咖啡豆", "block.braziliandelight.coffee_berries_crate": "箱装咖啡浆果", "block.braziliandelight.coffee_crop": "咖啡作物", @@ -155,8 +155,8 @@ "block.braziliandelight.minas_cheese": "米纳斯奶酪", "block.braziliandelight.minas_cheese_pot": "锅装米纳斯奶酪", "block.braziliandelight.placeable_food.use_container": "你需要%s来食用。", - "block.braziliandelight.potted_acai_palm_sapling": "阿萨伊棕榈树苗盆栽", - "block.braziliandelight.potted_coconut_palm_sapling": "椰子棕榈树苗盆栽", + "block.braziliandelight.potted_acai_palm_sapling": "巴西莓树树苗盆栽", + "block.braziliandelight.potted_coconut_palm_sapling": "椰树树苗盆栽", "block.braziliandelight.potted_lemon_sapling": "柠檬树苗盆栽", "block.braziliandelight.potted_yerba_mate_bush": "马黛树丛盆栽", "block.braziliandelight.pudding": "甜布丁", diff --git a/projects/1.20/assets/every-compat/everycomp/lang/zh_cn.json b/projects/1.20/assets/every-compat/everycomp/lang/zh_cn.json index 319ad176e103..e40ddc14ccf9 100644 --- a/projects/1.20/assets/every-compat/everycomp/lang/zh_cn.json +++ b/projects/1.20/assets/every-compat/everycomp/lang/zh_cn.json @@ -1841,7 +1841,7 @@ "wood_type.productivetrees.almond": "扁桃木", "wood_type.productivetrees.apricot": "杏木", "wood_type.productivetrees.aquilaria": "奇南沉香木", - "wood_type.productivetrees.asai_palm": "阿萨伊浆果木", + "wood_type.productivetrees.asai_palm": "巴西莓木", "wood_type.productivetrees.ash": "欧梣木", "wood_type.productivetrees.aspen": "山杨木", "wood_type.productivetrees.avocado": "鳄梨木", diff --git a/projects/1.20/assets/productivetrees/productivetrees/lang/zh_cn-base.json b/projects/1.20/assets/productivetrees/productivetrees/lang/zh_cn-base.json index 86122cf22f20..e6ec535202ba 100644 --- a/projects/1.20/assets/productivetrees/productivetrees/lang/zh_cn-base.json +++ b/projects/1.20/assets/productivetrees/productivetrees/lang/zh_cn-base.json @@ -171,7 +171,7 @@ "block.productivetrees.star_fruit_crate": "箱装阳桃", "block.productivetrees.almond_crate": "箱装扁桃", "block.productivetrees.apricot_crate": "箱装杏子", - "block.productivetrees.asai_berry_crate": "箱装阿萨伊浆果", + "block.productivetrees.asai_berry_crate": "箱装巴西莓", "block.productivetrees.avocado_crate": "箱装鳄梨", "block.productivetrees.banana_crate": "箱装香蕉", "block.productivetrees.beechnut_crate": "箱装山毛榉坚果", @@ -259,7 +259,7 @@ "block.productivetrees.allspice_fruit": "结果的多香果树叶", "block.productivetrees.almond_fruit": "结果的扁桃树叶", "block.productivetrees.apricot_fruit": "结果的杏树树叶", - "block.productivetrees.asai_palm_fruit": "结果的阿萨伊浆果树叶", + "block.productivetrees.asai_palm_fruit": "结果的巴西莓树树叶", "block.productivetrees.avocado_fruit": "结果的鳄梨树叶", "block.productivetrees.banana_fruit": "结果的香蕉树叶", "block.productivetrees.beech_fruit": "结果的山毛榉树叶", @@ -354,7 +354,7 @@ "item.productivetrees.allspice": "多香果", "item.productivetrees.almond": "扁桃", "item.productivetrees.apricot": "杏子", - "item.productivetrees.asai_berry": "阿萨伊浆果", + "item.productivetrees.asai_berry": "巴西莓", "item.productivetrees.avocado": "鳄梨", "item.productivetrees.banana": "香蕉", "item.productivetrees.baobab_fruit": "猴面包果", diff --git a/projects/1.20/assets/productivetrees/productivetrees/lang/zh_cn-composition.json b/projects/1.20/assets/productivetrees/productivetrees/lang/zh_cn-composition.json index 93fc12f80ee8..c3867df6a869 100644 --- a/projects/1.20/assets/productivetrees/productivetrees/lang/zh_cn-composition.json +++ b/projects/1.20/assets/productivetrees/productivetrees/lang/zh_cn-composition.json @@ -31,7 +31,7 @@ "allspice": "多香果", "almond": "扁桃", "aquilaria": "奇南沉香", - "asai_palm": "阿萨伊浆果", + "asai_palm": "巴西莓", "ash": "欧梣", "aspen": "山杨", "avocado": "鳄梨",