From aeea26a23351a3b50aa841dbdf19478095882e60 Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Sun, 15 May 2022 20:14:29 +0800
Subject: [PATCH 1/7] Add files via upload

---
 .../croptopia/lang/en_us.json                 |  51 ++
 .../croptopia/lang/zh_cn.json                 | 440 +++++++++++-------
 .../cacao/lang/en_us.json                     |  48 ++
 .../cacao/lang/zh_cn.json                     |  48 ++
 4 files changed, 430 insertions(+), 157 deletions(-)
 create mode 100644 projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/en_us.json
 create mode 100644 projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/zh_cn.json

diff --git a/projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json b/projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json
index d6f5972b628b..9674ef8998b8 100644
--- a/projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json
+++ b/projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json
@@ -139,6 +139,8 @@
   "item.croptopia.ginger": "Ginger",
   "item.croptopia.basil": "Basil",
   "item.croptopia.chile_pepper": "Chile Pepper",
+
+
   "item.croptopia.apple_sapling": "Apple Sapling",
   "item.croptopia.banana_sapling": "Banana Sapling",
   "item.croptopia.orange_sapling": "Orange Sapling",
@@ -165,6 +167,7 @@
   "item.croptopia.cashew_sapling": "Cashew Sapling",
   "item.croptopia.pecan_sapling": "Pecan Sapling",
   "item.croptopia.walnut_sapling": "Walnut Sapling",
+
   "item.croptopia.olive_oil": "Olive Oil",
   "item.croptopia.cheese": "Cheese",
   "item.croptopia.flour": "Flour",
@@ -285,6 +288,7 @@
   "item.croptopia.raisin_oatmeal_cookie": "Raisin Oatmeal Cookie",
   "item.croptopia.roasted_nuts": "Roasted Nuts",
   "item.croptopia.trail_mix": "Trail Mix",
+
   "item.croptopia.burrito": "Burrito",
   "item.croptopia.tostada": "Tostada",
   "item.croptopia.horchata": "Horchata",
@@ -300,15 +304,18 @@
   "item.croptopia.refried_beans": "Refried Beans",
   "item.croptopia.chimichanga": "Chimichanga",
   "item.croptopia.quesadilla": "Quesadilla",
+
   "item.croptopia.cinnamon": "Cinnamon",
   "item.croptopia.corn_husk": "Corn Husk",
   "item.croptopia.whipping_cream": "Whipping Cream",
   "item.croptopia.vanilla_seeds": "Vanilla Seeds",
+
   "item.croptopia.cinnamon_sapling": "Cinnamon Sapling",
   "item.croptopia.cinnamon_log": "Cinnamon Log",
   "item.croptopia.stripped_cinnamon_log": "Stripped Cinnamon Log",
   "item.croptopia.cinnamon_wood": "Cinnamon Wood",
   "item.croptopia.stripped_cinnamon_wood": "Stripped Cinnamon Wood",
+
   "item.croptopia.shepherds_pie": "Shepherd's Pie",
   "item.croptopia.beef_wellington": "Beef Wellington",
   "item.croptopia.fish_and_chips": "Fish and Chips",
@@ -324,6 +331,7 @@
   "item.croptopia.milk_bottle": "Milk Bottle",
   "item.croptopia.tea_leaves": "Tea Leaves",
   "item.croptopia.tea_seed": "Tea Seeds",
+
   "item.croptopia.ajvar": "Ajvar",
   "item.croptopia.ajvar_toast": "Ajvar Toast",
   "item.croptopia.avocado_toast": "Avocado Toast",
@@ -348,6 +356,7 @@
   "item.croptopia.ratatouille": "Ratatouille",
   "item.croptopia.bacon": "Bacon",
   "item.croptopia.rhubarb_crisp": "Rhubarb Crisp",
+  "item.croptopia.rhubarb_pie": "Rhubarb Pie",
   "item.croptopia.roasted_asparagus": "Roasted Asparagus",
   "item.croptopia.roasted_radishes": "Roasted Radishes",
   "item.croptopia.roasted_squash": "Roasted Squash",
@@ -357,12 +366,50 @@
   "item.croptopia.stir_fry": "Stir Fry",
   "item.croptopia.stuffed_artichoke": "Stuffed Artichoke",
   "item.croptopia.toast_sandwich": "Toast Sandwich",
+
+  "item.croptopia.roasted_pumpkin_seeds": "Roasted Pumpkin Seeds",
+  "item.croptopia.roasted_sunflower_seeds": "Roasted Sunflower Seeds",
+  "item.croptopia.pumpkin_bars": "Pumpkin Bar",
+  "item.croptopia.corn_bread": "Corn Bread",
+  "item.croptopia.pumpkin_soup": "Pumpkin Soup",
+  "item.croptopia.meringue": "Meringue",
+  "item.croptopia.cabbage_roll": "Cabbage Roll",
+  "item.croptopia.borscht": "Borscht",
+  "item.croptopia.goulash": "Goulash",
+  "item.croptopia.beetroot_salad": "Beetroot Salad",
+  "item.croptopia.candied_kumquats": "Candied Kumquats",
+  "item.croptopia.shrimp": "Shrimp",
+  "item.croptopia.tuna": "Tuna",
+  "item.croptopia.calamari": "Calamari",
+  "item.croptopia.crab": "Crab",
+  "item.croptopia.roe": "Roe",
+  "item.croptopia.clam": "Clam",
+  "item.croptopia.oyster": "Oyster",
+  "item.croptopia.cooked_shrimp": "Cooked Shrimp",
+  "item.croptopia.cooked_tuna": "Cooked Tuna",
+  "item.croptopia.cooked_calamari": "Cooked Calamari",
+  "item.croptopia.steamed_crab": "Steamed Crab",
+  "item.croptopia.glowing_calamari": "Glowing Calamari",
+  "item.croptopia.sea_lettuce": "Sea Lettuce",
+  "item.croptopia.deep_fried_shrimp": "Deep Fried Shrimp",
+  "item.croptopia.tuna_roll": "Tuna Roll",
+  "item.croptopia.fried_calamari": "Fried Calamari",
+  "item.croptopia.crab_legs": "Crab Legs",
+  "item.croptopia.steamed_clams": "Steamed Clams",
+  "item.croptopia.grilled_oysters": "Grilled Oysters",
+  "item.croptopia.anchovy": "Anchovy",
+  "item.croptopia.cooked_anchovy": "Cooked Anchovy",
+  "item.croptopia.anchovy_pizza": "Anchovy Pizza",
+  "item.croptopia.mashed_potatoes": "Mashed Potatoes",
+
   "item.croptopia.food_press": "All Purpose Food Press",
   "item.croptopia.frying_pan": "Frying Pan",
   "item.croptopia.cooking_pot": "Cooking Pot",
   "item.croptopia.mortar_and_pestle": "Mortar and Pestle",
   "item.croptopia.guide": "Croptopia",
+
   "item.croptopia.salt_ore": "Salt Ore",
+
   "block.croptopia.salt_ore": "Salt Ore",
   "block.croptopia.apple_crop": "Apple Crop",
   "block.croptopia.banana_crop": "Banana Crop",
@@ -475,10 +522,12 @@
   "block.croptopia.pecan_sapling": "Pecan Sapling",
   "block.croptopia.walnut_sapling": "Walnut Sapling",
   "block.croptopia.cinnamon_sapling": "Cinnamon Sapling",
+
   "block.croptopia.cinnamon_log": "Cinnamon Log",
   "block.croptopia.stripped_cinnamon_log": "Stripped Cinnamon Log",
   "block.croptopia.cinnamon_wood": "Cinnamon Wood",
   "block.croptopia.stripped_cinnamon_wood": "Stripped Cinnamon Wood",
+
   "advancements.croptopia.root.description": " 'You Won't Get Anything Done Hoeing Like That' ",
   "advancements.croptopia.getseed.description": "Break a wild plant to get seeds!",
   "advancements.croptopia.getseed.title": "An Extra Seedy Place",
@@ -518,7 +567,9 @@
   "advancements.croptopia.gather_food.description": "Eat everything there is too eat",
   "advancements.croptopia.knife.title": "Iron Torch",
   "advancements.croptopia.knife.description": "Make a Knife",
+
   "itemGroup.croptopia.croptopia": "Croptopia",
   "itemGroup.croptopia": "Croptopia",
+
   "info.croptopia.seed": "This seed will drop in biomes\n categorized as:"
 }
\ No newline at end of file
diff --git a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
index 605e78cdcc53..8b2fd4ae6227 100644
--- a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
+++ b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
@@ -22,7 +22,7 @@
   "item.croptopia.greenbean": "绿豆",
   "item.croptopia.greenonion": "大葱",
   "item.croptopia.honeydew": "蜜瓜",
-  "item.croptopia.hops": "蛇麻花",
+  "item.croptopia.hops": "啤酒花",
   "item.croptopia.kale": "羽衣甘蓝",
   "item.croptopia.kiwi": "猕猴桃",
   "item.croptopia.leek": "韭葱",
@@ -63,13 +63,13 @@
   "item.croptopia.cucumber_seed": "黄瓜种子",
   "item.croptopia.currant_seed": "醋栗种子",
   "item.croptopia.eggplant_seed": "茄子种子",
-  "item.croptopia.elderberry_seed": "接骨木种子",
+  "item.croptopia.elderberry_seed": "接骨木莓种子",
   "item.croptopia.garlic_seed": "大蒜种子",
   "item.croptopia.grape_seed": "葡萄种子",
   "item.croptopia.greenbean_seed": "绿豆种子",
   "item.croptopia.greenonion_seed": "大葱种子",
   "item.croptopia.honeydew_seed": "蜜瓜种子",
