From ca322725efaf41277ba7e63bccb2043fda50b21b Mon Sep 17 00:00:00 2001 From: Lulilaya <116437893+Lulilaya@users.noreply.github.com> Date: Sat, 12 Nov 2022 17:46:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B1=89=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../farmlife/lang/en_us.json | 43 +++++++++++++++++++ .../farmlife/lang/zh_cn.json | 43 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 projects/1.18/assets/dracovita-farm-life/farmlife/lang/en_us.json create mode 100644 projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json diff --git a/projects/1.18/assets/dracovita-farm-life/farmlife/lang/en_us.json b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/en_us.json new file mode 100644 index 000000000000..b52b81e8890f --- /dev/null +++ b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/en_us.json @@ -0,0 +1,43 @@ +{ + "itemGroup.farmlife": "Farm Life", + + "item.farmlife.tribull_shank": "Raw Tri-bull Shank", + "item.farmlife.cooked_tribull_shank": "Cooked Tri-bull Shank", + "item.farmlife.music_disc_life_on_the_farm": "Music Disc", + "item.farmlife.music_disc_life_on_the_farm.desc": "Mr. Esuoh - Life on the Farm", + "item.farmlife.galliraptor_egg": "Galliraptor Egg", + "item.farmlife.galliraptor": "Raw Galliraptor", + "item.farmlife.cooked_galliraptor": "Cooked Galliraptor", + "item.farmlife.tribull_milk": "Tri-bull Milk Bucket", + "item.farmlife.tribull_cheese_wedge": "Tri-bull Cheese Wedge", + + "item.farmlife.domestic_tribull_spawn_egg": "Domestic Tri-bull Spawn Egg", + "item.farmlife.galliraptor_spawn_egg": "Galliraptor Spawn Egg", + + "block.farmlife.peacock_burst_poppy": "Peacock Burst Poppy", + "block.farmlife.electric_burst_poppy": "Electric Burst Poppy", + "block.farmlife.fancy_burst_poppy": "Fancy Burst Poppy", + "block.farmlife.olive_burst_poppy": "Olive Burst Poppy", + "block.farmlife.rusty_burst_poppy": "Rusty Burst Poppy", + "block.farmlife.sunstreak_burst_poppy": "Sunstreak Burst Poppy", + "block.farmlife.potted_peacock_burst_poppy": "Potted Peacock Burst Poppy", + "block.farmlife.potted_electric_burst_poppy": "Potted Electric Burst Poppy", + "block.farmlife.potted_fancy_burst_poppy": "Potted Fancy Burst Poppy", + "block.farmlife.potted_olive_burst_poppy": "Potted Olive Burst Poppy", + "block.farmlife.potted_rusty_burst_poppy": "Potted Rusty Burst Poppy", + "block.farmlife.potted_sunstreak_burst_poppy": "Potted Sunstreak Burst Poppy", + "block.farmlife.tribull_milk_cauldron": "Tri-bull Milk Cauldron", + "block.farmlife.tribull_cheese_wheel": "Tri-bull Cheese Wheel", + + "entity.farmlife.domestic_tribull": "Domestic Tri-bull", + "entity.farmlife.galliraptor": "Galliraptor", + "entity.farmlife.galliraptor_egg": "Galliraptor Egg", + + "farmlife.domestic_tribull.ambient": "Domestic Tri-bull grunts", + "farmlife.domestic_tribull.hurt": "Domestic Tri-bull hurts", + "farmlife.domestic_tribull.death": "Domestic Tri-bull dies", + + "farmlife.galliraptor.ambient": "Galliraptor clucks", + "farmlife.galliraptor.hurt": "Galliraptor hurts", + "farmlife.galliraptor.death": "Galliraptor dies" +} \ No newline at end of file diff --git a/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json new file mode 100644 index 000000000000..26412b79d3e5 --- /dev/null +++ b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json @@ -0,0 +1,43 @@ +{ + "itemGroup.farmlife": "Farm Life", + + "item.farmlife.tribull_shank": "生三足牛排", + "item.farmlife.cooked_tribull_shank": "熟三足牛排", + "item.farmlife.music_disc_life_on_the_farm": "音乐唱片", + "item.farmlife.music_disc_life_on_the_farm.desc": "Mr. Esuoh - Life on the Farm", + "item.farmlife.galliraptor_egg": "加利野鸡蛋", + "item.farmlife.galliraptor": "生加利野鸡肉", + "item.farmlife.cooked_galliraptor": "熟加利野鸡肉", + "item.farmlife.tribull_milk": "三足牛奶桶", + "item.farmlife.tribull_cheese_wedge": "三足牛奶酪块", + + "item.farmlife.domestic_tribull_spawn_egg": "驯化三足牛刷怪蛋", + "item.farmlife.galliraptor_spawn_egg": "加利野鸡刷怪蛋", + + "block.farmlife.peacock_burst_poppy": "孔雀蓝色爆裂虞美人", + "block.farmlife.electric_burst_poppy": "电光蓝色爆裂虞美人", + "block.farmlife.fancy_burst_poppy": "幻想粉色爆裂虞美人", + "block.farmlife.olive_burst_poppy": "橄榄绿色爆裂虞美人", + "block.farmlife.rusty_burst_poppy": "锈蚀棕色爆裂虞美人", + "block.farmlife.sunstreak_burst_poppy": "霞光橙色爆裂虞美人", + "block.farmlife.potted_peacock_burst_poppy": "孔雀蓝色爆裂虞美人盆栽", + "block.farmlife.potted_electric_burst_poppy": "电光蓝色爆裂虞美人盆栽", + "block.farmlife.potted_fancy_burst_poppy": "幻想粉色爆裂虞美人盆栽", + "block.farmlife.potted_olive_burst_poppy": "橄榄绿色爆裂虞美人盆栽", + "block.farmlife.potted_rusty_burst_poppy": "锈蚀棕色爆裂虞美人盆栽", + "block.farmlife.potted_sunstreak_burst_poppy": "霞光橙色爆裂虞美人盆栽", + "block.farmlife.tribull_milk_cauldron": "三足牛奶锅", + "block.farmlife.tribull_cheese_wheel": "三足牛奶酪块", + + "entity.farmlife.domestic_tribull": "驯化三足牛", + "entity.farmlife.galliraptor": "加利野鸡", + "entity.farmlife.galliraptor_egg": "加利野鸡蛋", + + "farmlife.domestic_tribull.ambient": "驯化三足牛哼叫声", + "farmlife.domestic_tribull.hurt": "驯化三足牛受伤声", + "farmlife.domestic_tribull.death": "驯化三足牛死亡声", + + "farmlife.galliraptor.ambient": "加利野鸡咯咯声", + "farmlife.galliraptor.hurt": "加利野鸡受伤声", + "farmlife.galliraptor.death": "加利野鸡死亡声" +} \ No newline at end of file From 8a1c020024a046d6b8e46ecd597060819d2ffdff Mon Sep 17 00:00:00 2001 From: Lulilaya <116437893+Lulilaya@users.noreply.github.com> Date: Sat, 12 Nov 2022 19:40:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../farmlife/lang/zh_cn.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json index 26412b79d3e5..237727a6491a 100644 --- a/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json +++ b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json @@ -5,14 +5,14 @@ "item.farmlife.cooked_tribull_shank": "熟三足牛排", "item.farmlife.music_disc_life_on_the_farm": "音乐唱片", "item.farmlife.music_disc_life_on_the_farm.desc": "Mr. Esuoh - Life on the Farm", - "item.farmlife.galliraptor_egg": "加利野鸡蛋", - "item.farmlife.galliraptor": "生加利野鸡肉", - "item.farmlife.cooked_galliraptor": "熟加利野鸡肉", + "item.farmlife.galliraptor_egg": "加利鸡蛋", + "item.farmlife.galliraptor": "生加利鸡肉", + "item.farmlife.cooked_galliraptor": "熟加利鸡肉", "item.farmlife.tribull_milk": "三足牛奶桶", "item.farmlife.tribull_cheese_wedge": "三足牛奶酪块", "item.farmlife.domestic_tribull_spawn_egg": "驯化三足牛刷怪蛋", - "item.farmlife.galliraptor_spawn_egg": "加利野鸡刷怪蛋", + "item.farmlife.galliraptor_spawn_egg": "加利鸡刷怪蛋", "block.farmlife.peacock_burst_poppy": "孔雀蓝色爆裂虞美人", "block.farmlife.electric_burst_poppy": "电光蓝色爆裂虞美人", @@ -30,14 +30,14 @@ "block.farmlife.tribull_cheese_wheel": "三足牛奶酪块", "entity.farmlife.domestic_tribull": "驯化三足牛", - "entity.farmlife.galliraptor": "加利野鸡", - "entity.farmlife.galliraptor_egg": "加利野鸡蛋", + "entity.farmlife.galliraptor": "加利鸡", + "entity.farmlife.galliraptor_egg": "加利鸡蛋", "farmlife.domestic_tribull.ambient": "驯化三足牛哼叫声", "farmlife.domestic_tribull.hurt": "驯化三足牛受伤声", "farmlife.domestic_tribull.death": "驯化三足牛死亡声", - "farmlife.galliraptor.ambient": "加利野鸡咯咯声", - "farmlife.galliraptor.hurt": "加利野鸡受伤声", - "farmlife.galliraptor.death": "加利野鸡死亡声" + "farmlife.galliraptor.ambient": "加利鸡咯咯声", + "farmlife.galliraptor.hurt": "加利鸡受伤声", + "farmlife.galliraptor.death": "加利鸡死亡声" } \ No newline at end of file From e322ac49de31b5a8f977bcdf0ba86991560e1de3 Mon Sep 17 00:00:00 2001 From: Lulilaya <116437893+Lulilaya@users.noreply.github.com> Date: Sat, 12 Nov 2022 23:25:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dracovita-farm-life/farmlife/lang/zh_cn.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json index 237727a6491a..3b859a1fe8a6 100644 --- a/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json +++ b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json @@ -26,18 +26,18 @@ "block.farmlife.potted_olive_burst_poppy": "橄榄绿色爆裂虞美人盆栽", "block.farmlife.potted_rusty_burst_poppy": "锈蚀棕色爆裂虞美人盆栽", "block.farmlife.potted_sunstreak_burst_poppy": "霞光橙色爆裂虞美人盆栽", - "block.farmlife.tribull_milk_cauldron": "三足牛奶锅", + "block.farmlife.tribull_milk_cauldron": "装有三足牛奶的炼药锅", "block.farmlife.tribull_cheese_wheel": "三足牛奶酪块", "entity.farmlife.domestic_tribull": "驯化三足牛", "entity.farmlife.galliraptor": "加利鸡", "entity.farmlife.galliraptor_egg": "加利鸡蛋", - "farmlife.domestic_tribull.ambient": "驯化三足牛哼叫声", - "farmlife.domestic_tribull.hurt": "驯化三足牛受伤声", - "farmlife.domestic_tribull.death": "驯化三足牛死亡声", + "farmlife.domestic_tribull.ambient": "驯化三足牛：哞~", + "farmlife.domestic_tribull.hurt": "驯化三足牛：受伤", + "farmlife.domestic_tribull.death": "驯化三足牛：死亡", - "farmlife.galliraptor.ambient": "加利鸡咯咯声", - "farmlife.galliraptor.hurt": "加利鸡受伤声", - "farmlife.galliraptor.death": "加利鸡死亡声" + "farmlife.galliraptor.ambient": "加利鸡：咯咯", + "farmlife.galliraptor.hurt": "加利鸡：受伤", + "farmlife.galliraptor.death": "加利鸡：死亡" } \ No newline at end of file From 1960813675e60eaadf85fc9b7535e066a3ad143a Mon Sep 17 00:00:00 2001 From: Lulilaya <116437893+Lulilaya@users.noreply.github.com> Date: Sun, 13 Nov 2022 11:24:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json index 3b859a1fe8a6..51386667eddd 100644 --- a/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json +++ b/projects/1.18/assets/dracovita-farm-life/farmlife/lang/zh_cn.json @@ -37,7 +37,7 @@ "farmlife.domestic_tribull.hurt": "驯化三足牛：受伤", "farmlife.domestic_tribull.death": "驯化三足牛：死亡", - "farmlife.galliraptor.ambient": "加利鸡：咯咯", + "farmlife.galliraptor.ambient": "加利鸡：咯咯叫", "farmlife.galliraptor.hurt": "加利鸡：受伤", "farmlife.galliraptor.death": "加利鸡：死亡" } \ No newline at end of file