From ab518f83f79dfbc06a26fc5403bce4fc79b62533 Mon Sep 17 00:00:00 2001 From: seasei <114800774+seaseii@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:41:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Create:=20Garnished=20=E6=A8=A1=E7=BB=84?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../garnished/lang/en_us.json | 143 ++++++++++++++++++ .../garnished/lang/zh_cn.json | 143 ++++++++++++++++++ 2 files changed, 286 insertions(+) create mode 100644 projects/1.19/assets/create-garnished/garnished/lang/en_us.json create mode 100644 projects/1.19/assets/create-garnished/garnished/lang/zh_cn.json diff --git a/projects/1.19/assets/create-garnished/garnished/lang/en_us.json b/projects/1.19/assets/create-garnished/garnished/lang/en_us.json new file mode 100644 index 000000000000..48bb26ab3c28 --- /dev/null +++ b/projects/1.19/assets/create-garnished/garnished/lang/en_us.json @@ -0,0 +1,143 @@ +{ + "itemGroup.create.garnished": "Create: Garnished", + "text.garnished.nut.ungarnished": "Ungarnished", + "text.garnished.nut.garnished": "Garnished", + "text.garnished.nut.cracked": "Cracked [HOLD SHIFT]", + "text.garnished.nut.cracked.desc": "Cracked nuts are used for reproduction!", + "text.garnished.nut.cracked.desc.secondary": "Place this down on tilled soil and wait.", + "text.garnished.hold_shift": "[HOLD SHIFT]", + "text.garnished.nut.cinder_flour": "Cinder Flour", + "text.garnished.nut.cinder_flour.melted": "Melted Cinder Flour", + "text.garnished.nut.cinder_flour.effect": "Available Effect: [%d]", + "text.garnished.nut.cinder_flour.effect.multiple": "Available Effect: [Several Effects]", + "text.garnished.nut.sweetened": "Sweetened", + "text.garnished.nut.honeyed": "Honeyed", + "text.garnished.nut.chocolate_glazed": "Chocolate Glazed", + "text.garnished.cider.cryptic": "Cryptic [HOLD SHIFT]", + "text.garnished.cider.cryptic.desc": "This Apple Cider provides the consumer", + "text.garnished.cider.cryptic.desc.secondary": "with either Strength or Slowness", + "text.garnished.cider.cryptic.desc.third": "A 50/50 chance, will you take it?", + "text.garnished.cider.cryptic.desc.wither": "Cleanses the user of Withering upon consumption", + + "item.garnished.cashew": "Cashew", + "item.garnished.ungarnished_cashew": "Cashew", + "item.garnished.cinder_cashew": "Cashew", + "item.garnished.melted_cinder_cashew": "Cashew", + "item.garnished.sweetened_cashew": "Cashew", + "block.garnished.cashew_crop": "Cashew", + "item.garnished.cinder_cashew_speed": "Cashew", + "item.garnished.honeyed_cashew": "Cashew", + "item.garnished.chocolate_glazed_cashew": "Cashew", + + "item.garnished.walnut": "Walnut", + "item.garnished.ungarnished_walnut": "Walnut", + "item.garnished.cinder_walnut": "Walnut", + "item.garnished.melted_cinder_walnut": "Walnut", + "item.garnished.sweetened_walnut": "Walnut", + "block.garnished.walnut_crop": "Walnut", + "item.garnished.cinder_walnut_strength": "Walnut", + "item.garnished.honeyed_walnut": "Walnut", + "item.garnished.chocolate_glazed_walnut": "Walnut", + + "item.garnished.almond": "Almond", + "item.garnished.ungarnished_almond": "Almond", + "item.garnished.cinder_almond": "Almond", + "item.garnished.melted_cinder_almond": "Almond", + "item.garnished.sweetened_almond": "Almond", + "block.garnished.almond_crop": "Almond", + "item.garnished.cinder_almond_haste": "Almond", + "item.garnished.honeyed_almond": "Almond", + "item.garnished.chocolate_glazed_almond": "Almond", + + "item.garnished.pecan": "Pecan", + "item.garnished.ungarnished_pecan": "Pecan", + "item.garnished.cinder_pecan": "Pecan", + "item.garnished.melted_cinder_pecan": "Pecan", + "item.garnished.sweetened_pecan": "Pecan", + "block.garnished.pecan_crop": "Pecan", + "item.garnished.cinder_pecan_resistance": "Pecan", + "item.garnished.honeyed_pecan": "Pecan", + "item.garnished.chocolate_glazed_pecan": "Pecan", + + "item.garnished.pistachio": "Pistachio", + "item.garnished.ungarnished_pistachio": "Pistachio", + "item.garnished.cinder_pistachio": "Pistachio", + "item.garnished.melted_cinder_pistachio": "Pistachio", + "item.garnished.sweetened_pistachio": "Pistachio", + "block.garnished.pistachio_crop": "Pistachio", + "item.garnished.cinder_pistachio_night_vision": "Pistachio", + "item.garnished.honeyed_pistachio": "Pistachio", + "item.garnished.chocolate_glazed_pistachio": "Pistachio", + + "item.garnished.macadamia": "Macadamia", + "item.garnished.ungarnished_macadamia": "Macadamia", + "item.garnished.cinder_macadamia": "Macadamia", + "item.garnished.melted_cinder_macadamia": "Macadamia", + "item.garnished.sweetened_macadamia": "Macadamia", + "block.garnished.macadamia_crop": "Macadamia", + "item.garnished.cinder_macadamia_fire_resistance": "Macadamia", + "item.garnished.honeyed_macadamia": "Macadamia", + "item.garnished.chocolate_glazed_macadamia": "Macadamia", + + "item.garnished.peanut": "Peanut", + "item.garnished.ungarnished_peanut": "Peanut", + "item.garnished.cinder_peanut": "Peanut", + "item.garnished.melted_cinder_peanut": "Peanut", + "item.garnished.sweetened_peanut": "Peanut", + "block.garnished.peanut_crop": "Peanut", + "item.garnished.cinder_peanut_effect": "Peanut", + "item.garnished.honeyed_peanut": "Peanut", + "item.garnished.chocolate_glazed_peanut": "Peanut", + + "item.garnished.garnished_sweet_berries": "Sweet Berries", + "item.garnished.honeyed_sweet_berries": "Sweet Berries", + + "item.garnished.nut_mix": "Nut Mix", + "item.garnished.sweetened_nut_mix": "Nut Mix", + "item.garnished.honeyed_nut_mix": "Nut Mix", + "item.garnished.chocolate_glazed_nut_mix": "Nut Mix", + + "item.garnished.garnished_meal": "Garnished Meal", + + "item.garnished.apple_cider": "Bottled Apple Cider", + "item.garnished.cryptic_apple_cider": "Bottled Apple Cider", + + "item.garnished.garnish_bucket": "Bucket of Garnish", + "item.garnished.apple_cider_bucket": "Bucket of Apple Cider", + "fluid.garnished.garnish": "Liquid Garnish", + "fluid.garnished.apple_cider": "Apple Cider", + + "block.garnished.nut_plant": "Nut Growth", + + "block.garnished.solidified_garnish": "Solidified Garnish Block", + "item.garnished.garnish_compound": "Garnish Compound", + + "advancement.garnished.nut_growth.title": "Vast Wilderness", + "advancement.garnished.nut_growth.description": "Obtain Ungarnished Nuts by exploring the world", + "advancement.garnished.cracked_nuts.title": "Nutcracker!", + "advancement.garnished.cracked_nuts.description": "Crack your nuts open and make way for automation", + "advancement.garnished.garnished_nuts.title": "Garnishment", + "advancement.garnished.garnished_nuts.description": "Apply Liquid Garnish onto your nuts", + "advancement.garnished.sweetened_nuts.title": "Confectionery... Wait", + "advancement.garnished.sweetened_nuts.description": "Sweeten your nuts using Deployers and Sugar", + "advancement.garnished.liquid_garnish.title": "Chef's Kiss", + "advancement.garnished.liquid_garnish.description": "Mix Sugar, Water, and Seeds to make Liquid Garnish", + "advancement.garnished.garnish_compound.title": "Compounded!", + "advancement.garnished.garnish_compound.description": "Obtain Garnish Compound to more effectively use materials", + "advancement.garnished.honeyed_nuts.title": "Ya Like Jazz?", + "advancement.garnished.honeyed_nuts.description": "Apply Honey onto your nuts", + "advancement.garnished.chocolate_glazed_nuts.title": "Willy Wonka Expansion", + "advancement.garnished.chocolate_glazed_nuts.description": "Apply Chocolate onto your nuts", + "advancement.garnished.nut_mix.title": "Compacted Nuts", + "advancement.garnished.nut_mix.description": "Obtain Nut Mix", + "advancement.garnished.garnished_meal.title": "Too Far Gone", + "advancement.garnished.garnished_meal.description": "Obtain Garnished Meal", + "advancement.garnished.melted_cinder_effect_nuts.title": "Who Needs Beacons Anyway?", + "advancement.garnished.melted_cinder_effect_nuts.description": "Obtain Melted Cinder Nuts that have an effect attached", + "advancement.garnished.apple_cider.title": "Classical Drinks", + "advancement.garnished.apple_cider.description": "Mix Apples, Water, a Cracked Nut, and Garnish Compound to make Apple Cider", + "advancement.garnished.cryptic_apple_cider.title": "Gambling", + "advancement.garnished.cryptic_apple_cider.description": "Apply a flower to Bottled Apple Cider", + "advancement.garnished.ina_buhg.title": "It's a Buhg", + "advancement.garnished.ina_buhg.description": "Obtain some variation of a Peanut" +} diff --git a/projects/1.19/assets/create-garnished/garnished/lang/zh_cn.json b/projects/1.19/assets/create-garnished/garnished/lang/zh_cn.json new file mode 100644 index 000000000000..1bca0c3590fb --- /dev/null +++ b/projects/1.19/assets/create-garnished/garnished/lang/zh_cn.json @@ -0,0 +1,143 @@ +{ + "itemGroup.create.garnished": "机械动力:装食", + "text.garnished.nut.ungarnished": "未装食", + "text.garnished.nut.garnished": "已装食", + "text.garnished.nut.cracked": "已粉碎[按住SHIFT]", + "text.garnished.nut.cracked.desc": "粉碎的坚果是用来种植的!", + "text.garnished.nut.cracked.desc.secondary": "请将它种在耕地上并等待。", + "text.garnished.hold_shift": "[按住SHIFT]", + "text.garnished.nut.cinder_flour": "余烬面粉", + "text.garnished.nut.cinder_flour.melted": "融化的余烬面粉", + "text.garnished.nut.cinder_flour.effect": "可用效果:[%d]", + "text.garnished.nut.cinder_flour.effect.multiple": "可用效果:[多种效果]", + "text.garnished.nut.sweetened": "加糖", + "text.garnished.nut.honeyed": "涂蜜", + "text.garnished.nut.chocolate_glazed": "有巧克力光泽", + "text.garnished.cider.cryptic": "神秘属性[按住SHIFT]", + "text.garnished.cider.cryptic.desc": "这款苹果西打酒会提供给客户", + "text.garnished.cider.cryptic.desc.secondary": "力量或者缓慢效果之一", + "text.garnished.cider.cryptic.desc.third": "50比50的可能性,你会喝它吗?", + "text.garnished.cider.cryptic.desc.wither": "在被喝掉时净化饮用者的凋零效果", + + "item.garnished.cashew": "腰果", + "item.garnished.ungarnished_cashew": "腰果", + "item.garnished.cinder_cashew": "腰果", + "item.garnished.melted_cinder_cashew": "腰果", + "item.garnished.sweetened_cashew": "腰果", + "block.garnished.cashew_crop": "腰果", + "item.garnished.cinder_cashew_speed": "腰果", + "item.garnished.honeyed_cashew": "腰果", + "item.garnished.chocolate_glazed_cashew": "腰果", + + "item.garnished.walnut": "核桃", + "item.garnished.ungarnished_walnut": "核桃", + "item.garnished.cinder_walnut": "核桃", + "item.garnished.melted_cinder_walnut": "核桃", + "item.garnished.sweetened_walnut": "核桃", + "block.garnished.walnut_crop": "核桃", + "item.garnished.cinder_walnut_strength": "核桃", + "item.garnished.honeyed_walnut": "核桃", + "item.garnished.chocolate_glazed_walnut": "核桃", + + "item.garnished.almond": "杏仁", + "item.garnished.ungarnished_almond": "杏仁", + "item.garnished.cinder_almond": "杏仁", + "item.garnished.melted_cinder_almond": "杏仁", + "item.garnished.sweetened_almond": "杏仁", + "block.garnished.almond_crop": "杏仁", + "item.garnished.cinder_almond_haste": "杏仁", + "item.garnished.honeyed_almond": "杏仁", + "item.garnished.chocolate_glazed_almond": "杏仁", + + "item.garnished.pecan": "美国山核桃", + "item.garnished.ungarnished_pecan": "美国山核桃", + "item.garnished.cinder_pecan": "美国山核桃", + "item.garnished.melted_cinder_pecan": "美国山核桃", + "item.garnished.sweetened_pecan": "美国山核桃", + "block.garnished.pecan_crop": "美国山核桃", + "item.garnished.cinder_pecan_resistance": "美国山核桃", + "item.garnished.honeyed_pecan": "美国山核桃", + "item.garnished.chocolate_glazed_pecan": "美国山核桃", + + "item.garnished.pistachio": "开心果", + "item.garnished.ungarnished_pistachio": "开心果", + "item.garnished.cinder_pistachio": "开心果", + "item.garnished.melted_cinder_pistachio": "开心果", + "item.garnished.sweetened_pistachio": "开心果", + "block.garnished.pistachio_crop": "开心果", + "item.garnished.cinder_pistachio_night_vision": "开心果", + "item.garnished.honeyed_pistachio": "开心果", + "item.garnished.chocolate_glazed_pistachio": "开心果", + + "item.garnished.macadamia": "澳洲坚果", + "item.garnished.ungarnished_macadamia": "澳洲坚果", + "item.garnished.cinder_macadamia": "澳洲坚果", + "item.garnished.melted_cinder_macadamia": "澳洲坚果", + "item.garnished.sweetened_macadamia": "澳洲坚果", + "block.garnished.macadamia_crop": "澳洲坚果", + "item.garnished.cinder_macadamia_fire_resistance": "澳洲坚果", + "item.garnished.honeyed_macadamia": "澳洲坚果", + "item.garnished.chocolate_glazed_macadamia": "澳洲坚果", + + "item.garnished.peanut": "花生", + "item.garnished.ungarnished_peanut": "花生", + "item.garnished.cinder_peanut": "花生", + "item.garnished.melted_cinder_peanut": "花生", + "item.garnished.sweetened_peanut": "花生", + "block.garnished.peanut_crop": "花生", + "item.garnished.cinder_peanut_effect": "花生", + "item.garnished.honeyed_peanut": "花生", + "item.garnished.chocolate_glazed_peanut": "花生", + + "item.garnished.garnished_sweet_berries": "甜浆果", + "item.garnished.honeyed_sweet_berries": "甜浆果", + + "item.garnished.nut_mix": "混合坚果", + "item.garnished.sweetened_nut_mix": "混合坚果", + "item.garnished.honeyed_nut_mix": "混合坚果", + "item.garnished.chocolate_glazed_nut_mix": "混合坚果", + + "item.garnished.garnished_meal": "精致大餐", + + "item.garnished.apple_cider": "苹果西打瓶", + "item.garnished.cryptic_apple_cider": "苹果西打瓶", + + "item.garnished.garnish_bucket": "装食桶", + "item.garnished.apple_cider_bucket": "苹果西打桶", + "fluid.garnished.garnish": "液态装食", + "fluid.garnished.apple_cider": "苹果西打", + + "block.garnished.nut_plant": "坚果植株", + + "block.garnished.solidified_garnish": "固化装食块", + "item.garnished.garnish_compound": "装食复合物", + + "advancement.garnished.nut_growth.title": "广袤荒野", + "advancement.garnished.nut_growth.description": "通过探索世界获得未装食的坚果", + "advancement.garnished.cracked_nuts.title": "胡桃夹子!", + "advancement.garnished.cracked_nuts.description": "粉碎你的坚果,向自动化前进", + "advancement.garnished.garnished_nuts.title": "装食", + "advancement.garnished.garnished_nuts.description": "在坚果上涂液体装食", + "advancement.garnished.sweetened_nuts.title": "甜食……等等", + "advancement.garnished.sweetened_nuts.description": "使用机械手和糖来让你的坚果变甜", + "advancement.garnished.liquid_garnish.title": "厨师之吻", + "advancement.garnished.liquid_garnish.description": "用糖、水和种子混合制成液态装食", + "advancement.garnished.garnish_compound.title": "融合!", + "advancement.garnished.garnish_compound.description": "获得装食复合物已更有效地使用材料", + "advancement.garnished.honeyed_nuts.title": "你喜欢爵士吗?", + "advancement.garnished.honeyed_nuts.description": "将蜂蜜涂在你的坚果上", + "advancement.garnished.chocolate_glazed_nuts.title": "威利·旺卡的拓展", + "advancement.garnished.chocolate_glazed_nuts.description": "把巧克力涂在你的坚果上", + "advancement.garnished.nut_mix.title": "压缩坚果", + "advancement.garnished.nut_mix.description": "获得混合坚果", + "advancement.garnished.garnished_meal.title": "走得太远", + "advancement.garnished.garnished_meal.description": "获得精致大餐", + "advancement.garnished.melted_cinder_effect_nuts.title": "谁还要信标?", + "advancement.garnished.melted_cinder_effect_nuts.description": "获得涂有附加效果的融化余烬面粉坚果", + "advancement.garnished.apple_cider.title": "古典饮料", + "advancement.garnished.apple_cider.description": "将平锅、水、粉碎坚果和装食复合物混合到一起制成苹果西打", + "advancement.garnished.cryptic_apple_cider.title": "豪赌", + "advancement.garnished.cryptic_apple_cider.description": "将花装在苹果西打中", + "advancement.garnished.ina_buhg.title": "这是个巴格", + "advancement.garnished.ina_buhg.description": "获得花生的一些变种" +} From 3f9362d07a3465f7cf1e5fac6abe428f25627b97 Mon Sep 17 00:00:00 2001 From: seasei <114800774+seaseii@users.noreply.github.com> Date: Thu, 27 Jul 2023 08:02:40 +0800 Subject: [PATCH 2/4] fix modrinth --- .../garnished/lang/en_us.json | 0 .../garnished/lang/zh_cn.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename projects/1.19/assets/{create-garnished => 0-modrinth-mod}/garnished/lang/en_us.json (100%) rename projects/1.19/assets/{create-garnished => 0-modrinth-mod}/garnished/lang/zh_cn.json (100%) diff --git a/projects/1.19/assets/create-garnished/garnished/lang/en_us.json b/projects/1.19/assets/0-modrinth-mod/garnished/lang/en_us.json similarity index 100% rename from projects/1.19/assets/create-garnished/garnished/lang/en_us.json rename to projects/1.19/assets/0-modrinth-mod/garnished/lang/en_us.json diff --git a/projects/1.19/assets/create-garnished/garnished/lang/zh_cn.json b/projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json similarity index 100% rename from projects/1.19/assets/create-garnished/garnished/lang/zh_cn.json rename to projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json From 314859ec21229e968e579f2868207c612cb8d8f2 Mon Sep 17 00:00:00 2001 From: seasei <114800774+seaseii@users.noreply.github.com> Date: Fri, 28 Jul 2023 08:15:46 +0800 Subject: [PATCH 3/4] fix --- projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json b/projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json index 1bca0c3590fb..ae775d601627 100644 --- a/projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json +++ b/projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json @@ -12,7 +12,7 @@ "text.garnished.nut.cinder_flour.effect.multiple": "可用效果:[多种效果]", "text.garnished.nut.sweetened": "加糖", "text.garnished.nut.honeyed": "涂蜜", - "text.garnished.nut.chocolate_glazed": "有巧克力光泽", + "text.garnished.nut.chocolate_glazed": "涂有巧克力", "text.garnished.cider.cryptic": "神秘属性[按住SHIFT]", "text.garnished.cider.cryptic.desc": "这款苹果西打酒会提供给客户", "text.garnished.cider.cryptic.desc.secondary": "力量或者缓慢效果之一", From 6fffe51d83e7f44cd924df9b2f8662dd2c00b934 Mon Sep 17 00:00:00 2001 From: seasei <114800774+seaseii@users.noreply.github.com> Date: Tue, 1 Aug 2023 18:36:13 +0800 Subject: [PATCH 4/4] Update Co-authored-by: Cactus_student <97865546+Cactusstudent@users.noreply.github.com> --- projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json b/projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json index ae775d601627..f6ea08c61b63 100644 --- a/projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json +++ b/projects/1.19/assets/0-modrinth-mod/garnished/lang/zh_cn.json @@ -17,7 +17,7 @@ "text.garnished.cider.cryptic.desc": "这款苹果西打酒会提供给客户", "text.garnished.cider.cryptic.desc.secondary": "力量或者缓慢效果之一", "text.garnished.cider.cryptic.desc.third": "50比50的可能性,你会喝它吗?", - "text.garnished.cider.cryptic.desc.wither": "在被喝掉时净化饮用者的凋零效果", + "text.garnished.cider.cryptic.desc.wither": "在被喝掉时消除饮用者的凋零效果", "item.garnished.cashew": "腰果", "item.garnished.ungarnished_cashew": "腰果",