-  "item.croptopia.hops_seed": "蛇麻花种子",
+  "item.croptopia.hops_seed": "啤酒花种子",
   "item.croptopia.kale_seed": "羽衣甘蓝种子",
   "item.croptopia.kiwi_seed": "猕猴桃种子",
   "item.croptopia.leek_seed": "韭葱种子",
@@ -123,13 +123,13 @@
   "item.croptopia.starfruit": "杨桃",
   "item.croptopia.almond": "扁桃仁",
   "item.croptopia.cashew": "腰果",
-  "item.croptopia.pecan": "碧根果",
+  "item.croptopia.pecan": "山核桃",
   "item.croptopia.walnut": "核桃",
   "item.croptopia.avocado": "牛油果",
   "item.croptopia.apricot": "杏子",
   "item.croptopia.pear": "梨",
   "item.croptopia.lime": "青柠",
-  "item.croptopia.date": "海枣",
+  "item.croptopia.date": "枣椰",
   "item.croptopia.mustard": "芥菜",
   "item.croptopia.vanilla": "香草",
   "item.croptopia.paprika": "红辣椒",
@@ -139,6 +139,8 @@
   "item.croptopia.ginger": "姜",
   "item.croptopia.basil": "罗勒",
   "item.croptopia.chile_pepper": "辣椒",
+
+
   "item.croptopia.apple_sapling": "苹果树苗",
   "item.croptopia.banana_sapling": "香蕉树苗",
   "item.croptopia.orange_sapling": "橙子树苗",
@@ -157,19 +159,20 @@
   "item.croptopia.starfruit_sapling": "杨桃树苗",
   "item.croptopia.avocado_sapling": "牛油果树苗",
   "item.croptopia.apricot_sapling": "杏子树苗",
-  "item.croptopia.pear_sapling": "梨树苗",
+  "item.croptopia.pear_sapling": "梨树树苗",
   "item.croptopia.lime_sapling": "青柠树苗",
-  "item.croptopia.date_sapling": "海枣树苗",
+  "item.croptopia.date_sapling": "枣椰树苗",
   "item.croptopia.nectarine_sapling": "油桃树苗",
   "item.croptopia.almond_sapling": "扁桃仁树苗",
   "item.croptopia.cashew_sapling": "腰果树苗",
-  "item.croptopia.pecan_sapling": "碧根果树苗",
+  "item.croptopia.pecan_sapling": "山核桃树苗",
   "item.croptopia.walnut_sapling": "核桃树苗",
+
   "item.croptopia.olive_oil": "橄榄油",
-  "item.croptopia.cheese": "芝士",
+  "item.croptopia.cheese": "奶酪",
   "item.croptopia.flour": "面粉",
   "item.croptopia.dough": "生面团",
-  "item.croptopia.pepperoni": "意大利红肠",
+  "item.croptopia.pepperoni": "意大利香肠",
   "item.croptopia.butter": "黄油",
   "item.croptopia.noodle": "面条",
   "item.croptopia.tofu": "豆腐",
@@ -179,11 +182,11 @@
   "item.croptopia.tortilla": "墨西哥薄饼",
   "item.croptopia.soy_sauce": "酱油",
   "item.croptopia.dumpling": "饺子",
-  "item.croptopia.ravioli": "意大利饺",
+  "item.croptopia.ravioli": "意大利饺子",
   "item.croptopia.salsa": "萨尔萨酱",
   "item.croptopia.artichoke_dip": "洋蓟蘸酱",
   "item.croptopia.grape_juice": "葡萄汁",
-  "item.croptopia.orange_juice": "橙子汁",
+  "item.croptopia.orange_juice": "橙汁",
   "item.croptopia.apple_juice": "苹果汁",
   "item.croptopia.cranberry_juice": "蔓越莓汁",
   "item.croptopia.saguaro_juice": "巨人柱汁",
@@ -191,8 +194,8 @@
   "item.croptopia.melon_juice": "西瓜汁",
   "item.croptopia.pineapple_juice": "菠萝汁",
   "item.croptopia.coffee": "咖啡",
-  "item.croptopia.lemonade": "柠檬汁",
-  "item.croptopia.limeade": "青柠汁",
+  "item.croptopia.lemonade": "柠檬水",
+  "item.croptopia.limeade": "青柠水",
   "item.croptopia.soy_milk": "豆奶",
   "item.croptopia.strawberry_smoothie": "草莓冰沙",
   "item.croptopia.banana_smoothie": "香蕉冰沙",
@@ -204,62 +207,62 @@
   "item.croptopia.mead": "蜂蜜酒",
   "item.croptopia.rum": "朗姆酒",
   "item.croptopia.pumpkin_spice_latte": "南瓜拿铁",
-  "item.croptopia.grape_jam": "葡萄酱",
-  "item.croptopia.strawberry_jam": "草莓酱",
-  "item.croptopia.peach_jam": "桃子酱",
-  "item.croptopia.apricot_jam": "杏子酱",
-  "item.croptopia.blackberry_jam": "黑莓酱",
-  "item.croptopia.blueberry_jam": "蓝莓酱",
-  "item.croptopia.cherry_jam": "樱桃酱",
-  "item.croptopia.elderberry_jam": "接骨木酱",
-  "item.croptopia.raspberry_jam": "树莓酱",
+  "item.croptopia.grape_jam": "葡萄果酱",
+  "item.croptopia.strawberry_jam": "草莓果酱",
+  "item.croptopia.peach_jam": "桃子果酱",
+  "item.croptopia.apricot_jam": "杏子果酱",
+  "item.croptopia.blackberry_jam": "黑莓果酱",
+  "item.croptopia.blueberry_jam": "蓝莓果酱",
+  "item.croptopia.cherry_jam": "樱桃果酱",
+  "item.croptopia.elderberry_jam": "接骨木莓果酱",
+  "item.croptopia.raspberry_jam": "树莓果酱",
   "item.croptopia.beef_jerky": "牛肉干",
   "item.croptopia.pork_jerky": "猪肉干",
   "item.croptopia.kale_chips": "羽衣甘蓝片",
   "item.croptopia.potato_chips": "薯片",
   "item.croptopia.steamed_rice": "米饭",
   "item.croptopia.egg_roll": "蛋卷",
-  "item.croptopia.french_fries": "炸薯条",
-  "item.croptopia.sweet_potato_fries": "烤红薯",
+  "item.croptopia.french_fries": "薯条",
+  "item.croptopia.sweet_potato_fries": "红薯条",
   "item.croptopia.onion_rings": "洋葱圈",
   "item.croptopia.raisins": "葡萄干",
   "item.croptopia.doughnut": "甜甜圈",
   "item.croptopia.popcorn": "爆米花",
-  "item.croptopia.baked_beans": "焗豆",
+  "item.croptopia.baked_beans": "烘豆",
   "item.croptopia.toast": "吐司",
-  "item.croptopia.cucumber_salad": "黄瓜沙拉",
+  "item.croptopia.cucumber_salad": "南瓜沙拉",
   "item.croptopia.caesar_salad": "凯撒沙拉",
   "item.croptopia.leafy_salad": "绿叶沙拉",
   "item.croptopia.fruit_salad": "水果沙拉",
   "item.croptopia.veggie_salad": "蔬菜沙拉",
   "item.croptopia.pork_and_beans": "猪肉炖豆",
-  "item.croptopia.oatmeal": "燕麦片",
+  "item.croptopia.oatmeal": "燕麦粥",
   "item.croptopia.leek_soup": "韭葱汤",
   "item.croptopia.yoghurt": "酸奶",
-  "item.croptopia.saucy_chips": "调味薯片",
+  "item.croptopia.saucy_chips": "蘸酱薯片",
   "item.croptopia.scrambled_eggs": "炒蛋",
   "item.croptopia.buttered_toast": "黄油吐司",
-  "item.croptopia.toast_with_jam": "蘸酱吐司",
+  "item.croptopia.toast_with_jam": "果酱吐司",
   "item.croptopia.ham_sandwich": "火腿三明治",
-  "item.croptopia.peanut_butter_and_jam": "花生果酱三明治",
+  "item.croptopia.peanut_butter_and_jam": "花生酱果酱三明治",
   "item.croptopia.blt": "培根生菜番茄三明治",
-  "item.croptopia.grilled_cheese": "烤芝士",
+  "item.croptopia.grilled_cheese": "烤奶酪三明治",
   "item.croptopia.tuna_sandwich": "金枪鱼三明治",
   "item.croptopia.cheeseburger": "芝士汉堡",
   "item.croptopia.hamburger": "汉堡",
   "item.croptopia.tofuburger": "豆腐汉堡",
   "item.croptopia.pizza": "披萨",
   "item.croptopia.supreme_pizza": "至尊披萨",
-  "item.croptopia.cheese_pizza": "芝士披萨",
-  "item.croptopia.pineapple_pepperoni_pizza": "夏威夷菠萝红肠披萨",
+  "item.croptopia.cheese_pizza": "奶酪披萨",
+  "item.croptopia.pineapple_pepperoni_pizza": "菠萝红肠披萨",
   "item.croptopia.lemon_chicken": "柠檬鸡",
   "item.croptopia.fried_chicken": "炸鸡",
-  "item.croptopia.chicken_and_noodles": "鸡肉面",
-  "item.croptopia.chicken_and_dumplings": "鸡肉饺子",
+  "item.croptopia.chicken_and_noodles": "鸡汤面",
+  "item.croptopia.chicken_and_dumplings": "鸡肉饺子汤",
   "item.croptopia.tofu_and_dumplings": "豆腐饺子汤",
   "item.croptopia.spaghetti_squash": "倭瓜意面",
