From b1a26a30fe87879944e9d19c96b826b02bc4d26d Mon Sep 17 00:00:00 2001 From: zerodegress Date: Wed, 20 Jul 2022 07:37:23 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-cafe/createcafe/lang/en_us.json | 53 ++++++ .../create-cafe/createcafe/lang/zh_cn.json | 171 +++++++++++++++++- 2 files changed, 223 insertions(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/en_us.json b/projects/1.18/assets/create-cafe/createcafe/lang/en_us.json index 2252a74dc5da..132f1bb1c677 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/en_us.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/en_us.json @@ -1,12 +1,61 @@ { "block.createcafe.melted_sugar": "Melted Sugar", "block.createcafe.filling": "Filling", + "tooltip.createcafe.res": "Resistance (0:12)", "tooltip.createcafe.regen": "Regeneration (0:13)", "tooltip.createcafe.strength": "Strength (0:10)", "tooltip.createcafe.speed": "Speed (0:13)", "tooltip.createcafe.super": "Resistance (0:13), Speed (0:13), Strength (0:13), Regeneration (0:13)", + "itemGroup.createCafeTab": "Create Cafe", + + "item.createcafe.aloe_tea_bucket": "Aloe Tea Bucket", + "item.createcafe.apple_tea_bucket": "Apple Tea Bucket", + "item.createcafe.apricot_tea_bucket": "Apricot Tea Bucket", + "item.createcafe.avocado_tea_bucket": "Avocado Tea Bucket", + "item.createcafe.banana_tea_bucket": "Banana Tea Bucket", + "item.createcafe.blackberry_tea_bucket": "Blackberry Tea Bucket", + "item.createcafe.blood_tea_bucket": "Blood Tea Bucket", + "item.createcafe.blueberry_tea_bucket": "Blueberry Tea Bucket", + "item.createcafe.cherry_tea_bucket": "Cherry Tea Bucket", + "item.createcafe.coconut_tea_bucket": "Coconut Tea Bucket", + "item.createcafe.dragonfruit_tea_bucket": "Dragonfruit Tea Bucket", + "item.createcafe.durian_tea_bucket": "Durian Tea Bucket", + "item.createcafe.fig_tea_bucket": "Fig Tea Bucket", + "item.createcafe.filling_bucket": "Filling Bucket", + "item.createcafe.gooseberry_tea_bucket": "Gooseberry Tea Bucket", + "item.createcafe.grape_tea_bucket": "Grape Tea Bucket", + "item.createcafe.grapefruit_tea_bucket": "Grapefruit Tea Bucket", + "item.createcafe.guava_tea_bucket": "Guava Tea Bucket", + "item.createcafe.jackfruit_tea_bucket": "Jackfruit Tea Bucket", + "item.createcafe.kiwi_tea_bucket": "Kiwi Tea Bucket", + "item.createcafe.lavender_tea_bucket": "Lavender Tea Bucket", + "item.createcafe.lemon_tea_bucket": "Lemon Tea Bucket", + "item.createcafe.lime_tea_bucket": "Lime Tea Bucket", + "item.createcafe.lychee_tea_bucket": "Lychee Tea Bucket", + "item.createcafe.mana_tea_bucket": "Mana Tea Bucket", + "item.createcafe.mango_tea_bucket": "Mango Tea Bucket", + "item.createcafe.melted_sugar_bucket": "Melted Sugar Bucket", + "item.createcafe.orange_tea_bucket": "Orange Tea Bucket", + "item.createcafe.oreo_tea_bucket": "Oreo Tea Bucket", + "item.createcafe.papaya_tea_bucket": "Papaya Tea Bucket", + "item.createcafe.passionfruit_tea_bucket": "Passionfruit Tea Bucket", + "item.createcafe.peach_tea_bucket": "Peach Tea Bucket", + "item.createcafe.persimmon_tea_bucket": "Persimmon Tea Bucket", + "item.createcafe.pineapple_tea_bucket": "Pineapple Tea Bucket", + "item.createcafe.plum_tea_bucket": "Plum Tea Bucket", + "item.createcafe.pomegranate_tea_bucket": "Pomegranate Tea Bucket", + "item.createcafe.pumpkin_tea_bucket": "Pumpkin Tea Bucket", + "item.createcafe.raspberry_tea_bucket": "Raspberry Tea Bucket", + "item.createcafe.starfruit_tea_bucket": "Starfruit Tea Bucket", + "item.createcafe.strawberry_tea_bucket": "Strawberry Tea Bucket", + "item.createcafe.sweetberry_tea_bucket": "Sweetberry Tea Bucket", + "item.createcafe.tamarind_tea_bucket": "Tamarind Tea Bucket", + "item.createcafe.vanilla_tea_bucket": "Vanilla Tea Bucket", + "item.createcafe.watermelon_tea_bucket": "Watermelon Tea Bucket", + "item.createcafe.yucca_tea_bucket": "Yucca Tea Bucket", + "item.createcafe.mana_berries": "Mana Berries", "item.createcafe.oreo": "Oreo", "item.createcafe.oreo_dough": "Oreo Dough", @@ -15,18 +64,22 @@ "item.createcafe.oreo_half_raw": "Oreo Half Raw", "item.createcafe.oreo_crushed": "Crushed Oreo", "item.createcafe.blood_orange": "Blood Orange", + "item.createcafe.empty_boba_cup": "Empty Boba Cup", "item.createcafe.boba_cup": "Boba Cup", "item.createcafe.boba": "Boba", "item.createcafe.raw_boba": "Raw Boba", "item.createcafe.tapioca_flour": "Tapioca Flour", + "block.createcafe.cassava_crop": "Cassava Seeds", "item.createcafe.cassava_root": "Cassava Root", "item.createcafe.cassava_seeds": "Cassava Seeds", + "block.createcafe.coffee_crop": "Coffee Beans", "item.createcafe.roasted_coffee": "Roasted Coffee Beans", "item.createcafe.coffee_fruit": "Coffee Fruit", "item.createcafe.coffee_beans": "Coffee Beans", + "item.createcafe.mango_milk_tea": "Mango Milk Tea", "block.createcafe.mango_tea": "Mango Milk Tea", "item.createcafe.lime_milk_tea": "Lime Milk Tea", diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 9e26dfeeb6e6..628516375955 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -1 +1,170 @@ -{} \ No newline at end of file +{ + "block.createcafe.melted_sugar": "融化的糖", + "block.createcafe.filling": "填充", + + "tooltip.createcafe.res": "防火 (0:12)", + "tooltip.createcafe.regen": "生命恢复 (0:13)", + "tooltip.createcafe.strength": "力量 (0:10)", + "tooltip.createcafe.speed": "速度 (0:13)", + "tooltip.createcafe.super": "防火 (0:13), 速度 (0:13), 力量 (0:13), 生命恢复 (0:13)", + + "itemGroup.createCafeTab": "机械动力：奶茶店", + + "item.createcafe.mana_berries": "魔力浆果", + "item.createcafe.oreo": "奥利奥", + "item.createcafe.oreo_dough": "奥利奥面团", + "item.createcafe.oreo_half": "半个奥利奥", + "item.createcafe.oreo_incomplete": "未加工的奥利奥", + "item.createcafe.oreo_half_raw": "半个奥利奥生面团", + "item.createcafe.oreo_crushed": "压碎的奥利奥", + "item.createcafe.blood_orange": "血橙", + "item.createcafe.coffee_beans": "咖啡豆", + + "item.createcafe.empty_boba_cup": "空的奶茶杯", + "item.createcafe.boba_cup": "有珍珠的奶茶杯", + "item.createcafe.boba": "波霸珍珠", + "item.createcafe.raw_boba": "未加工的波霸珍珠", + "item.createcafe.tapioca_flour": "木薯粉末", + + + "item.createcafe.cassava_seeds": "木薯种子", + "block.createcafe.cassava_crop": "木薯", + "item.createcafe.cassava_root": "木薯根", + + "block.createcafe.coffee_crop": "咖啡豆", + "item.createcafe.roasted_coffee": "烤咖啡豆", + "item.createcafe.coffee_fruit": "咖啡果", + + "item.createcafe.mango_milk_tea": "芒果味奶茶", + "block.createcafe.mango_tea": "芒果味奶茶", + "item.createcafe.lime_milk_tea": "酸橙味奶茶", + "block.createcafe.lime_tea": "酸橙味奶茶", + "item.createcafe.strawberry_milk_tea": "草莓味奶茶", + "block.createcafe.strawberry_tea": "草莓味奶茶", + "item.createcafe.peach_milk_tea": "桃子味奶茶", + "block.createcafe.peach_tea": "桃子味奶茶", + "item.createcafe.plum_milk_tea": "李子味奶茶", + "block.createcafe.plum_tea": "李子味奶茶", + "item.createcafe.jackfruit_milk_tea": "菠萝蜜味奶茶", + "block.createcafe.jackfruit_tea": "菠萝蜜味奶茶", + "item.createcafe.apricot_milk_tea": "杏子味奶茶", + "block.createcafe.apricot_tea": "杏子味奶茶", + "item.createcafe.durian_milk_tea": "榴莲味奶茶", + "block.createcafe.durian_tea": "榴莲味奶茶", + "item.createcafe.fig_milk_tea": "无花果味奶茶", + "block.createcafe.fig_tea": "无花果味奶茶", + "item.createcafe.grape_milk_tea": "葡萄味奶茶", + "block.createcafe.grape_tea": "葡萄味奶茶", + "item.createcafe.grapefruit_milk_tea": "柚子味奶茶", + "block.createcafe.grapefruit_tea": "柚子味奶茶", + "item.createcafe.starfruit_milk_tea": "杨桃味奶茶", + "block.createcafe.starfruit_tea": "杨桃味奶茶", + "item.createcafe.blood_orange_milk_tea": "血橙味奶茶", + "block.createcafe.blood_tea": "血橙味奶茶", + "item.createcafe.lychee_milk_tea": "荔枝味奶茶", + "block.createcafe.lychee_tea": "荔枝味奶茶", + "item.createcafe.blueberry_milk_tea": "蓝莓味奶茶", + "block.createcafe.blueberry_tea": "蓝莓味奶茶", + "item.createcafe.pineapple_milk_tea": "菠萝味奶茶", + "block.createcafe.pineapple_tea": "菠萝味奶茶", + "item.createcafe.apple_milk_tea": "苹果味奶茶", + "block.createcafe.apple_tea": "苹果味奶茶", + "item.createcafe.pumpkin_milk_tea": "南瓜味奶茶", + "block.createcafe.pumpkin_tea": "南瓜味奶茶", + "item.createcafe.avocado_milk_tea": "鳄梨味奶茶", + "block.createcafe.avocado_tea": "鳄梨味奶茶", + "item.createcafe.sweetberry_milk_tea": "甜浆果味奶茶", + "block.createcafe.sweetberry_tea": "甜浆果味奶茶", + "item.createcafe.tamarind_milk_tea": "罗望子果味奶茶", + "block.createcafe.tamarind_tea": "罗望子果味奶茶", + "item.createcafe.papaya_milk_tea": "木瓜味奶茶", + "block.createcafe.papaya_tea": "木瓜味奶茶", + "item.createcafe.mana_berry_milk_tea": "魔力浆果味奶茶", + "block.createcafe.mana_tea": "魔力浆果味奶茶", + "item.createcafe.kiwi_milk_tea": "猕猴桃味奶茶", + "block.createcafe.kiwi_tea": "猕猴桃味奶茶", + "item.createcafe.orange_milk_tea": "橙味奶茶", + "block.createcafe.orange_tea": "橙味奶茶", + "item.createcafe.yucca_milk_tea": "丝兰味奶茶", + "block.createcafe.yucca_tea": "丝兰味奶茶", + "item.createcafe.aloe_milk_tea": "芦荟味奶茶", + "block.createcafe.aloe_tea": "芦荟味奶茶", + "item.createcafe.coconut_milk_tea": "椰子味奶茶", + "block.createcafe.coconut_tea": "椰子味奶茶", + "item.createcafe.persimmon_milk_tea": "柿子味奶茶", + "block.createcafe.persimmon_tea": "柿子味奶茶", + "item.createcafe.pomegranate_milk_tea": "石榴味奶茶", + "block.createcafe.pomegranate_tea": "石榴味奶茶", + "item.createcafe.raspberry_milk_tea": "山莓味奶茶", + "block.createcafe.raspberry_tea": "山莓味奶茶", + "item.createcafe.lemon_milk_tea": "柠檬味奶茶", + "block.createcafe.lemon_tea": "柠檬味奶茶", + "item.createcafe.watermelon_milk_tea": "西瓜味奶茶", + "block.createcafe.watermelon_tea": "西瓜味奶茶", + "item.createcafe.vanilla_milk_tea": "奶茶", + "block.createcafe.vanilla_tea": "奶茶", + "item.createcafe.banana_milk_tea": "香蕉味奶茶", + "block.createcafe.banana_tea": "香蕉味奶茶", + "item.createcafe.cherry_milk_tea": "樱桃味奶茶", + "block.createcafe.cherry_tea": "樱桃味奶茶", + "item.createcafe.blackberry_milk_tea": "黑莓味奶茶", + "block.createcafe.blackberry_tea": "黑莓味奶茶", + "item.createcafe.dragonfruit_milk_tea": "火龙果味奶茶", + "block.createcafe.dragonfruit_tea": "火龙果味奶茶", + "item.createcafe.gooseberry_milk_tea": "醋栗味奶茶", + "block.createcafe.gooseberry_tea": "醋栗味奶茶", + "item.createcafe.guava_milk_tea": "番石榴味奶茶", + "block.createcafe.guava_tea": "番石榴味奶茶", + "item.createcafe.passionfruit_milk_tea": "百香果味奶茶", + "block.createcafe.passionfruit_tea": "百香果味奶茶", + "item.createcafe.lavender_milk_tea": "薰衣草味奶茶", + "block.createcafe.lavender_tea": "薰衣草味奶茶", + "item.createcafe.oreo_milk_tea": "奥利奥味奶茶", + "block.createcafe.oreo_tea": "奥利奥味奶茶", + + "item.createcafe.aloe_tea_bucket": "芦荟味奶茶桶", + "item.createcafe.apple_tea_bucket": "苹果味奶茶桶", + "item.createcafe.apricot_tea_bucket": "杏子味奶茶桶", + "item.createcafe.avocado_tea_bucket": "鳄梨味奶茶桶", + "item.createcafe.banana_tea_bucket": "香蕉味奶茶桶", + "item.createcafe.blackberry_tea_bucket": "黑莓味奶茶桶", + "item.createcafe.blood_tea_bucket": "血橙味奶茶桶", + "item.createcafe.blueberry_tea_bucket": "蓝莓味奶茶桶", + "item.createcafe.cherry_tea_bucket": "樱桃味奶茶桶", + "item.createcafe.coconut_tea_bucket": "椰子味奶茶桶", + "item.createcafe.dragonfruit_tea_bucket": "火龙果味奶茶桶", + "item.createcafe.durian_tea_bucket": "榴莲味奶茶桶", + "item.createcafe.fig_tea_bucket": "无花果味奶茶桶", + "item.createcafe.filling_bucket": "填满的桶", + "item.createcafe.gooseberry_tea_bucket": "醋栗味奶茶桶", + "item.createcafe.grape_tea_bucket": "葡萄味奶茶桶", + "item.createcafe.grapefruit_tea_bucket": "柚子味奶茶桶", + "item.createcafe.guava_tea_bucket": "番石榴味奶茶桶", + "item.createcafe.jackfruit_tea_bucket": "菠萝蜜味奶茶桶", + "item.createcafe.kiwi_tea_bucket": "猕猴桃味奶茶桶", + "item.createcafe.lavender_tea_bucket": "薰衣草味奶茶桶", + "item.createcafe.lemon_tea_bucket": "柠檬味奶茶桶", + "item.createcafe.lime_tea_bucket": "酸橙味奶茶桶", + "item.createcafe.lychee_tea_bucket": "荔枝味奶茶桶", + "item.createcafe.mana_tea_bucket": "魔力浆果味奶茶桶", + "item.createcafe.mango_tea_bucket": "芒果味奶茶桶", + "item.createcafe.melted_sugar_bucket": "装满融化糖的桶", + "item.createcafe.orange_tea_bucket": "橙味奶茶桶", + "item.createcafe.oreo_tea_bucket": "奥利奥味奶茶桶", + "item.createcafe.papaya_tea_bucket": "木瓜味奶茶桶", + "item.createcafe.passionfruit_tea_bucket": "百香果味奶茶桶", + "item.createcafe.peach_tea_bucket": "桃子味奶茶桶", + "item.createcafe.persimmon_tea_bucket": "柿子味奶茶桶", + "item.createcafe.pineapple_tea_bucket": "菠萝味奶茶桶", + "item.createcafe.plum_tea_bucket": "李子味奶茶桶", + "item.createcafe.pomegranate_tea_bucket": "石榴味奶茶桶", + "item.createcafe.pumpkin_tea_bucket": "南瓜味奶茶桶", + "item.createcafe.raspberry_tea_bucket": "山莓味奶茶桶", + "item.createcafe.starfruit_tea_bucket": "杨桃味奶茶桶", + "item.createcafe.strawberry_tea_bucket": "草莓味奶茶桶", + "item.createcafe.sweetberry_tea_bucket": "甜浆果味奶茶桶", + "item.createcafe.tamarind_tea_bucket": "罗望子果味奶茶桶", + "item.createcafe.vanilla_tea_bucket": "奶茶桶", + "item.createcafe.watermelon_tea_bucket": "西瓜味奶茶桶", + "item.createcafe.yucca_tea_bucket": "丝兰味奶茶桶" +} From 4692595cd6cba0c667d69ec0ab1bf690b134d580 Mon Sep 17 00:00:00 2001 From: zerodegress Date: Wed, 20 Jul 2022 07:58:41 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 628516375955..c0ef2f1d928a 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -2,11 +2,11 @@ "block.createcafe.melted_sugar": "融化的糖", "block.createcafe.filling": "填充", - "tooltip.createcafe.res": "防火 (0:12)", + "tooltip.createcafe.res": "抗性提升 (0:12)", "tooltip.createcafe.regen": "生命恢复 (0:13)", "tooltip.createcafe.strength": "力量 (0:10)", "tooltip.createcafe.speed": "速度 (0:13)", - "tooltip.createcafe.super": "防火 (0:13), 速度 (0:13), 力量 (0:13), 生命恢复 (0:13)", + "tooltip.createcafe.super": "抗性提升 (0:13), 速度 (0:13), 力量 (0:13), 生命恢复 (0:13)", "itemGroup.createCafeTab": "机械动力：奶茶店", @@ -28,7 +28,7 @@ "item.createcafe.cassava_seeds": "木薯种子", - "block.createcafe.cassava_crop": "木薯", + "block.createcafe.cassava_crop": "木薯种子", "item.createcafe.cassava_root": "木薯根", "block.createcafe.coffee_crop": "咖啡豆", @@ -148,7 +148,7 @@ "item.createcafe.lychee_tea_bucket": "荔枝味奶茶桶", "item.createcafe.mana_tea_bucket": "魔力浆果味奶茶桶", "item.createcafe.mango_tea_bucket": "芒果味奶茶桶", - "item.createcafe.melted_sugar_bucket": "装满融化糖的桶", + "item.createcafe.melted_sugar_bucket": "融化的糖桶", "item.createcafe.orange_tea_bucket": "橙味奶茶桶", "item.createcafe.oreo_tea_bucket": "奥利奥味奶茶桶", "item.createcafe.papaya_tea_bucket": "木瓜味奶茶桶", From 58a7043e2c788220f99429748c6aacf3d0d8c84f Mon Sep 17 00:00:00 2001 From: zerodegress Date: Wed, 20 Jul 2022 08:24:29 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-cafe/createcafe/lang/zh_cn.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index c0ef2f1d928a..9b9793f6e537 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -41,14 +41,14 @@ "block.createcafe.lime_tea": "酸橙味奶茶", "item.createcafe.strawberry_milk_tea": "草莓味奶茶", "block.createcafe.strawberry_tea": "草莓味奶茶", - "item.createcafe.peach_milk_tea": "桃子味奶茶", - "block.createcafe.peach_tea": "桃子味奶茶", + "item.createcafe.peach_milk_tea": "桃味奶茶", + "block.createcafe.peach_tea": "桃味奶茶", "item.createcafe.plum_milk_tea": "李子味奶茶", "block.createcafe.plum_tea": "李子味奶茶", "item.createcafe.jackfruit_milk_tea": "菠萝蜜味奶茶", "block.createcafe.jackfruit_tea": "菠萝蜜味奶茶", - "item.createcafe.apricot_milk_tea": "杏子味奶茶", - "block.createcafe.apricot_tea": "杏子味奶茶", + "item.createcafe.apricot_milk_tea": "杏味奶茶", + "block.createcafe.apricot_tea": "杏味奶茶", "item.createcafe.durian_milk_tea": "榴莲味奶茶", "block.createcafe.durian_tea": "榴莲味奶茶", "item.createcafe.fig_milk_tea": "无花果味奶茶", @@ -75,8 +75,8 @@ "block.createcafe.avocado_tea": "鳄梨味奶茶", "item.createcafe.sweetberry_milk_tea": "甜浆果味奶茶", "block.createcafe.sweetberry_tea": "甜浆果味奶茶", - "item.createcafe.tamarind_milk_tea": "罗望子果味奶茶", - "block.createcafe.tamarind_tea": "罗望子果味奶茶", + "item.createcafe.tamarind_milk_tea": "酸角味奶茶", + "block.createcafe.tamarind_tea": "酸角味奶茶", "item.createcafe.papaya_milk_tea": "木瓜味奶茶", "block.createcafe.papaya_tea": "木瓜味奶茶", "item.createcafe.mana_berry_milk_tea": "魔力浆果味奶茶", @@ -124,7 +124,7 @@ "item.createcafe.aloe_tea_bucket": "芦荟味奶茶桶", "item.createcafe.apple_tea_bucket": "苹果味奶茶桶", - "item.createcafe.apricot_tea_bucket": "杏子味奶茶桶", + "item.createcafe.apricot_tea_bucket": "杏味奶茶桶", "item.createcafe.avocado_tea_bucket": "鳄梨味奶茶桶", "item.createcafe.banana_tea_bucket": "香蕉味奶茶桶", "item.createcafe.blackberry_tea_bucket": "黑莓味奶茶桶", @@ -153,7 +153,7 @@ "item.createcafe.oreo_tea_bucket": "奥利奥味奶茶桶", "item.createcafe.papaya_tea_bucket": "木瓜味奶茶桶", "item.createcafe.passionfruit_tea_bucket": "百香果味奶茶桶", - "item.createcafe.peach_tea_bucket": "桃子味奶茶桶", + "item.createcafe.peach_tea_bucket": "桃味奶茶桶", "item.createcafe.persimmon_tea_bucket": "柿子味奶茶桶", "item.createcafe.pineapple_tea_bucket": "菠萝味奶茶桶", "item.createcafe.plum_tea_bucket": "李子味奶茶桶", @@ -163,7 +163,7 @@ "item.createcafe.starfruit_tea_bucket": "杨桃味奶茶桶", "item.createcafe.strawberry_tea_bucket": "草莓味奶茶桶", "item.createcafe.sweetberry_tea_bucket": "甜浆果味奶茶桶", - "item.createcafe.tamarind_tea_bucket": "罗望子果味奶茶桶", + "item.createcafe.tamarind_tea_bucket": "酸角味奶茶桶", "item.createcafe.vanilla_tea_bucket": "奶茶桶", "item.createcafe.watermelon_tea_bucket": "西瓜味奶茶桶", "item.createcafe.yucca_tea_bucket": "丝兰味奶茶桶" From db030baf66bac6b0eaf2479ad09a8775a31257fe Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Wed, 16 Nov 2022 21:46:06 +0800 Subject: [PATCH 04/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 9b9793f6e537..6bef26292525 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -2,11 +2,11 @@ "block.createcafe.melted_sugar": "融化的糖", "block.createcafe.filling": "填充", - "tooltip.createcafe.res": "抗性提升 (0:12)", - "tooltip.createcafe.regen": "生命恢复 (0:13)", - "tooltip.createcafe.strength": "力量 (0:10)", - "tooltip.createcafe.speed": "速度 (0:13)", - "tooltip.createcafe.super": "抗性提升 (0:13), 速度 (0:13), 力量 (0:13), 生命恢复 (0:13)", + "tooltip.createcafe.res": "抗性提升（0:12）", + "tooltip.createcafe.regen": "生命恢复（0:13）", + "tooltip.createcafe.strength": "力量（0:10）", + "tooltip.createcafe.speed": "速度（0:13）", + "tooltip.createcafe.super": "抗性提升（0:13），速度（0:13），力量（0:13），生命恢复（0:13）", "itemGroup.createCafeTab": "机械动力：奶茶店", From 25f7555eada265d3fdc361bca958b1ba163a8422 Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Wed, 16 Nov 2022 21:51:09 +0800 Subject: [PATCH 05/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 6bef26292525..44085788275a 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -159,7 +159,7 @@ "item.createcafe.plum_tea_bucket": "李子味奶茶桶", "item.createcafe.pomegranate_tea_bucket": "石榴味奶茶桶", "item.createcafe.pumpkin_tea_bucket": "南瓜味奶茶桶", - "item.createcafe.raspberry_tea_bucket": "山莓味奶茶桶", + "item.createcafe.raspberry_tea_bucket": "树莓味奶茶桶", "item.createcafe.starfruit_tea_bucket": "杨桃味奶茶桶", "item.createcafe.strawberry_tea_bucket": "草莓味奶茶桶", "item.createcafe.sweetberry_tea_bucket": "甜浆果味奶茶桶", From a06b3ce581ca54d8418c19e0d2963556e3c317ec Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Wed, 16 Nov 2022 21:51:19 +0800 Subject: [PATCH 06/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 44085788275a..86d9c57c89b3 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -95,8 +95,8 @@ "block.createcafe.persimmon_tea": "柿子味奶茶", "item.createcafe.pomegranate_milk_tea": "石榴味奶茶", "block.createcafe.pomegranate_tea": "石榴味奶茶", - "item.createcafe.raspberry_milk_tea": "山莓味奶茶", - "block.createcafe.raspberry_tea": "山莓味奶茶", + "item.createcafe.raspberry_milk_tea": "树莓味奶茶", + "block.createcafe.raspberry_tea": "树莓味奶茶", "item.createcafe.lemon_milk_tea": "柠檬味奶茶", "block.createcafe.lemon_tea": "柠檬味奶茶", "item.createcafe.watermelon_milk_tea": "西瓜味奶茶", From 1f83a959c4d31b51881fea8fdebb7fa6a93a8222 Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Wed, 16 Nov 2022 21:52:08 +0800 Subject: [PATCH 07/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 86d9c57c89b3..b5c9cb7725f6 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -71,8 +71,8 @@ "block.createcafe.apple_tea": "苹果味奶茶", "item.createcafe.pumpkin_milk_tea": "南瓜味奶茶", "block.createcafe.pumpkin_tea": "南瓜味奶茶", - "item.createcafe.avocado_milk_tea": "鳄梨味奶茶", - "block.createcafe.avocado_tea": "鳄梨味奶茶", + "item.createcafe.avocado_milk_tea": "牛油果味奶茶", + "block.createcafe.avocado_tea": "牛油果味奶茶", "item.createcafe.sweetberry_milk_tea": "甜浆果味奶茶", "block.createcafe.sweetberry_tea": "甜浆果味奶茶", "item.createcafe.tamarind_milk_tea": "酸角味奶茶", From 51ff6e80d0049f13097a9f99cde5cb7e43f0d4ac Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Wed, 16 Nov 2022 21:52:27 +0800 Subject: [PATCH 08/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index b5c9cb7725f6..3e2642cbb869 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -125,7 +125,7 @@ "item.createcafe.aloe_tea_bucket": "芦荟味奶茶桶", "item.createcafe.apple_tea_bucket": "苹果味奶茶桶", "item.createcafe.apricot_tea_bucket": "杏味奶茶桶", - "item.createcafe.avocado_tea_bucket": "鳄梨味奶茶桶", + "item.createcafe.avocado_tea_bucket": "牛油果味奶茶桶", "item.createcafe.banana_tea_bucket": "香蕉味奶茶桶", "item.createcafe.blackberry_tea_bucket": "黑莓味奶茶桶", "item.createcafe.blood_tea_bucket": "血橙味奶茶桶", From 55e7d558c122255d308a3c87429268c4a6af27a5 Mon Sep 17 00:00:00 2001 From: "cfpa-bot[bot]" <101878103+cfpa-bot[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:18:42 +0800 Subject: [PATCH 09/23] Update en_us file for create-cafe Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../create-cafe/createcafe/lang/en_us.json | 344 +++++++++--------- 1 file changed, 176 insertions(+), 168 deletions(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/en_us.json b/projects/1.18/assets/create-cafe/createcafe/lang/en_us.json index 132f1bb1c677..4ae0c61601b5 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/en_us.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/en_us.json @@ -1,169 +1,177 @@ -{ - "block.createcafe.melted_sugar": "Melted Sugar", - "block.createcafe.filling": "Filling", - - "tooltip.createcafe.res": "Resistance (0:12)", - "tooltip.createcafe.regen": "Regeneration (0:13)", - "tooltip.createcafe.strength": "Strength (0:10)", - "tooltip.createcafe.speed": "Speed (0:13)", - "tooltip.createcafe.super": "Resistance (0:13), Speed (0:13), Strength (0:13), Regeneration (0:13)", - - "itemGroup.createCafeTab": "Create Cafe", - - "item.createcafe.aloe_tea_bucket": "Aloe Tea Bucket", - "item.createcafe.apple_tea_bucket": "Apple Tea Bucket", - "item.createcafe.apricot_tea_bucket": "Apricot Tea Bucket", - "item.createcafe.avocado_tea_bucket": "Avocado Tea Bucket", - "item.createcafe.banana_tea_bucket": "Banana Tea Bucket", - "item.createcafe.blackberry_tea_bucket": "Blackberry Tea Bucket", - "item.createcafe.blood_tea_bucket": "Blood Tea Bucket", - "item.createcafe.blueberry_tea_bucket": "Blueberry Tea Bucket", - "item.createcafe.cherry_tea_bucket": "Cherry Tea Bucket", - "item.createcafe.coconut_tea_bucket": "Coconut Tea Bucket", - "item.createcafe.dragonfruit_tea_bucket": "Dragonfruit Tea Bucket", - "item.createcafe.durian_tea_bucket": "Durian Tea Bucket", - "item.createcafe.fig_tea_bucket": "Fig Tea Bucket", - "item.createcafe.filling_bucket": "Filling Bucket", - "item.createcafe.gooseberry_tea_bucket": "Gooseberry Tea Bucket", - "item.createcafe.grape_tea_bucket": "Grape Tea Bucket", - "item.createcafe.grapefruit_tea_bucket": "Grapefruit Tea Bucket", - "item.createcafe.guava_tea_bucket": "Guava Tea Bucket", - "item.createcafe.jackfruit_tea_bucket": "Jackfruit Tea Bucket", - "item.createcafe.kiwi_tea_bucket": "Kiwi Tea Bucket", - "item.createcafe.lavender_tea_bucket": "Lavender Tea Bucket", - "item.createcafe.lemon_tea_bucket": "Lemon Tea Bucket", - "item.createcafe.lime_tea_bucket": "Lime Tea Bucket", - "item.createcafe.lychee_tea_bucket": "Lychee Tea Bucket", - "item.createcafe.mana_tea_bucket": "Mana Tea Bucket", - "item.createcafe.mango_tea_bucket": "Mango Tea Bucket", - "item.createcafe.melted_sugar_bucket": "Melted Sugar Bucket", - "item.createcafe.orange_tea_bucket": "Orange Tea Bucket", - "item.createcafe.oreo_tea_bucket": "Oreo Tea Bucket", - "item.createcafe.papaya_tea_bucket": "Papaya Tea Bucket", - "item.createcafe.passionfruit_tea_bucket": "Passionfruit Tea Bucket", - "item.createcafe.peach_tea_bucket": "Peach Tea Bucket", - "item.createcafe.persimmon_tea_bucket": "Persimmon Tea Bucket", - "item.createcafe.pineapple_tea_bucket": "Pineapple Tea Bucket", - "item.createcafe.plum_tea_bucket": "Plum Tea Bucket", - "item.createcafe.pomegranate_tea_bucket": "Pomegranate Tea Bucket", - "item.createcafe.pumpkin_tea_bucket": "Pumpkin Tea Bucket", - "item.createcafe.raspberry_tea_bucket": "Raspberry Tea Bucket", - "item.createcafe.starfruit_tea_bucket": "Starfruit Tea Bucket", - "item.createcafe.strawberry_tea_bucket": "Strawberry Tea Bucket", - "item.createcafe.sweetberry_tea_bucket": "Sweetberry Tea Bucket", - "item.createcafe.tamarind_tea_bucket": "Tamarind Tea Bucket", - "item.createcafe.vanilla_tea_bucket": "Vanilla Tea Bucket", - "item.createcafe.watermelon_tea_bucket": "Watermelon Tea Bucket", - "item.createcafe.yucca_tea_bucket": "Yucca Tea Bucket", - - "item.createcafe.mana_berries": "Mana Berries", - "item.createcafe.oreo": "Oreo", - "item.createcafe.oreo_dough": "Oreo Dough", - "item.createcafe.oreo_half": "Oreo Half", - "item.createcafe.oreo_incomplete": "Incomplete Oreo", - "item.createcafe.oreo_half_raw": "Oreo Half Raw", - "item.createcafe.oreo_crushed": "Crushed Oreo", - "item.createcafe.blood_orange": "Blood Orange", - - "item.createcafe.empty_boba_cup": "Empty Boba Cup", - "item.createcafe.boba_cup": "Boba Cup", - "item.createcafe.boba": "Boba", - "item.createcafe.raw_boba": "Raw Boba", - "item.createcafe.tapioca_flour": "Tapioca Flour", - - "block.createcafe.cassava_crop": "Cassava Seeds", - "item.createcafe.cassava_root": "Cassava Root", - "item.createcafe.cassava_seeds": "Cassava Seeds", - - "block.createcafe.coffee_crop": "Coffee Beans", - "item.createcafe.roasted_coffee": "Roasted Coffee Beans", - "item.createcafe.coffee_fruit": "Coffee Fruit", - "item.createcafe.coffee_beans": "Coffee Beans", - - "item.createcafe.mango_milk_tea": "Mango Milk Tea", - "block.createcafe.mango_tea": "Mango Milk Tea", - "item.createcafe.lime_milk_tea": "Lime Milk Tea", - "block.createcafe.lime_tea": "Lime Milk Tea", - "item.createcafe.strawberry_milk_tea": "Strawberry Milk Tea", - "block.createcafe.strawberry_tea": "Strawberry Milk Tea", - "item.createcafe.peach_milk_tea": "Peach Milk Tea", - "block.createcafe.peach_tea": "Peach Milk Tea", - "item.createcafe.plum_milk_tea": "Plum Milk Tea", - "block.createcafe.plum_tea": "Plum Milk Tea", - "item.createcafe.jackfruit_milk_tea": "Jackfruit Milk Tea", - "block.createcafe.jackfruit_tea": "Jackfruit Milk Tea", - "item.createcafe.apricot_milk_tea": "Apricot Milk Tea", - "block.createcafe.apricot_tea": "Apricot Milk Tea", - "item.createcafe.durian_milk_tea": "Durian Milk Tea", - "block.createcafe.durian_tea": "Durian Milk Tea", - "item.createcafe.fig_milk_tea": "Fig Milk Tea", - "block.createcafe.fig_tea": "Fig Milk Tea", - "item.createcafe.grape_milk_tea": "Grape Milk Tea", - "block.createcafe.grape_tea": "Grape Milk Tea", - "item.createcafe.grapefruit_milk_tea": "Grapefruit Milk Tea", - "block.createcafe.grapefruit_tea": "Grapefruit Milk Tea", - "item.createcafe.starfruit_milk_tea": "Starfruit Milk Tea", - "block.createcafe.starfruit_tea": "Starfruit Milk Tea", - "item.createcafe.blood_orange_milk_tea": "Blood Orange Milk Tea", - "block.createcafe.blood_tea": "Blood Orange Milk Tea", - "item.createcafe.lychee_milk_tea": "Lychee Milk Tea", - "block.createcafe.lychee_tea": "Lychee Milk Tea", - "item.createcafe.blueberry_milk_tea": "Blueberry Milk Tea", - "block.createcafe.blueberry_tea": "Blueberry Milk Tea", - "item.createcafe.pineapple_milk_tea": "Pineapple Milk Tea", - "block.createcafe.pineapple_tea": "Pineapple Milk Tea", - "item.createcafe.apple_milk_tea": "Apple Milk Tea", - "block.createcafe.apple_tea": "Apple Milk Tea", - "item.createcafe.pumpkin_milk_tea": "Pumpkin Milk Tea", - "block.createcafe.pumpkin_tea": "Pumpkin Milk Tea", - "item.createcafe.avocado_milk_tea": "Avocado Milk Tea", - "block.createcafe.avocado_tea": "Avocado Milk Tea", - "item.createcafe.sweetberry_milk_tea": "Sweet Berry Milk Tea", - "block.createcafe.sweetberry_tea": "Sweet Berry Milk Tea", - "item.createcafe.tamarind_milk_tea": "Tamarind Milk Tea", - "block.createcafe.tamarind_tea": "Tamarind Milk Tea", - "item.createcafe.papaya_milk_tea": "Papaya Milk Tea", - "block.createcafe.papaya_tea": "Papaya Milk Tea", - "item.createcafe.mana_berry_milk_tea": "Mana Berry Milk Tea", - "block.createcafe.mana_tea": "Mana Berry Milk Tea", - "item.createcafe.kiwi_milk_tea": "Kiwi Milk Tea", - "block.createcafe.kiwi_tea": "Kiwi Milk Tea", - "item.createcafe.orange_milk_tea": "Orange Milk Tea", - "block.createcafe.orange_tea": "Orange Milk Tea", - "item.createcafe.yucca_milk_tea": "Yucca Milk Tea", - "block.createcafe.yucca_tea": "Yucca Milk Tea", - "item.createcafe.aloe_milk_tea": "Aloe Milk Tea", - "block.createcafe.aloe_tea": "Aloe Milk Tea", - "item.createcafe.coconut_milk_tea": "Coconut Milk Tea", - "block.createcafe.coconut_tea": "Coconut Milk Tea", - "item.createcafe.persimmon_milk_tea": "Persimmon Milk Tea", - "block.createcafe.persimmon_tea": "Persimmon Milk Tea", - "item.createcafe.pomegranate_milk_tea": "Pomegranate Milk Tea", - "block.createcafe.pomegranate_tea": "Pomegranate Milk Tea", - "item.createcafe.raspberry_milk_tea": "Raspberry Milk Tea", - "block.createcafe.raspberry_tea": "Raspberry Milk Tea", - "item.createcafe.lemon_milk_tea": "Lemon Milk Tea", - "block.createcafe.lemon_tea": "Lemon Milk Tea", - "item.createcafe.watermelon_milk_tea": "Watermelon Milk Tea", - "block.createcafe.watermelon_tea": "Watermelon Milk Tea", - "item.createcafe.vanilla_milk_tea": "Vanilla Milk Tea", - "block.createcafe.vanilla_tea": "Vanilla Milk Tea", - "item.createcafe.banana_milk_tea": "Banana Milk Tea", - "block.createcafe.banana_tea": "Banana Milk Tea", - "item.createcafe.cherry_milk_tea": "Cherry Milk Tea", - "block.createcafe.cherry_tea": "Cherry Milk Tea", - "item.createcafe.blackberry_milk_tea": "Blackberry Milk Tea", - "block.createcafe.blackberry_tea": "Blackberry Milk Tea", - "item.createcafe.dragonfruit_milk_tea": "Dragonfruit Milk Tea", - "block.createcafe.dragonfruit_tea": "Dragonfruit Milk Tea", - "item.createcafe.gooseberry_milk_tea": "Gooseberry Milk Tea", - "block.createcafe.gooseberry_tea": "Gooseberry Milk Tea", - "item.createcafe.guava_milk_tea": "Guava Milk Tea", - "block.createcafe.guava_tea": "Guava Milk Tea", - "item.createcafe.passionfruit_milk_tea": "Passionfruit Milk Tea", - "block.createcafe.passionfruit_tea": "Passionfruit Milk Tea", - "item.createcafe.lavender_milk_tea": "Lavender Milk Tea", - "block.createcafe.lavender_tea": "Lavender Milk Tea", - "item.createcafe.oreo_milk_tea": "Oreo Milk Tea", - "block.createcafe.oreo_tea": "Oreo Milk Tea" +{ + "block.createcafe.melted_sugar": "Melted Sugar", + "block.createcafe.filling": "Filling", + "tooltip.createcafe.res": "Resistance (0:12)", + "tooltip.createcafe.fire_res": "Fire Resistance (0:12)", + "tooltip.createcafe.regen": "Regeneration (0:13)", + "tooltip.createcafe.strength": "Strength (0:10)", + "tooltip.createcafe.speed": "Speed (0:13)", + "tooltip.createcafe.super": "Resistance (0:13), Speed (0:13), Strength (0:13), Regeneration (0:13)", + "itemGroup.createCafeTab": "Create Cafe", + "item.createcafe.aloe_tea_bucket": "Aloe Tea Bucket", + "item.createcafe.apple_tea_bucket": "Apple Tea Bucket", + "item.createcafe.apricot_tea_bucket": "Apricot Tea Bucket", + "item.createcafe.avocado_tea_bucket": "Avocado Tea Bucket", + "item.createcafe.banana_tea_bucket": "Banana Tea Bucket", + "item.createcafe.blackberry_tea_bucket": "Blackberry Tea Bucket", + "item.createcafe.blood_tea_bucket": "Blood Tea Bucket", + "item.createcafe.blueberry_tea_bucket": "Blueberry Tea Bucket", + "item.createcafe.cherry_tea_bucket": "Cherry Tea Bucket", + "item.createcafe.coconut_tea_bucket": "Coconut Tea Bucket", + "item.createcafe.dragonfruit_tea_bucket": "Dragonfruit Tea Bucket", + "item.createcafe.durian_tea_bucket": "Durian Tea Bucket", + "item.createcafe.fig_tea_bucket": "Fig Tea Bucket", + "item.createcafe.filling_bucket": "Filling Bucket", + "item.createcafe.gooseberry_tea_bucket": "Gooseberry Tea Bucket", + "item.createcafe.grape_tea_bucket": "Grape Tea Bucket", + "item.createcafe.grapefruit_tea_bucket": "Grapefruit Tea Bucket", + "item.createcafe.guava_tea_bucket": "Guava Tea Bucket", + "item.createcafe.jackfruit_tea_bucket": "Jackfruit Tea Bucket", + "item.createcafe.kiwi_tea_bucket": "Kiwi Tea Bucket", + "item.createcafe.lavender_tea_bucket": "Lavender Tea Bucket", + "item.createcafe.lemon_tea_bucket": "Lemon Tea Bucket", + "item.createcafe.lime_tea_bucket": "Lime Tea Bucket", + "item.createcafe.lychee_tea_bucket": "Lychee Tea Bucket", + "item.createcafe.mana_tea_bucket": "Mana Tea Bucket", + "item.createcafe.mango_tea_bucket": "Mango Tea Bucket", + "item.createcafe.melted_sugar_bucket": "Melted Sugar Bucket", + "item.createcafe.orange_tea_bucket": "Orange Tea Bucket", + "item.createcafe.oreo_tea_bucket": "Oreo Tea Bucket", + "item.createcafe.papaya_tea_bucket": "Papaya Tea Bucket", + "item.createcafe.passionfruit_tea_bucket": "Passionfruit Tea Bucket", + "item.createcafe.peach_tea_bucket": "Peach Tea Bucket", + "item.createcafe.persimmon_tea_bucket": "Persimmon Tea Bucket", + "item.createcafe.pineapple_tea_bucket": "Pineapple Tea Bucket", + "item.createcafe.plum_tea_bucket": "Plum Tea Bucket", + "item.createcafe.pomegranate_tea_bucket": "Pomegranate Tea Bucket", + "item.createcafe.pumpkin_tea_bucket": "Pumpkin Tea Bucket", + "item.createcafe.raspberry_tea_bucket": "Raspberry Tea Bucket", + "item.createcafe.starfruit_tea_bucket": "Starfruit Tea Bucket", + "item.createcafe.strawberry_tea_bucket": "Strawberry Tea Bucket", + "item.createcafe.sweetberry_tea_bucket": "Sweetberry Tea Bucket", + "item.createcafe.tamarind_tea_bucket": "Tamarind Tea Bucket", + "item.createcafe.vanilla_tea_bucket": "Vanilla Tea Bucket", + "item.createcafe.watermelon_tea_bucket": "Watermelon Tea Bucket", + "item.createcafe.yucca_tea_bucket": "Yucca Tea Bucket", + "item.createcafe.citron_tea_bucket": "Citron Tea Bucket", + "item.createcafe.pomelo_tea_bucket": "Pomelo Tea Bucket", + "item.createcafe.redlove_tea_bucket": "Redlove Tea Bucket", + "item.createcafe.mandarin_tea_bucket": "Mandarin Tea Bucket", + "item.createcafe.barberry_tea_bucket": "Barberry Tea Bucket", + "item.createcafe.mana_berries": "Mana Berries", + "item.createcafe.oreo": "Oreo", + "item.createcafe.oreo_dough": "Oreo Dough", + "item.createcafe.oreo_half": "Oreo Half", + "item.createcafe.oreo_incomplete": "Incomplete Oreo", + "item.createcafe.oreo_half_raw": "Oreo Half Raw", + "item.createcafe.oreo_crushed": "Crushed Oreo", + "item.createcafe.blood_orange": "Blood Orange", + "item.createcafe.empty_boba_cup": "Empty Boba Cup", + "item.createcafe.boba_cup": "Boba Cup", + "item.createcafe.boba": "Boba", + "item.createcafe.raw_boba": "Raw Boba", + "item.createcafe.tapioca_flour": "Tapioca Flour", + "block.createcafe.cassava_crop": "Cassava Seeds", + "item.createcafe.cassava_root": "Cassava Root", + "item.createcafe.cassava_seeds": "Cassava Seeds", + "block.createcafe.coffee_crop": "Coffee Beans", + "item.createcafe.roasted_coffee": "Roasted Coffee Beans", + "item.createcafe.coffee_fruit": "Coffee Fruit", + "item.createcafe.coffee_beans": "Coffee Beans", + "item.createcafe.mango_milk_tea": "Mango Milk Tea", + "block.createcafe.mango_tea": "Mango Milk Tea", + "item.createcafe.lime_milk_tea": "Lime Milk Tea", + "block.createcafe.lime_tea": "Lime Milk Tea", + "item.createcafe.strawberry_milk_tea": "Strawberry Milk Tea", + "block.createcafe.strawberry_tea": "Strawberry Milk Tea", + "item.createcafe.peach_milk_tea": "Peach Milk Tea", + "block.createcafe.peach_tea": "Peach Milk Tea", + "item.createcafe.plum_milk_tea": "Plum Milk Tea", + "block.createcafe.plum_tea": "Plum Milk Tea", + "item.createcafe.jackfruit_milk_tea": "Jackfruit Milk Tea", + "block.createcafe.jackfruit_tea": "Jackfruit Milk Tea", + "item.createcafe.apricot_milk_tea": "Apricot Milk Tea", + "block.createcafe.apricot_tea": "Apricot Milk Tea", + "item.createcafe.durian_milk_tea": "Durian Milk Tea", + "block.createcafe.durian_tea": "Durian Milk Tea", + "item.createcafe.fig_milk_tea": "Fig Milk Tea", + "block.createcafe.fig_tea": "Fig Milk Tea", + "item.createcafe.grape_milk_tea": "Grape Milk Tea", + "block.createcafe.grape_tea": "Grape Milk Tea", + "item.createcafe.grapefruit_milk_tea": "Grapefruit Milk Tea", + "block.createcafe.grapefruit_tea": "Grapefruit Milk Tea", + "item.createcafe.starfruit_milk_tea": "Starfruit Milk Tea", + "block.createcafe.starfruit_tea": "Starfruit Milk Tea", + "item.createcafe.blood_orange_milk_tea": "Blood Orange Milk Tea", + "block.createcafe.blood_tea": "Blood Orange Milk Tea", + "item.createcafe.lychee_milk_tea": "Lychee Milk Tea", + "block.createcafe.lychee_tea": "Lychee Milk Tea", + "item.createcafe.blueberry_milk_tea": "Blueberry Milk Tea", + "block.createcafe.blueberry_tea": "Blueberry Milk Tea", + "item.createcafe.pineapple_milk_tea": "Pineapple Milk Tea", + "block.createcafe.pineapple_tea": "Pineapple Milk Tea", + "item.createcafe.apple_milk_tea": "Apple Milk Tea", + "block.createcafe.apple_tea": "Apple Milk Tea", + "item.createcafe.pumpkin_milk_tea": "Pumpkin Milk Tea", + "block.createcafe.pumpkin_tea": "Pumpkin Milk Tea", + "item.createcafe.avocado_milk_tea": "Avocado Milk Tea", + "block.createcafe.avocado_tea": "Avocado Milk Tea", + "item.createcafe.sweetberry_milk_tea": "Sweet Berry Milk Tea", + "block.createcafe.sweetberry_tea": "Sweet Berry Milk Tea", + "item.createcafe.tamarind_milk_tea": "Tamarind Milk Tea", + "block.createcafe.tamarind_tea": "Tamarind Milk Tea", + "item.createcafe.papaya_milk_tea": "Papaya Milk Tea", + "block.createcafe.papaya_tea": "Papaya Milk Tea", + "item.createcafe.mana_berry_milk_tea": "Mana Berry Milk Tea", + "block.createcafe.mana_tea": "Mana Berry Milk Tea", + "item.createcafe.kiwi_milk_tea": "Kiwi Milk Tea", + "block.createcafe.kiwi_tea": "Kiwi Milk Tea", + "item.createcafe.orange_milk_tea": "Orange Milk Tea", + "block.createcafe.orange_tea": "Orange Milk Tea", + "item.createcafe.yucca_milk_tea": "Yucca Milk Tea", + "block.createcafe.yucca_tea": "Yucca Milk Tea", + "item.createcafe.aloe_milk_tea": "Aloe Milk Tea", + "block.createcafe.aloe_tea": "Aloe Milk Tea", + "item.createcafe.coconut_milk_tea": "Coconut Milk Tea", + "block.createcafe.coconut_tea": "Coconut Milk Tea", + "item.createcafe.persimmon_milk_tea": "Persimmon Milk Tea", + "block.createcafe.persimmon_tea": "Persimmon Milk Tea", + "item.createcafe.pomegranate_milk_tea": "Pomegranate Milk Tea", + "block.createcafe.pomegranate_tea": "Pomegranate Milk Tea", + "item.createcafe.raspberry_milk_tea": "Raspberry Milk Tea", + "block.createcafe.raspberry_tea": "Raspberry Milk Tea", + "item.createcafe.lemon_milk_tea": "Lemon Milk Tea", + "block.createcafe.lemon_tea": "Lemon Milk Tea", + "item.createcafe.watermelon_milk_tea": "Watermelon Milk Tea", + "block.createcafe.watermelon_tea": "Watermelon Milk Tea", + "item.createcafe.vanilla_milk_tea": "Vanilla Milk Tea", + "block.createcafe.vanilla_tea": "Vanilla Milk Tea", + "item.createcafe.banana_milk_tea": "Banana Milk Tea", + "block.createcafe.banana_tea": "Banana Milk Tea", + "item.createcafe.cherry_milk_tea": "Cherry Milk Tea", + "block.createcafe.cherry_tea": "Cherry Milk Tea", + "item.createcafe.blackberry_milk_tea": "Blackberry Milk Tea", + "block.createcafe.blackberry_tea": "Blackberry Milk Tea", + "item.createcafe.dragonfruit_milk_tea": "Dragonfruit Milk Tea", + "block.createcafe.dragonfruit_tea": "Dragonfruit Milk Tea", + "item.createcafe.gooseberry_milk_tea": "Gooseberry Milk Tea", + "block.createcafe.gooseberry_tea": "Gooseberry Milk Tea", + "item.createcafe.guava_milk_tea": "Guava Milk Tea", + "block.createcafe.guava_tea": "Guava Milk Tea", + "item.createcafe.passionfruit_milk_tea": "Passionfruit Milk Tea", + "block.createcafe.passionfruit_tea": "Passionfruit Milk Tea", + "item.createcafe.lavender_milk_tea": "Lavender Milk Tea", + "block.createcafe.lavender_tea": "Lavender Milk Tea", + "item.createcafe.oreo_milk_tea": "Oreo Milk Tea", + "block.createcafe.oreo_tea": "Oreo Milk Tea", + "item.createcafe.citron_milk_tea": "Citron Milk Tea", + "block.createcafe.citron_tea": "Citron Milk Tea", + "item.createcafe.redlove_milk_tea": "Redlove Milk Tea", + "block.createcafe.redlove_tea": "Redlove Milk Tea", + "item.createcafe.pomelo_milk_tea": "Pomelo Milk Tea", + "block.createcafe.pomelo_tea": "Pomelo Milk Tea", + "item.createcafe.mandarin_milk_tea": "Mandarin Milk Tea", + "block.createcafe.mandarin_tea": "Mandarin Milk Tea", + "item.createcafe.barberry_milk_tea": "Barberry Milk Tea", + "block.createcafe.barberry_tea": "Barberry Milk Tea" } \ No newline at end of file From b8cf15d8617548d36090604e8d9a64325b900359 Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:46:44 +0800 Subject: [PATCH 10/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 3e2642cbb869..29435b368f7d 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -28,7 +28,7 @@ "item.createcafe.cassava_seeds": "木薯种子", - "block.createcafe.cassava_crop": "木薯种子", + "block.createcafe.cassava_crop": "木薯", "item.createcafe.cassava_root": "木薯根", "block.createcafe.coffee_crop": "咖啡豆", From 4058f4571e0d230e96a91573d2e2573d1d5ac1fd Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:47:14 +0800 Subject: [PATCH 11/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 29435b368f7d..f28bca615dcb 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -166,5 +166,10 @@ "item.createcafe.tamarind_tea_bucket": "酸角味奶茶桶", "item.createcafe.vanilla_tea_bucket": "奶茶桶", "item.createcafe.watermelon_tea_bucket": "西瓜味奶茶桶", - "item.createcafe.yucca_tea_bucket": "丝兰味奶茶桶" + "item.createcafe.yucca_tea_bucket": "丝兰味奶茶桶", + "item.createcafe.citron_tea_bucket": "香橼味奶茶桶", + "item.createcafe.pomelo_tea_bucket": "柚子味奶茶桶", + "item.createcafe.redlove_tea_bucket": "红心果味奶茶桶", + "item.createcafe.mandarin_tea_bucket": "橘子味奶茶桶", + "item.createcafe.barberry_tea_bucket": "小檗果味奶茶桶" } From fee23109e01aaeba93d98b4c57454927ace0e0ae Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:47:24 +0800 Subject: [PATCH 12/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index f28bca615dcb..f69a905a4cb2 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -121,6 +121,16 @@ "block.createcafe.lavender_tea": "薰衣草味奶茶", "item.createcafe.oreo_milk_tea": "奥利奥味奶茶", "block.createcafe.oreo_tea": "奥利奥味奶茶", + "item.createcafe.citron_milk_tea": "香橼味奶茶", + "block.createcafe.citron_tea": "香橼味奶茶", + "item.createcafe.redlove_milk_tea": "红心果味奶茶", + "block.createcafe.redlove_tea": "红心果味奶茶", + "item.createcafe.pomelo_milk_tea": "柚子味奶茶", + "block.createcafe.pomelo_tea": "柚子味奶茶", + "item.createcafe.mandarin_milk_tea": "橘子味奶茶", + "block.createcafe.mandarin_tea": "橘子味奶茶", + "item.createcafe.barberry_milk_tea": "小檗果味奶茶", + "block.createcafe.barberry_tea": "小檗果味奶茶" "item.createcafe.aloe_tea_bucket": "芦荟味奶茶桶", "item.createcafe.apple_tea_bucket": "苹果味奶茶桶", From 7f166755c4f9d812479c65ef69360be396cf9b4d Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:47:30 +0800 Subject: [PATCH 13/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index f69a905a4cb2..a619c88e97a9 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -148,7 +148,7 @@ "item.createcafe.filling_bucket": "填满的桶", "item.createcafe.gooseberry_tea_bucket": "醋栗味奶茶桶", "item.createcafe.grape_tea_bucket": "葡萄味奶茶桶", - "item.createcafe.grapefruit_tea_bucket": "柚子味奶茶桶", + "item.createcafe.grapefruit_tea_bucket": "西柚味奶茶桶", "item.createcafe.guava_tea_bucket": "番石榴味奶茶桶", "item.createcafe.jackfruit_tea_bucket": "菠萝蜜味奶茶桶", "item.createcafe.kiwi_tea_bucket": "猕猴桃味奶茶桶", From c61affc0452428dc76e0a84cc54a840410e99843 Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:48:24 +0800 Subject: [PATCH 14/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index a619c88e97a9..b66004129eba 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -24,7 +24,7 @@ "item.createcafe.boba_cup": "有珍珠的奶茶杯", "item.createcafe.boba": "波霸珍珠", "item.createcafe.raw_boba": "未加工的波霸珍珠", - "item.createcafe.tapioca_flour": "木薯粉末", + "item.createcafe.tapioca_flour": "木薯粉", "item.createcafe.cassava_seeds": "木薯种子", From 9c598cac5b667a3b01541c90347e72c6d6d27a96 Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:48:47 +0800 Subject: [PATCH 15/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index b66004129eba..942d7dc1a393 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -145,7 +145,7 @@ "item.createcafe.dragonfruit_tea_bucket": "火龙果味奶茶桶", "item.createcafe.durian_tea_bucket": "榴莲味奶茶桶", "item.createcafe.fig_tea_bucket": "无花果味奶茶桶", - "item.createcafe.filling_bucket": "填满的桶", + "item.createcafe.filling_bucket": "奥利奥馅料桶", "item.createcafe.gooseberry_tea_bucket": "醋栗味奶茶桶", "item.createcafe.grape_tea_bucket": "葡萄味奶茶桶", "item.createcafe.grapefruit_tea_bucket": "西柚味奶茶桶", From 7b39995f020717d95c25f3366ac42a8665586766 Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:48:54 +0800 Subject: [PATCH 16/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 942d7dc1a393..7513c20562e8 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -101,8 +101,8 @@ "block.createcafe.lemon_tea": "柠檬味奶茶", "item.createcafe.watermelon_milk_tea": "西瓜味奶茶", "block.createcafe.watermelon_tea": "西瓜味奶茶", - "item.createcafe.vanilla_milk_tea": "奶茶", - "block.createcafe.vanilla_tea": "奶茶", + "item.createcafe.vanilla_milk_tea": "香草味奶茶", + "block.createcafe.vanilla_tea": "香草味奶茶", "item.createcafe.banana_milk_tea": "香蕉味奶茶", "block.createcafe.banana_tea": "香蕉味奶茶", "item.createcafe.cherry_milk_tea": "樱桃味奶茶", From 39b53033fb4c52e89f9886c957c1ff58f37bc59a Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:49:00 +0800 Subject: [PATCH 17/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 7513c20562e8..39ac08e11ce1 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -1,6 +1,6 @@ { "block.createcafe.melted_sugar": "融化的糖", - "block.createcafe.filling": "填充", + "block.createcafe.filling": "奥利奥馅料", "tooltip.createcafe.res": "抗性提升（0:12）", "tooltip.createcafe.regen": "生命恢复（0:13）", From 0922e3018ffd98ef9b3decf0544bcec4b857faf1 Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:49:09 +0800 Subject: [PATCH 18/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 39ac08e11ce1..4cf77c4d9b82 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -174,7 +174,7 @@ "item.createcafe.strawberry_tea_bucket": "草莓味奶茶桶", "item.createcafe.sweetberry_tea_bucket": "甜浆果味奶茶桶", "item.createcafe.tamarind_tea_bucket": "酸角味奶茶桶", - "item.createcafe.vanilla_tea_bucket": "奶茶桶", + "item.createcafe.vanilla_tea_bucket": "香草味奶茶桶", "item.createcafe.watermelon_tea_bucket": "西瓜味奶茶桶", "item.createcafe.yucca_tea_bucket": "丝兰味奶茶桶", "item.createcafe.citron_tea_bucket": "香橼味奶茶桶", From 78156c8bd81603e25c19ab3df6b0aa23195938d9 Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:49:21 +0800 Subject: [PATCH 19/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 4cf77c4d9b82..53f6404c966f 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -55,8 +55,8 @@ "block.createcafe.fig_tea": "无花果味奶茶", "item.createcafe.grape_milk_tea": "葡萄味奶茶", "block.createcafe.grape_tea": "葡萄味奶茶", - "item.createcafe.grapefruit_milk_tea": "柚子味奶茶", - "block.createcafe.grapefruit_tea": "柚子味奶茶", + "item.createcafe.grapefruit_milk_tea": "西柚味奶茶", + "block.createcafe.grapefruit_tea": "西柚味奶茶", "item.createcafe.starfruit_milk_tea": "杨桃味奶茶", "block.createcafe.starfruit_tea": "杨桃味奶茶", "item.createcafe.blood_orange_milk_tea": "血橙味奶茶", From 34840f808aa9292dcd4e101ed5441ca590cd115e Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:49:31 +0800 Subject: [PATCH 20/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index 53f6404c966f..f633ad302081 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -45,8 +45,8 @@ "block.createcafe.peach_tea": "桃味奶茶", "item.createcafe.plum_milk_tea": "李子味奶茶", "block.createcafe.plum_tea": "李子味奶茶", - "item.createcafe.jackfruit_milk_tea": "菠萝蜜味奶茶", - "block.createcafe.jackfruit_tea": "菠萝蜜味奶茶", + "item.createcafe.jackfruit_milk_tea": "波罗蜜味奶茶", + "block.createcafe.jackfruit_tea": "波罗蜜味奶茶", "item.createcafe.apricot_milk_tea": "杏味奶茶", "block.createcafe.apricot_tea": "杏味奶茶", "item.createcafe.durian_milk_tea": "榴莲味奶茶", From a7f2c7f40e22f235159f460f93df91f84bcbc18b Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:49:40 +0800 Subject: [PATCH 21/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index f633ad302081..faaeb4ee4bc5 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -150,7 +150,7 @@ "item.createcafe.grape_tea_bucket": "葡萄味奶茶桶", "item.createcafe.grapefruit_tea_bucket": "西柚味奶茶桶", "item.createcafe.guava_tea_bucket": "番石榴味奶茶桶", - "item.createcafe.jackfruit_tea_bucket": "菠萝蜜味奶茶桶", + "item.createcafe.jackfruit_tea_bucket": "波罗蜜味奶茶桶", "item.createcafe.kiwi_tea_bucket": "猕猴桃味奶茶桶", "item.createcafe.lavender_tea_bucket": "薰衣草味奶茶桶", "item.createcafe.lemon_tea_bucket": "柠檬味奶茶桶", From fabec9bf150d770d6f4cb4e3e5ec530b9dc18c8d Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:55:36 +0800 Subject: [PATCH 22/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index faaeb4ee4bc5..cea44025bdc8 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -130,7 +130,7 @@ "item.createcafe.mandarin_milk_tea": "橘子味奶茶", "block.createcafe.mandarin_tea": "橘子味奶茶", "item.createcafe.barberry_milk_tea": "小檗果味奶茶", - "block.createcafe.barberry_tea": "小檗果味奶茶" + "block.createcafe.barberry_tea": "小檗果味奶茶", "item.createcafe.aloe_tea_bucket": "芦荟味奶茶桶", "item.createcafe.apple_tea_bucket": "苹果味奶茶桶", From 2f9938473cd10a8f7d70305f9d3f95c021b3df3c Mon Sep 17 00:00:00 2001 From: IceDegress <60560055+zerodegress@users.noreply.github.com> Date: Thu, 17 Nov 2022 18:19:22 +0800 Subject: [PATCH 23/23] Update projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json index cea44025bdc8..846ff1c7b091 100644 --- a/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json +++ b/projects/1.18/assets/create-cafe/createcafe/lang/zh_cn.json @@ -3,6 +3,7 @@ "block.createcafe.filling": "奥利奥馅料", "tooltip.createcafe.res": "抗性提升（0:12）", + "tooltip.createcafe.fire_res": "防火（0:12）", "tooltip.createcafe.regen": "生命恢复（0:13）", "tooltip.createcafe.strength": "力量（0:10）", "tooltip.createcafe.speed": "速度（0:13）",