-  "item.croptopia.chicken_and_rice": "鸡米饭",
-  "item.croptopia.taco": "墨西哥卷饼",
+  "item.croptopia.chicken_and_rice": "鸡肉饭",
+  "item.croptopia.taco": "塔可饼",
   "item.croptopia.sushi": "寿司",
   "item.croptopia.apple_pie": "苹果派",
   "item.croptopia.yam_jam": "山药酱",
@@ -268,54 +271,58 @@
   "item.croptopia.vanilla_ice_cream": "香草冰淇淋",
   "item.croptopia.strawberry_ice_cream": "草莓冰淇淋",
   "item.croptopia.mango_ice_cream": "芒果冰淇淋",
-  "item.croptopia.rum_raisin_ice_cream": "朗姆葡萄冰淇淋",
+  "item.croptopia.rum_raisin_ice_cream": "朗姆葡萄干冰淇淋",
   "item.croptopia.cherry_pie": "樱桃派",
   "item.croptopia.cheese_cake": "芝士蛋糕",
   "item.croptopia.brownies": "布朗尼",
-  "item.croptopia.snicker_doodle": "肉桂饼",
-  "item.croptopia.banana_nut_bread": "香蕉果仁面包",
-  "item.croptopia.almond_brittle": "杏仁脆",
-  "item.croptopia.candied_nuts": "蜜饯",
+  "item.croptopia.snicker_doodle": "肉桂饼干",
+  "item.croptopia.banana_nut_bread": "香蕉坚果面包",
+  "item.croptopia.almond_brittle": "扁桃仁脆饼",
+  "item.croptopia.candied_nuts": "果仁蜜饯",
   "item.croptopia.cashew_chicken": "腰果鸡丁",
   "item.croptopia.nougat": "牛轧糖",
-  "item.croptopia.nutty_cookie": "坚果曲奇饼干",
-  "item.croptopia.pecan_ice_cream": "美洲山核桃冰淇淋",
-  "item.croptopia.pecan_pie": "美洲山核桃派",
+  "item.croptopia.nutty_cookie": "坚果曲奇",
+  "item.croptopia.pecan_ice_cream": "山核桃冰淇淋",
+  "item.croptopia.pecan_pie": "山核桃派",
   "item.croptopia.protein_bar": "蛋白棒",
-  "item.croptopia.raisin_oatmeal_cookie": "葡萄干燕麦曲奇饼干",
+  "item.croptopia.raisin_oatmeal_cookie": "葡萄干燕麦曲奇",
   "item.croptopia.roasted_nuts": "烤坚果",
   "item.croptopia.trail_mix": "什锦果仁",
+
   "item.croptopia.burrito": "墨西哥卷饼",
-  "item.croptopia.tostada": "托斯它达玉米饼",
+  "item.croptopia.tostada": "墨西哥配菜玉米饼",
   "item.croptopia.horchata": "奥查塔",
-  "item.croptopia.carnitas": "墨西哥小肉",
-  "item.croptopia.fajitas": "墨西哥肉菜卷饼",
-  "item.croptopia.enchilada": "墨西哥辣肉馅玉米卷",
-  "item.croptopia.churros": "油条",
+  "item.croptopia.carnitas": "墨西哥煎肉",
+  "item.croptopia.fajitas": "墨西哥烤肉卷饼",
+  "item.croptopia.enchilada": "墨西哥辣肉卷饼",
+  "item.croptopia.churros": "墨西哥油条",
   "item.croptopia.tamales": "墨西哥玉米粽",
   "item.croptopia.tres_leche_cake": "三奶蛋糕",
-  "item.croptopia.stuffed_poblanos": "镶填墨西哥辣椒",
-  "item.croptopia.chili_relleno": "墨西哥爆浆芝士辣椒",
+  "item.croptopia.stuffed_poblanos": "墨西哥填馅辣椒",
+  "item.croptopia.chili_relleno": "墨西哥塞蛋辣椒",
   "item.croptopia.crema": "咖啡油脂",
   "item.croptopia.refried_beans": "炸豆泥",
-  "item.croptopia.chimichanga": "墨西哥油煎面卷饼",
-  "item.croptopia.quesadilla": "墨西哥起司薄饼",
-  "item.croptopia.cinnamon": "桂皮",
+  "item.croptopia.chimichanga": "墨西哥炸卷饼",
+  "item.croptopia.quesadilla": "墨西哥奶酪薄饼",
+
+  "item.croptopia.cinnamon": "肉桂",
   "item.croptopia.corn_husk": "玉米皮",
-  "item.croptopia.whipping_cream": "打发的奶油",
+  "item.croptopia.whipping_cream": "打发奶油",
   "item.croptopia.vanilla_seeds": "香草籽",
-  "item.croptopia.cinnamon_sapling": "桂皮树苗",
-  "item.croptopia.cinnamon_log": "桂皮原木",
-  "item.croptopia.stripped_cinnamon_log": "去皮桂皮原木",
-  "item.croptopia.cinnamon_wood": "桂皮木",
-  "item.croptopia.stripped_cinnamon_wood": "去皮桂皮木",
+
+  "item.croptopia.cinnamon_sapling": "肉桂树苗",
+  "item.croptopia.cinnamon_log": "肉桂原木",
+  "item.croptopia.stripped_cinnamon_log": "去皮肉桂原木",
+  "item.croptopia.cinnamon_wood": "肉桂木",
+  "item.croptopia.stripped_cinnamon_wood": "去皮肉桂木",
+
   "item.croptopia.shepherds_pie": "牧羊人派",
   "item.croptopia.beef_wellington": "惠灵顿牛排",
   "item.croptopia.fish_and_chips": "炸鱼薯条",
   "item.croptopia.eton_mess": "伊顿麦斯",
   "item.croptopia.tea": "茶",
   "item.croptopia.cornish_pasty": "康沃尔馅饼",
-  "item.croptopia.scones": "茶饼",
+  "item.croptopia.scones": "司康饼",
   "item.croptopia.figgy_pudding": "无花果布丁",
   "item.croptopia.treacle_tart": "糖浆挞",
   "item.croptopia.sticky_toffee_pudding": "太妃布丁",
@@ -323,96 +330,171 @@
   "item.croptopia.water_bottle": "水瓶",
   "item.croptopia.milk_bottle": "奶瓶",
   "item.croptopia.tea_leaves": "茶叶",
-  "item.croptopia.tea_seed": "茶种子",
+  "item.croptopia.tea_seed": "茶籽",
+
+  "item.croptopia.ajvar": "茄子甜椒酱",
+  "item.croptopia.ajvar_toast": "茄子甜椒酱吐司",
+  "item.croptopia.avocado_toast": "牛油果酱吐司",
+  "item.croptopia.baked_sweet_potato": "烤红薯",
+  "item.croptopia.baked_yam": "烤山药",
+  "item.croptopia.beef_stew": "牛肉炖菜",
+  "item.croptopia.beef_stir_fry": "牛肉煸蔬菜",
+  "item.croptopia.buttered_green_beans": "黄油炒绿豆",
+  "item.croptopia.cheesy_asparagus": "奶酪芦笋",
+  "item.croptopia.chocolate_ice_cream": "巧克力冰淇淋",
+  "item.croptopia.cooked_bacon": "熟培根",
+  "item.croptopia.eggplant_parmesan": "帕玛森茄子",
+  "item.croptopia.fruit_cake": "水果蛋糕",
+  "item.croptopia.grilled_eggplant": "烤茄子片",
+  "item.croptopia.kiwi_sorbet": "猕猴桃雪葩",
+  "item.croptopia.knife": "刀",
+  "item.croptopia.lemon_coconut_bar": "柠檬椰子棒",
+  "item.croptopia.nether_wart_stew": "下界疣炖菜",
+  "item.croptopia.peanut_butter": "花生酱",
+  "item.croptopia.peanut_butter_with_celery": "芹菜配花生酱",
+  "item.croptopia.potato_soup": "马铃薯汤",
+  "item.croptopia.ratatouille": "法式蔬菜杂烩",
+  "item.croptopia.bacon": "培根",
+  "item.croptopia.rhubarb_crisp": "大黄酥",
+  "item.croptopia.rhubarb_pie": "大黄派",
+  "item.croptopia.roasted_asparagus": "烤芦笋",
+  "item.croptopia.roasted_radishes": "烤小萝卜",
+  "item.croptopia.roasted_squash": "烤倭瓜",
+  "item.croptopia.roasted_turnips": "烤芜菁",
+  "item.croptopia.steamed_broccoli": "蒸西兰花",
+  "item.croptopia.steamed_green_beans": "蒸绿豆",
+  "item.croptopia.stir_fry": "干煸蔬菜",
+  "item.croptopia.stuffed_artichoke": "填馅洋蓟",
+  "item.croptopia.toast_sandwich": "吐司三明治",
+
+  "item.croptopia.roasted_pumpkin_seeds": "烤南瓜子",
+  "item.croptopia.roasted_sunflower_seeds": "烤葵花籽",
+  "item.croptopia.pumpkin_bars": "南瓜条",
+  "item.croptopia.corn_bread": "玉米面包",
+  "item.croptopia.pumpkin_soup": "南瓜汤",
+  "item.croptopia.meringue": "蛋白酥",
+  "item.croptopia.cabbage_roll": "卷心菜卷",
+  "item.croptopia.borscht": "罗宋汤",
+  "item.croptopia.goulash": "红烩牛肉",
+  "item.croptopia.beetroot_salad": "甜菜沙拉",
+  "item.croptopia.candied_kumquats": "金橘蜜饯",
+  "item.croptopia.shrimp": "虾",
+  "item.croptopia.tuna": "金枪鱼",
+  "item.croptopia.calamari": "鱿鱼须",
+  "item.croptopia.crab": "螃蟹",
+  "item.croptopia.roe": "鱼子",
+  "item.croptopia.clam": "蛤蜊",
+  "item.croptopia.oyster": "牡蛎",
+  "item.croptopia.cooked_shrimp": "熟虾",
+  "item.croptopia.cooked_tuna": "熟金枪鱼",
+  "item.croptopia.cooked_calamari": "熟鱿鱼须",
+  "item.croptopia.steamed_crab": "蒸螃蟹",
+  "item.croptopia.glowing_calamari": "发光鱿鱼须",
+  "item.croptopia.sea_lettuce": "海白菜",
+  "item.croptopia.deep_fried_shrimp": "炸虾",
+  "item.croptopia.tuna_roll": "金枪鱼寿司卷",
+  "item.croptopia.fried_calamari": "煎鱿鱼",
+  "item.croptopia.crab_legs": "蟹腿",
+  "item.croptopia.steamed_clams": "蒸蛤蜊",
+  "item.croptopia.grilled_oysters": "烤牡蛎",
+  "item.croptopia.anchovy": "鳀鱼",
+  "item.croptopia.cooked_anchovy": "熟鳀鱼",
+  "item.croptopia.anchovy_pizza": "鳀鱼披萨",
+  "item.croptopia.mashed_potatoes": "马铃薯泥",
+
   "item.croptopia.food_press": "多功能食品压榨机",
   "item.croptopia.frying_pan": "平底锅",
   "item.croptopia.cooking_pot": "烹饪锅",
   "item.croptopia.mortar_and_pestle": "研钵",
-  "item.croptopia.guide": "Croptopia",
+  "item.croptopia.guide": "作物盛景",
+
   "item.croptopia.salt_ore": "盐矿石",
+
   "block.croptopia.salt_ore": "盐矿石",
-  "block.croptopia.apple_crop": "苹果作物",
-  "block.croptopia.banana_crop": "香蕉作物",
-  "block.croptopia.orange_crop": "橙子作物",
-  "block.croptopia.persimmon_crop": "柿子作物",
-  "block.croptopia.plum_crop": "李子作物",
-  "block.croptopia.cherry_crop": "樱桃作物",
-  "block.croptopia.lemon_crop": "柠檬作物",
-  "block.croptopia.grapefruit_crop": "葡萄柚作物",
-  "block.croptopia.kumquat_crop": "金橘作物",
-  "block.croptopia.peach_crop": "桃子作物",
-  "block.croptopia.coconut_crop": "椰子作物",
-  "block.croptopia.nutmeg_crop": "肉豆蔻作物",
-  "block.croptopia.fig_crop": "无花果作物",
-  "block.croptopia.nectarine_crop": "油桃作物",
-  "block.croptopia.mango_crop": "芒果作物",
-  "block.croptopia.dragonfruit_crop": "火龙果作物",
-  "block.croptopia.starfruit_crop": "杨桃作物",
-  "block.croptopia.avocado_crop": "牛油果作物",
-  "block.croptopia.apricot_crop": "杏子作物",
-  "block.croptopia.pear_crop": "梨作物",
-  "block.croptopia.lime_crop": "青柠作物",
-  "block.croptopia.date_crop": "海枣作物",
-  "block.croptopia.almond_crop": "扁桃仁作物",
-  "block.croptopia.cashew_crop": "腰果作物",
-  "block.croptopia.pecan_crop": "碧根果作物",
-  "block.croptopia.walnut_crop": "核桃作物",
-  "block.croptopia.artichoke_crop": "洋蓟作物",
-  "block.croptopia.asparagus_crop": "芦笋作物",
-  "block.croptopia.barley_crop": "大麦作物",
-  "block.croptopia.basil_crop": "罗勒作物",
-  "block.croptopia.bellpepper_crop": "甜椒作物",
-  "block.croptopia.blackbean_crop": "黑豆作物",
-  "block.croptopia.blackberry_crop": "黑莓作物",
-  "block.croptopia.blueberry_crop": "蓝莓作物",
-  "block.croptopia.broccoli_crop": "西兰花作物",
-  "block.croptopia.cabbage_crop": "卷心菜作物",
-  "block.croptopia.cantaloupe_crop": "哈密瓜作物",
-  "block.croptopia.cauliflower_crop": "花椰菜作物",
-  "block.croptopia.celery_crop": "芹菜作物",
-  "block.croptopia.coffee_crop": "咖啡作物",
-  "block.croptopia.corn_crop": "玉米作物",
-  "block.croptopia.cranberry_crop": "蔓越莓作物",
-  "block.croptopia.cucumber_crop": "黄瓜作物",
-  "block.croptopia.currant_crop": "醋栗作物",
-  "block.croptopia.eggplant_crop": "茄子作物",
-  "block.croptopia.elderberry_crop": "接骨木作物",
-  "block.croptopia.garlic_crop": "大蒜作物",
-  "block.croptopia.ginger_crop": "姜作物",
-  "block.croptopia.grape_crop": "葡萄作物",
-  "block.croptopia.greenbean_crop": "绿豆作物",
-  "block.croptopia.greenonion_crop": "大葱作物",
-  "block.croptopia.honeydew_crop": "蜜瓜作物",
-  "block.croptopia.hops_crop": "蛇麻花作物",
-  "block.croptopia.kale_crop": "羽衣甘蓝作物",
-  "block.croptopia.kiwi_crop": "猕猴桃作物",
-  "block.croptopia.leek_crop": "韭葱作物",
-  "block.croptopia.lettuce_crop": "生菜作物",
-  "block.croptopia.mustard_crop": "芥菜作物",
-  "block.croptopia.oat_crop": "燕麦作物",
-  "block.croptopia.olive_crop": "橄榄作物",
-  "block.croptopia.onion_crop": "洋葱作物",
-  "block.croptopia.peanut_crop": "花生作物",
-  "block.croptopia.chile_pepper_crop": "辣椒作物",
-  "block.croptopia.pineapple_crop": "菠萝作物",
-  "block.croptopia.radish_crop": "小萝卜作物",
-  "block.croptopia.raspberry_crop": "树莓作物",
-  "block.croptopia.rhubarb_crop": "大黄作物",
-  "block.croptopia.rice_crop": "大米作物",
-  "block.croptopia.rutabaga_crop": "芜菁甘蓝作物",
-  "block.croptopia.saguaro_crop": "巨人柱作物",
-  "block.croptopia.soybean_crop": "黄豆作物",
-  "block.croptopia.spinach_crop": "菠菜作物",
-  "block.croptopia.squash_crop": "倭瓜作物",
-  "block.croptopia.strawberry_crop": "草莓作物",
-  "block.croptopia.sweetpotato_crop": "红薯作物",
-  "block.croptopia.tomatillo_crop": "酸浆果作物",
-  "block.croptopia.tomato_crop": "番茄作物",
-  "block.croptopia.turmeric_crop": "姜黄作物",
-  "block.croptopia.turnip_crop": "芜菁作物",
-  "block.croptopia.yam_crop": "山药作物",
-  "block.croptopia.zucchini_crop": "西葫芦作物",
-  "block.croptopia.vanilla_crop": "香草作物",
+  "block.croptopia.apple_crop": "苹果",
+  "block.croptopia.banana_crop": "香蕉",
+  "block.croptopia.orange_crop": "橙子",
+  "block.croptopia.persimmon_crop": "柿子",
+  "block.croptopia.plum_crop": "李子",
+  "block.croptopia.cherry_crop": "樱桃",
+  "block.croptopia.lemon_crop": "柠檬",
+  "block.croptopia.grapefruit_crop": "葡萄柚",
+  "block.croptopia.kumquat_crop": "金橘",
+  "block.croptopia.peach_crop": "桃子",
+  "block.croptopia.coconut_crop": "椰子",
+  "block.croptopia.nutmeg_crop": "肉豆蔻",
+  "block.croptopia.fig_crop": "无花果",
+  "block.croptopia.nectarine_crop": "油桃",
+  "block.croptopia.mango_crop": "芒果",
+  "block.croptopia.dragonfruit_crop": "火龙果",
+  "block.croptopia.starfruit_crop": "杨桃",
+  "block.croptopia.avocado_crop": "牛油果",
+  "block.croptopia.apricot_crop": "杏子",
+  "block.croptopia.pear_crop": "梨",
+  "block.croptopia.lime_crop": "青柠",
+  "block.croptopia.date_crop": "枣椰",
+  "block.croptopia.almond_crop": "扁桃仁",
+  "block.croptopia.cashew_crop": "腰果",
+  "block.croptopia.pecan_crop": "山核桃",
+  "block.croptopia.walnut_crop": "核桃",
+  "block.croptopia.artichoke_crop": "洋蓟",
+  "block.croptopia.asparagus_crop": "芦笋",
+  "block.croptopia.barley_crop": "大麦",
+  "block.croptopia.basil_crop": "罗勒",
+  "block.croptopia.bellpepper_crop": "甜椒",
+  "block.croptopia.blackbean_crop": "黑豆",
+  "block.croptopia.blackberry_crop": "黑莓",
+  "block.croptopia.blueberry_crop": "蓝莓",
+  "block.croptopia.broccoli_crop": "西兰花",
+  "block.croptopia.cabbage_crop": "卷心菜",
+  "block.croptopia.cantaloupe_crop": "哈密瓜",
+  "block.croptopia.cauliflower_crop": "花椰菜",
+  "block.croptopia.celery_crop": "芹菜",
+  "block.croptopia.coffee_crop": "咖啡",
+  "block.croptopia.corn_crop": "玉米",
+  "block.croptopia.cranberry_crop": "蔓越莓",
+  "block.croptopia.cucumber_crop": "黄瓜",
+  "block.croptopia.currant_crop": "醋栗",
+  "block.croptopia.eggplant_crop": "茄子",
+  "block.croptopia.elderberry_crop": "接骨木莓",
+  "block.croptopia.garlic_crop": "大蒜",
+  "block.croptopia.ginger_crop": "姜",
+  "block.croptopia.grape_crop": "葡萄",
+  "block.croptopia.greenbean_crop": "绿豆",
+  "block.croptopia.greenonion_crop": "大葱",
+  "block.croptopia.honeydew_crop": "蜜瓜",
+  "block.croptopia.hops_crop": "啤酒花",
+  "block.croptopia.kale_crop": "羽衣甘蓝",
+  "block.croptopia.kiwi_crop": "猕猴桃",
+  "block.croptopia.leek_crop": "韭葱",
+  "block.croptopia.lettuce_crop": "生菜",
+  "block.croptopia.mustard_crop": "芥菜",
+  "block.croptopia.oat_crop": "燕麦",
+  "block.croptopia.olive_crop": "橄榄",
+  "block.croptopia.onion_crop": "洋葱",
+  "block.croptopia.peanut_crop": "花生",
+  "block.croptopia.chile_pepper_crop": "辣椒",
+  "block.croptopia.pineapple_crop": "菠萝",
+  "block.croptopia.radish_crop": "小萝卜",
+  "block.croptopia.raspberry_crop": "树莓",
+  "block.croptopia.rhubarb_crop": "大黄",
+  "block.croptopia.rice_crop": "大米",
+  "block.croptopia.rutabaga_crop": "芜菁甘蓝",
+  "block.croptopia.saguaro_crop": "巨人柱",
+  "block.croptopia.soybean_crop": "黄豆",
+  "block.croptopia.spinach_crop": "菠菜",
+  "block.croptopia.squash_crop": "倭瓜",
+  "block.croptopia.strawberry_crop": "草莓",
+  "block.croptopia.sweetpotato_crop": "红薯",
+  "block.croptopia.tomatillo_crop": "酸浆果",
+  "block.croptopia.tomato_crop": "番茄",
+  "block.croptopia.turmeric_crop": "姜黄",
+  "block.croptopia.turnip_crop": "芜菁",
+  "block.croptopia.yam_crop": "山药",
+  "block.croptopia.zucchini_crop": "西葫芦",
+  "block.croptopia.pepper_crop": "胡椒",
+  "block.croptopia.vanilla_crop": "香草",
+  "block.croptopia.tea_crop": "茶",
   "block.croptopia.apple_sapling": "苹果树苗",
   "block.croptopia.banana_sapling": "香蕉树苗",
   "block.croptopia.orange_sapling": "橙子树苗",
@@ -432,18 +514,62 @@
   "block.croptopia.starfruit_sapling": "杨桃树苗",
   "block.croptopia.avocado_sapling": "牛油果树苗",
   "block.croptopia.apricot_sapling": "杏子树苗",
-  "block.croptopia.pear_sapling": "梨树苗",
+  "block.croptopia.pear_sapling": "梨树树苗",
   "block.croptopia.lime_sapling": "青柠树苗",
-  "block.croptopia.date_sapling": "海枣树苗",
+  "block.croptopia.date_sapling": "枣椰树苗",
   "block.croptopia.almond_sapling": "扁桃仁树苗",
   "block.croptopia.cashew_sapling": "腰果树苗",
-  "block.croptopia.pecan_sapling": "碧根果树苗",
+  "block.croptopia.pecan_sapling": "山核桃树苗",
   "block.croptopia.walnut_sapling": "核桃树苗",
   "block.croptopia.cinnamon_sapling": "桂皮树苗",
-  "block.croptopia.cinnamon_log": "桂皮原木",
-  "block.croptopia.stripped_cinnamon_log": "去皮桂皮原木",
-  "block.croptopia.cinnamon_wood": "桂皮木",
-  "block.croptopia.stripped_cinnamon_wood": "去皮桂皮木",
-  "itemGroup.croptopia.croptopia": "Croptopia",
-  "itemGroup.croptopia": "作物盛景"
+
+  "block.croptopia.cinnamon_log": "肉桂原木",
+  "block.croptopia.stripped_cinnamon_log": "去皮肉桂原木",
+  "block.croptopia.cinnamon_wood": "肉桂木",
+  "block.croptopia.stripped_cinnamon_wood": "去皮肉桂木",
+
+  "advancements.croptopia.root.description": "光埋头种地就啥都搞不定",
+  "advancements.croptopia.getseed.description": "破坏一个野生植物来获得种子！",
+  "advancements.croptopia.getseed.title": "额外的种子",
+  "advancements.croptopia.getsapling.title": "森林和土地",
+  "advancements.croptopia.getsapling.description": "收集一些果实来合成果树",
+  "advancements.croptopia.pot.title": "进锅！",
+  "advancements.croptopia.pot.description": "制作一个烹饪锅",
+  "advancements.croptopia.frying_pan.title": "并不能当成武器",
+  "advancements.croptopia.frying_pan.description": "制作一个平底锅",
+  "advancements.croptopia.food_press.title": "搅拌",
+  "advancements.croptopia.food_press.description": "制作一个多功能食品压榨机",
+  "advancements.croptopia.mortar_and_pestle.title": "致命武器——对食材来说",
+  "advancements.croptopia.mortar_and_pestle.description": "制作一个研钵",
+  "advancements.croptopia.eatbig.title": "真的塞满了",
+  "advancements.croptopia.eatbig.description": "食用任意一种由五种或更多材料烹饪的食物",
+  "advancements.croptopia.eatcrafted.title": "丰盛的食物",
+  "advancements.croptopia.eatcrafted.description": "食用任意一种食物",
+  "advancements.croptopia.gather_desert.title": "尚未风干的种子",
+  "advancements.croptopia.gather_desert.description": "收集所有来自沙漠群系的种子",
+  "advancements.croptopia.gather_savanna.title": "燥热的种子",
+  "advancements.croptopia.gather_savanna.description": "收集所有来自热带草原群系的种子",
+  "advancements.croptopia.gather_forest.title": "轻量版树苗",
+  "advancements.croptopia.gather_forest.description": "收集所有来自森林群系的种子",
+  "advancements.croptopia.gather_jungle.title": "野生的种子",
+  "advancements.croptopia.gather_jungle.description": "收集所有来自丛林群系的种子",
+  "advancements.croptopia.gather_plains.title": "平凡的种子",
+  "advancements.croptopia.gather_plains.description": "收集所有来自平原群系的种子",
+  "advancements.croptopia.gather_swamp.title": "潮湿的种子",
+  "advancements.croptopia.gather_swamp.description": "收集所有来自沼泽群系的种子",
+  "advancements.croptopia.gather_all.title": "种子库",
+  "advancements.croptopia.gather_all.description": "集齐所有作物盛景的种子",
+  "advancements.croptopia.getdrinks.title": "花哨的水",
+  "advancements.croptopia.getdrinks.description": "制作任意一种饮品",
+  "advancements.croptopia.gather_drinks.title": "单调鸡尾酒",
+  "advancements.croptopia.gather_drinks.description": "喝下所有饮品",
+  "advancements.croptopia.gather_food.title": "美食评论家",
+  "advancements.croptopia.gather_food.description": "尝遍所有食物",
+  "advancements.croptopia.knife.title": "铁火把",
+  "advancements.croptopia.knife.description": "制作一把刀",
+
+  "itemGroup.croptopia.croptopia": "作物盛景",
+  "itemGroup.croptopia": "作物盛景",
+
+  "info.croptopia.seed": "这种种子会在\n以下生物群系中掉落："
 }
\ No newline at end of file
diff --git a/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/en_us.json b/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/en_us.json
new file mode 100644
index 000000000000..c1b9fbd75a38
--- /dev/null
+++ b/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/en_us.json
@@ -0,0 +1,48 @@
+{
+  "item.cacao.cacao_nibs" : "Cacao Nibs",
+  "item.cacao.cacao_mass_bucket" : "Cacao Mass Bucket",
+  "item.cacao.cacao_mass_bottle" : "Cacao Mass Bottle",
+  "item.cacao.cacao_butter_bottle" : "Cacao Butter Bottle",
+  "item.cacao.cocoa_powder" : "Cocoa Powder",
+  "item.cacao.silicon_dust" : "Silicon Dust",
+  "item.cacao.silicon_mold" : "Silicon Mold",
+  "item.cacao.filter_cloth" : "Filter Cloth",
+  "item.cacao.cacao_mass_filled_cloth" : "Cacao Mass Filled Cloth",
+  "item.cacao.pressed_cocoa_cone": "Pressed Cocoa Cone",
+  "item.cacao.manual_food_grinder" : "Manual Food Grinder",
+  "item.cacao.dark_chocolate" : "Dark Chocolate",
+  "item.cacao.caramel_dark_chocolate" : "Caramel Dark Chocolate",
+  "item.cacao.praline_dark_chocolate" : "Praline Dark Chocolate",
+  "item.cacao.strawberry_cream_dark_chocolate" : "Strawberry Cream Dark Chocolate",
+  "item.cacao.cookie_cream_dark_chocolate" : "Cookie Cream Dark Chocolate",
+  "item.cacao.mixed_nuts_dark_chocolate" : "Mixed Nuts Dark Chocolate",
+  "item.cacao.coconut_dark_chocolate" : "Coconut Dark Chocolate",
+  "item.cacao.peanut_butter_dark_chocolate" : "Peanut Butter Dark Chocolate",
+  "item.cacao.milk_chocolate" : "Milk Chocolate",
+  "item.cacao.caramel_milk_chocolate" : "Caramel Milk Chocolate",
+  "item.cacao.praline_milk_chocolate" : "Praline Milk Chocolate",
+  "item.cacao.strawberry_cream_milk_chocolate" : "Strawberry Cream Milk Chocolate",
+  "item.cacao.cookie_cream_milk_chocolate" : "Cookie Cream Milk Chocolate",
+  "item.cacao.mixed_nuts_milk_chocolate" : "Mixed Nuts Milk Chocolate",
+  "item.cacao.coconut_milk_chocolate" : "Coconut Milk Chocolate",
+  "item.cacao.peanut_butter_milk_chocolate" : "Peanut Butter Milk Chocolate",
+  "item.cacao.white_chocolate" : "White Chocolate",
+  "item.cacao.caramel_white_chocolate" : "Caramel White Chocolate",
+  "item.cacao.praline_white_chocolate" : "Praline White Chocolate",
+  "item.cacao.strawberry_cream_white_chocolate" : "Strawberry Cream White Chocolate",
+  "item.cacao.cookie_cream_white_chocolate" : "Cookie Cream White Chocolate",
+  "item.cacao.mixed_nuts_white_chocolate" : "Mixed Nuts White Chocolate",
+  "item.cacao.coconut_white_chocolate" : "Coconut White Chocolate",
+  "item.cacao.peanut_butter_white_chocolate" : "Peanut Butter White Chocolate",
+  "item.cacao.golden_chocolate" : "Golden Chocolate",
+  "item.cacao.dark_chocolate_covered_apple" : "Dark Chocolate Covered Apple",
+  "item.cacao.milk_chocolate_covered_apple" : "Milk Chocolate Covered Apple",
+  "item.cacao.white_chocolate_covered_apple" : "White Chocolate Covered Apple",
+  "item.cacao.white_chips_cookie" : "White Chips Cookie",
+  "item.cacao.white_chips_chocolate_cookie" : "White Chips Chocolate Cookie",
+  "item.cacao.dark_chips_chocolate_cookie" : "Dark Chips Chocolate Cookie",
+  "item.cacao.nutella" : "Nutella",
+
+  "block.cacao.chocolate_cake" : "Chocolate Cake",
+  "itemGroup.cacao" : "Croptopia's Chocclaterie"
+}
\ No newline at end of file
diff --git a/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/zh_cn.json b/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/zh_cn.json
new file mode 100644
index 000000000000..dea326e93ade
--- /dev/null
+++ b/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/zh_cn.json
@@ -0,0 +1,48 @@
+{
+  "item.cacao.cacao_nibs" : "可可粒",
+  "item.cacao.cacao_mass_bucket" : "可可膏桶",
+  "item.cacao.cacao_mass_bottle" : "可可膏瓶",
+  "item.cacao.cacao_butter_bottle" : "可可脂瓶",
+  "item.cacao.cocoa_powder" : "可可粉",
+  "item.cacao.silicon_dust" : "硅粉",
+  "item.cacao.silicon_mold" : "硅模具",
+  "item.cacao.filter_cloth" : "滤布",
+  "item.cacao.cacao_mass_filled_cloth" : "装满可可膏的滤布",
+  "item.cacao.pressed_cocoa_cone": "锥形压制可可膏",
+  "item.cacao.manual_food_grinder" : "手动食品研磨机",
+  "item.cacao.dark_chocolate" : "黑巧克力",
+  "item.cacao.caramel_dark_chocolate" : "焦糖黑巧克力",
+  "item.cacao.praline_dark_chocolate" : "扁桃仁黑巧克力",
+  "item.cacao.strawberry_cream_dark_chocolate" : "草莓奶油黑巧克力",
+  "item.cacao.cookie_cream_dark_chocolate" : "曲奇奶油黑巧克力",
+  "item.cacao.mixed_nuts_dark_chocolate" : "果仁黑巧克力",
+  "item.cacao.coconut_dark_chocolate" : "椰子黑巧克力",
+  "item.cacao.peanut_butter_dark_chocolate" : "花生酱黑巧克力",
+  "item.cacao.milk_chocolate" : "牛奶巧克力",
+  "item.cacao.caramel_milk_chocolate" : "焦糖牛奶巧克力",
+  "item.cacao.praline_milk_chocolate" : "扁桃仁牛奶巧克力",
+  "item.cacao.strawberry_cream_milk_chocolate" : "草莓奶油牛奶巧克力",
+  "item.cacao.cookie_cream_milk_chocolate" : "曲奇奶油牛奶巧克力",
+  "item.cacao.mixed_nuts_milk_chocolate" : "果仁牛奶巧克力",
+  "item.cacao.coconut_milk_chocolate" : "椰子牛奶巧克力",
+  "item.cacao.peanut_butter_milk_chocolate" : "花生酱牛奶巧克力",
+  "item.cacao.white_chocolate" : "白巧克力",
+  "item.cacao.caramel_white_chocolate" : "焦糖白巧克力",
+  "item.cacao.praline_white_chocolate" : "扁桃仁白巧克力",
+  "item.cacao.strawberry_cream_white_chocolate" : "草莓奶油白巧克力",
+  "item.cacao.cookie_cream_white_chocolate" : "曲奇奶油白巧克力",
+  "item.cacao.mixed_nuts_white_chocolate" : "果仁白巧克力",
+  "item.cacao.coconut_white_chocolate" : "椰子白巧克力",
+  "item.cacao.peanut_butter_white_chocolate" : "花生酱白巧克力",
+  "item.cacao.golden_chocolate" : "金巧克力",
+  "item.cacao.dark_chocolate_covered_apple" : "黑巧克力苹果",
+  "item.cacao.milk_chocolate_covered_apple" : "牛奶巧克力苹果",
+  "item.cacao.white_chocolate_covered_apple" : "白巧克力苹果",
+  "item.cacao.white_chips_cookie" : "白巧克力碎曲奇",
+  "item.cacao.white_chips_chocolate_cookie" : "白巧克力碎巧克力曲奇",
+  "item.cacao.dark_chips_chocolate_cookie" : "黑巧克力碎巧克力曲奇",
+  "item.cacao.nutella" : "能多益",
+
+  "block.cacao.chocolate_cake" : "巧克力蛋糕",
+  "itemGroup.cacao" : "作物盛景丨巧克力工坊"
+}
\ No newline at end of file

From 29dc37ee52b71c7456478939d38ca600417a53da Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Mon, 16 May 2022 00:10:05 +0800
Subject: [PATCH 2/7] Update zh_cn.json

---
 .../croptopias-chocolaterie-forge/cacao/lang/zh_cn.json       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/zh_cn.json b/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/zh_cn.json
index dea326e93ade..5530ea4192fd 100644
--- a/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/zh_cn.json
+++ b/projects/1.18/assets/croptopias-chocolaterie-forge/cacao/lang/zh_cn.json
@@ -44,5 +44,5 @@
   "item.cacao.nutella" : "能多益",
 
   "block.cacao.chocolate_cake" : "巧克力蛋糕",
-  "itemGroup.cacao" : "作物盛景丨巧克力工坊"
-}
\ No newline at end of file
+  "itemGroup.cacao" : "作物盛景：巧克力工坊"
+}

From cda1b0c3e860ee253cd3f7f7571c5593a8f63a6c Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Thu, 23 Jun 2022 13:04:45 +0800
Subject: [PATCH 3/7] Update
 projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json

---
 .../1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
index 8b2fd4ae6227..6a36fb7a69c0 100644
--- a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
+++ b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
@@ -571,5 +571,6 @@
   "itemGroup.croptopia.croptopia": "作物盛景",
   "itemGroup.croptopia": "作物盛景",
 
-  "info.croptopia.seed": "这种种子会在\n以下生物群系中掉落："
+  "info.croptopia.seed": "该种子会在\n以下生物群系中掉落："
+
 }
\ No newline at end of file

From c027bbb31df51af84eea58fd09a9074da6701394 Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Thu, 23 Jun 2022 14:44:44 +0800
Subject: [PATCH 4/7] Apply suggestions from code review

---
 .../croptopia-fabric/croptopia/lang/zh_cn.json       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
index 6a36fb7a69c0..9a864e696b44 100644
--- a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
+++ b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
@@ -123,7 +123,7 @@
   "item.croptopia.starfruit": "杨桃",
   "item.croptopia.almond": "扁桃仁",
   "item.croptopia.cashew": "腰果",
-  "item.croptopia.pecan": "山核桃",
+  "item.croptopia.pecan": "碧根果",
   "item.croptopia.walnut": "核桃",
   "item.croptopia.avocado": "牛油果",
   "item.croptopia.apricot": "杏子",
@@ -165,7 +165,7 @@
   "item.croptopia.nectarine_sapling": "油桃树苗",
   "item.croptopia.almond_sapling": "扁桃仁树苗",
   "item.croptopia.cashew_sapling": "腰果树苗",
-  "item.croptopia.pecan_sapling": "山核桃树苗",
+  "item.croptopia.pecan_sapling": "碧根果树苗",
   "item.croptopia.walnut_sapling": "核桃树苗",
 
   "item.croptopia.olive_oil": "橄榄油",
@@ -282,8 +282,8 @@
   "item.croptopia.cashew_chicken": "腰果鸡丁",
   "item.croptopia.nougat": "牛轧糖",
   "item.croptopia.nutty_cookie": "坚果曲奇",
-  "item.croptopia.pecan_ice_cream": "山核桃冰淇淋",
-  "item.croptopia.pecan_pie": "山核桃派",
+  "item.croptopia.pecan_ice_cream": "碧根果冰淇淋",
+  "item.croptopia.pecan_pie": "碧根果派",
   "item.croptopia.protein_bar": "蛋白棒",
   "item.croptopia.raisin_oatmeal_cookie": "葡萄干燕麦曲奇",
   "item.croptopia.roasted_nuts": "烤坚果",
@@ -435,7 +435,7 @@
   "block.croptopia.date_crop": "枣椰",
   "block.croptopia.almond_crop": "扁桃仁",
   "block.croptopia.cashew_crop": "腰果",
-  "block.croptopia.pecan_crop": "山核桃",
+  "block.croptopia.pecan_crop": "碧根果",
   "block.croptopia.walnut_crop": "核桃",
   "block.croptopia.artichoke_crop": "洋蓟",
   "block.croptopia.asparagus_crop": "芦笋",
@@ -519,7 +519,7 @@
   "block.croptopia.date_sapling": "枣椰树苗",
   "block.croptopia.almond_sapling": "扁桃仁树苗",
   "block.croptopia.cashew_sapling": "腰果树苗",
-  "block.croptopia.pecan_sapling": "山核桃树苗",
+  "block.croptopia.pecan_sapling": "碧根果树苗",
   "block.croptopia.walnut_sapling": "核桃树苗",
   "block.croptopia.cinnamon_sapling": "桂皮树苗",
 

From c3b414145cab0acac3631f05ec780566245a0f9c Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Thu, 25 Aug 2022 02:08:17 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=B0=E7=89=88=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../croptopia/lang/en_us.json                 | 70 +++++++++++++++++--
 .../croptopia/lang/zh_cn.json                 | 60 +++++++++++++++-
 2 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json b/projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json
index 9674ef8998b8..b65f65b5893f 100644
--- a/projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json
+++ b/projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json
@@ -402,6 +402,22 @@
   "item.croptopia.anchovy_pizza": "Anchovy Pizza",
   "item.croptopia.mashed_potatoes": "Mashed Potatoes",
 
+  "item.croptopia.baked_crepes": "Baked Crêpes",
+  "item.croptopia.cinnamon_roll": "Cinnamon Roll",
+  "item.croptopia.croque_madame": "Croque Madame",
+  "item.croptopia.croque_monsieur": "Croque Monsieur",
+  "item.croptopia.dauphine_potatoes": "Dauphine Potatoes",
+  "item.croptopia.fried_frog_legs": "Fried Frog Legs",
+  "item.croptopia.frog_legs": "Frog Legs",
+  "item.croptopia.ground_pork": "Ground Pork",
+  "item.croptopia.hashed_brown": "Hashed Browns",
+  "item.croptopia.macaron": "Macaron",
+  "item.croptopia.quiche": "Quiche",
+  "item.croptopia.sausage": "Sausage",
+  "item.croptopia.sunny_side_eggs": "Sunny Side Up Eggs",
+  "item.croptopia.sweet_crepes": "Sweet Crêpes",
+  "item.croptopia.the_big_breakfast": "The Big Breakfast",
+
   "item.croptopia.food_press": "All Purpose Food Press",
   "item.croptopia.frying_pan": "Frying Pan",
   "item.croptopia.cooking_pot": "Cooking Pot",
@@ -528,18 +544,18 @@
   "block.croptopia.cinnamon_wood": "Cinnamon Wood",
   "block.croptopia.stripped_cinnamon_wood": "Stripped Cinnamon Wood",
 
-  "advancements.croptopia.root.description": " 'You Won't Get Anything Done Hoeing Like That' ",
+  "advancements.croptopia.root.description": "'You Won't Get Anything Done Hoeing Like That'",
   "advancements.croptopia.getseed.description": "Break a wild plant to get seeds!",
   "advancements.croptopia.getseed.title": "An Extra Seedy Place",
   "advancements.croptopia.getsapling.title": "Forestree Territree",
-  "advancements.croptopia.getsapling.description": "Gather some fruit and make a tree from it.",
+  "advancements.croptopia.getsapling.description": "Gather some fruit and make a tree from it",
   "advancements.croptopia.pot.title": "Potted",
   "advancements.croptopia.pot.description": "Make a Cooking Pot",
-  "advancements.croptopia.frying_pan.title": "Can't be used as a weapon",
+  "advancements.croptopia.frying_pan.title": "Can't Be Used as a Weapon",
   "advancements.croptopia.frying_pan.description": "Make a Frying Pan",
   "advancements.croptopia.food_press.title": "Blendern't",
   "advancements.croptopia.food_press.description": "Make an All Purpose Food Press",
-  "advancements.croptopia.mortar_and_pestle.title": "A deadly weapon for... crushing",
+  "advancements.croptopia.mortar_and_pestle.title": "A Deadly Weapon For... Crushing",
   "advancements.croptopia.mortar_and_pestle.description": "Make a Mortar and Pestle",
   "advancements.croptopia.eatbig.title": "Fully Stuffed",
   "advancements.croptopia.eatbig.description": "Eat anything with five or more ingredients",
@@ -547,7 +563,7 @@
   "advancements.croptopia.eatcrafted.description": "Eat anything crafted",
   "advancements.croptopia.gather_desert.title": "Undried Seeds",
   "advancements.croptopia.gather_desert.description": "Gather all the seeds from the desert",
-  "advancements.croptopia.gather_savanna.title": "Hot seeds",
+  "advancements.croptopia.gather_savanna.title": "Hot Seeds",
   "advancements.croptopia.gather_savanna.description": "Gather all the seeds from the savanna",
   "advancements.croptopia.gather_forest.title": "Saplings Lite",
   "advancements.croptopia.gather_forest.description": "Gather all the seeds from the forest",
@@ -564,12 +580,52 @@
   "advancements.croptopia.gather_drinks.title": "Mundane Cocktail",
   "advancements.croptopia.gather_drinks.description": "Drink every drink",
   "advancements.croptopia.gather_food.title": "Food Critic",
-  "advancements.croptopia.gather_food.description": "Eat everything there is too eat",
+  "advancements.croptopia.gather_food.description": "Eat everything there is to eat",
   "advancements.croptopia.knife.title": "Iron Torch",
   "advancements.croptopia.knife.description": "Make a Knife",
+  "advancements.croptopia.tofu.title": "Meaty beans",
+  "advancements.croptopia.tofu.description": "Make Tofu",
+  "advancements.croptopia.cinnamon.title": "Oddly tasty sticks",
+  "advancements.croptopia.cinnamon.description": "Strip a cinnamon tree from your local jungle",
+  "advancements.croptopia.salt.title": "Sadly, Won't Give More FPS",
+  "advancements.croptopia.salt.description": "Find Salt in the depths of nearby rivers",
+  "advancements.croptopia.gather_tree_all.title": "Streeking Treeathlon",
+  "advancements.croptopia.gather_tree_all.description": "Gather every sapling Croptopia has to offer",
+  "advancements.croptopia.gather_tree_forest.title": "Your Bargain Bin Saplings",
+  "advancements.croptopia.gather_tree_forest.description": "Gather every sapling from a forest or variants",
+  "advancements.croptopia.gather_tree_jungle.title": "Feral Huge Broccoli",
+  "advancements.croptopia.gather_tree_jungle.description": "Gather every sapling from a jungle or variants",
+  "advancements.croptopia.gather_tree_plains.title": "Distinct Shrubs",
+  "advancements.croptopia.gather_tree_plains.description": "Gather every sapling from a plains or variants",
+  "advancements.croptopia.gather_tree_dark_forest.title": "Trees of the Dark Side",
+  "advancements.croptopia.gather_tree_dark_forest.description": "Gather every sapling from a dark forest or variants",
+
 
   "itemGroup.croptopia.croptopia": "Croptopia",
   "itemGroup.croptopia": "Croptopia",
 
-  "info.croptopia.seed": "This seed will drop in biomes\n categorized as:"
+  "info.croptopia.seed": "This seed will drop in biomes\n categorized as:",
+
+  "tag.c.crops" : "Crops",
+  "tag.c.saplings" : "Saplings",
+  "tag.c.vegetables" : "Vegetables",
+  "tag.c.nuts" : "Nuts",
+  "tag.c.fruits" : "Fruits",
+  "tag.c.grain" : "Grain",
+  "tag.c.seeds" : "Seeds",
+  "tag.c.jams" : "Jams",
+  "tag.c.juices" : "Juices",
+  "tag.c.tools.knives" : "Knives",
+  "tag.croptopia.beef_mutton" : "Beef Mutton",
+  "tag.croptopia.meat_replacements" : "Meat Replacements",
+  "tag.croptopia.nuts" : "Nuts",
+  "tag.croptopia.chicken_replacements" : "Chicken Replacements",
+  "tag.croptopia.pork_replacements" : "Pork Replacements",
+  "tag.croptopia.fishes" : "Fishes",
+  "tag.croptopia.peppers" : "Peppers",
+  "tag.croptopia.sauces" : "Sauces",
+  "tag.croptopia.melons" : "Melons",
+  "tag.croptopia.beef_replacements" : "Beef Replacements",
+  "tag.croptopia.flourable" : "Flourable",
+  "tag.croptopia.cinnamon_logs" : "Cinnamon Logs"
 }
\ No newline at end of file
diff --git a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
index 9a864e696b44..1d018b7bb1ac 100644
--- a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
+++ b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
@@ -228,7 +228,7 @@
   "item.croptopia.raisins": "葡萄干",
   "item.croptopia.doughnut": "甜甜圈",
   "item.croptopia.popcorn": "爆米花",
-  "item.croptopia.baked_beans": "烘豆",
+  "item.croptopia.baked_beans": "焗豆",
   "item.croptopia.toast": "吐司",
   "item.croptopia.cucumber_salad": "南瓜沙拉",
   "item.croptopia.caesar_salad": "凯撒沙拉",
@@ -402,6 +402,22 @@
   "item.croptopia.anchovy_pizza": "鳀鱼披萨",
   "item.croptopia.mashed_potatoes": "马铃薯泥",
 
+  "item.croptopia.baked_crepes": "烤可丽饼",
+  "item.croptopia.cinnamon_roll": "肉桂卷",
+  "item.croptopia.croque_madame": "法式女士三明治",
+  "item.croptopia.croque_monsieur": "法式男士三明治",
+  "item.croptopia.dauphine_potatoes": "法式炸马铃薯球",
+  "item.croptopia.fried_frog_legs": "炸青蛙腿",
+  "item.croptopia.frog_legs": "青蛙腿",
+  "item.croptopia.ground_pork": "猪肉碎",
+  "item.croptopia.hashed_brown": "烤薯饼",
+  "item.croptopia.macaron": "马卡龙",
+  "item.croptopia.quiche": "法式咸派",
+  "item.croptopia.sausage": "香肠",
+  "item.croptopia.sunny_side_eggs": "荷包蛋",
+  "item.croptopia.sweet_crepes": "甜可丽饼",
+  "item.croptopia.the_big_breakfast": "丰盛早餐",
+
   "item.croptopia.food_press": "多功能食品压榨机",
   "item.croptopia.frying_pan": "平底锅",
   "item.croptopia.cooking_pot": "烹饪锅",
@@ -541,7 +557,7 @@
   "advancements.croptopia.food_press.description": "制作一个多功能食品压榨机",
   "advancements.croptopia.mortar_and_pestle.title": "致命武器——对食材来说",
   "advancements.croptopia.mortar_and_pestle.description": "制作一个研钵",
-  "advancements.croptopia.eatbig.title": "真的塞满了",
+  "advancements.croptopia.eatbig.title": "一锅装不下",
   "advancements.croptopia.eatbig.description": "食用任意一种由五种或更多材料烹饪的食物",
   "advancements.croptopia.eatcrafted.title": "丰盛的食物",
   "advancements.croptopia.eatcrafted.description": "食用任意一种食物",
@@ -567,10 +583,48 @@
   "advancements.croptopia.gather_food.description": "尝遍所有食物",
   "advancements.croptopia.knife.title": "铁火把",
   "advancements.croptopia.knife.description": "制作一把刀",
+  "advancements.croptopia.tofu.title": "像肉的豆制品",
+  "advancements.croptopia.tofu.description": "制作豆腐",
+  "advancements.croptopia.cinnamon.title": "珍奇美味棒",
+  "advancements.croptopia.cinnamon.description": "在丛林中给肉桂木剥皮",
+  "advancements.croptopia.salt.title": "全能——提高FPS除外",
+  "advancements.croptopia.salt.description": "在河流中找到盐",
+  "advancements.croptopia.gather_tree_all.title": "树苗追寻者",
+  "advancements.croptopia.gather_tree_all.description": "找到所有作物盛景的树苗",
+  "advancements.croptopia.gather_tree_forest.title": "你的廉价树苗",
+  "advancements.croptopia.gather_tree_forest.description": "收集所有来自森林群系及其变种的树苗",
+  "advancements.croptopia.gather_tree_jungle.title": "野生的巨大西兰花",
+  "advancements.croptopia.gather_tree_jungle.description": "收集所有来自丛林群系及其变种的树苗",
+  "advancements.croptopia.gather_tree_plains.title": "独特的灌木",
+  "advancements.croptopia.gather_tree_plains.description": "收集所有来自平原群系及其变种的树苗",
+  "advancements.croptopia.gather_tree_dark_forest.title": "树木黑暗面",
+  "advancements.croptopia.gather_tree_dark_forest.description": "收集所有来自黑森林群系及其变种的树苗",
 
   "itemGroup.croptopia.croptopia": "作物盛景",
   "itemGroup.croptopia": "作物盛景",
 
-  "info.croptopia.seed": "该种子会在\n以下生物群系中掉落："
+  "info.croptopia.seed": "该种子会在\n以下生物群系中掉落：",
 
+  "tag.c.crops" : "作物",
+  "tag.c.saplings" : "树苗",
+  "tag.c.vegetables" : "蔬菜",
+  "tag.c.nuts" : "坚果",
+  "tag.c.fruits" : "水果",
+  "tag.c.grain" : "谷物",
+  "tag.c.seeds" : "种子",
+  "tag.c.jams" : "果酱",
+  "tag.c.juices" : "果汁",
+  "tag.c.tools.knives" : "刀具",
+  "tag.croptopia.beef_mutton" : "牛羊肉",
+  "tag.croptopia.meat_replacements" : "肉类替代品",
+  "tag.croptopia.nuts" : "坚果",
+  "tag.croptopia.chicken_replacements" : "鸡肉替代品",
+  "tag.croptopia.pork_replacements" : "猪肉替代品",
+  "tag.croptopia.fishes" : "鱼类",
+  "tag.croptopia.peppers" : "椒类",
+  "tag.croptopia.sauces" : "酱料",
+  "tag.croptopia.melons" : "瓜类",
+  "tag.croptopia.beef_replacements" : "牛肉替代品",
+  "tag.croptopia.flourable" : "可磨面粉",
+  "tag.croptopia.cinnamon_logs" : "肉桂木"
 }
\ No newline at end of file

From 2fa45cfe3a39ca25a1b6ba6a52b6ff66d2306083 Mon Sep 17 00:00:00 2001
From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
Date: Fri, 14 Oct 2022 10:41:37 +0800
Subject: [PATCH 6/7] Apply suggestions from code review

Co-authored-by: NightOcean <81746538+IdealNightOcean@users.noreply.github.com>
---
 .../1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
index 1d018b7bb1ac..872fe3bc7ab5 100644
--- a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
+++ b/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
@@ -549,7 +549,7 @@
   "advancements.croptopia.getseed.title": "额外的种子",
   "advancements.croptopia.getsapling.title": "森林和土地",
   "advancements.croptopia.getsapling.description": "收集一些果实来合成果树",
-  "advancements.croptopia.pot.title": "进锅！",
+  "advancements.croptopia.pot.title": "起锅！",
   "advancements.croptopia.pot.description": "制作一个烹饪锅",
   "advancements.croptopia.frying_pan.title": "并不能当成武器",
   "advancements.croptopia.frying_pan.description": "制作一个平底锅",
@@ -559,7 +559,7 @@
   "advancements.croptopia.mortar_and_pestle.description": "制作一个研钵",
   "advancements.croptopia.eatbig.title": "一锅装不下",
   "advancements.croptopia.eatbig.description": "食用任意一种由五种或更多材料烹饪的食物",
-  "advancements.croptopia.eatcrafted.title": "丰盛的食物",
+  "advancements.croptopia.eatcrafted.title": "饱餐一顿",
   "advancements.croptopia.eatcrafted.description": "食用任意一种食物",
   "advancements.croptopia.gather_desert.title": "尚未风干的种子",
   "advancements.croptopia.gather_desert.description": "收集所有来自沙漠群系的种子",
@@ -577,7 +577,7 @@
   "advancements.croptopia.gather_all.description": "集齐所有作物盛景的种子",
   "advancements.croptopia.getdrinks.title": "花哨的水",
   "advancements.croptopia.getdrinks.description": "制作任意一种饮品",
-  "advancements.croptopia.gather_drinks.title": "单调鸡尾酒",
+  "advancements.croptopia.gather_drinks.title": "尘世鸡尾酒",
   "advancements.croptopia.gather_drinks.description": "喝下所有饮品",
   "advancements.croptopia.gather_food.title": "美食评论家",
   "advancements.croptopia.gather_food.description": "尝遍所有食物",

From 7b0e4a845502d45fd77bc14c9cef802e0d5241ba Mon Sep 17 00:00:00 2001
From: "cfpa-bot[bot]" <101878103+cfpa-bot[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 10:51:55 +0800
Subject: [PATCH 7/7] mv "projects/1.18/assets/croptopia-fabric"
 "projects/1.18/assets/croptopia"

Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
---
 .../{croptopia-fabric => croptopia}/croptopia/lang/en_us.json     | 0
 .../{croptopia-fabric => croptopia}/croptopia/lang/zh_cn.json     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename projects/1.18/assets/{croptopia-fabric => croptopia}/croptopia/lang/en_us.json (100%)
 rename projects/1.18/assets/{croptopia-fabric => croptopia}/croptopia/lang/zh_cn.json (100%)

diff --git a/projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json b/projects/1.18/assets/croptopia/croptopia/lang/en_us.json
similarity index 100%
rename from projects/1.18/assets/croptopia-fabric/croptopia/lang/en_us.json
rename to projects/1.18/assets/croptopia/croptopia/lang/en_us.json
diff --git a/projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json b/projects/1.18/assets/croptopia/croptopia/lang/zh_cn.json
similarity index 100%
rename from projects/1.18/assets/croptopia-fabric/croptopia/lang/zh_cn.json
rename to projects/1.18/assets/croptopia/croptopia/lang/zh_cn.json