Merge pull request #246 from Cryghast/1.20.1

update zh_cn and en_us

src/main/resources/assets/unicopia/lang/en_us.json

@@ -352,13 +352,15 @@
   "effect.unicopia.butter_fingers": "Butterfingers",
 
   "effect.unicopia.change_race_earth": "Earth Pony Metamorphosis",
+  "effect.unicopia.change_race_unicorn": "Unicorn Metamorphosis",
   "effect.unicopia.change_race_pegasus": "Pegasus Metamorphosis",
   "effect.unicopia.change_race_changeling": "Changeling Metamorphosis",
   "effect.unicopia.change_race_bat": "Bat Pony Metamorphosis",
   "effect.unicopia.change_race_kirin": "Kirin Metamorphosis",
   "effect.unicopia.change_race_hippogriff": "Hippogriff Metamorphosis",
 
   "effect.unicopia.morph_race_earth": "Earth Pony Transformation",
+  "effect.unicopia.morph_race_unicorn": "Unicorn Transformation",
   "effect.unicopia.morph_race_pegasus": "Pegasus Transformation",
   "effect.unicopia.morph_race_changeling": "Changeling Transformation",
   "effect.unicopia.morph_race_bat": "Bat Pony Transformation",
@@ -370,7 +372,6 @@
   "item.minecraft.lingering_potion.effect.unicopia.tribe_swap_earth": "Lingering Potion of Earth Pony Metamorphosis",
   "item.minecraft.tipped_arrow.effect.unicopia.tribe_swap_earth": "Arrow of Earth Pony Metamorphosis",
 
-  "effect.unicopia.change_race_unicorn": "Unicorn Metamorphosis",
   "item.minecraft.potion.effect.unicopia.tribe_swap_unicorn": "Potion of Unicorn Metamorphosis",
   "item.minecraft.splash_potion.effect.unicopia.tribe_swap_unicorn": "Splash Potion of Unicorn Metamorphosis",
   "item.minecraft.lingering_potion.effect.unicopia.tribe_swap_unicorn": "Lingering Potion of Unicorn Metamorphosis",

src/main/resources/assets/unicopia/lang/zh_cn.json

@@ -123,6 +123,7 @@
   "item.unicopia.green_apple_seeds": "史密斯婆婆苹果的种子",
   "item.unicopia.sweet_apple_seeds": "甜苹果的种子",
   "item.unicopia.sour_apple_seeds": "酸苹果的种子",
+  "item.unicopia.golden_oak_seeds": "金橡树种子",
   "item.unicopia.apple_pie_hoof": "蹄印苹果派",
   "item.unicopia.apple_pie_slice": "一片苹果派",
   "item.unicopia.candied_apple": "苹果蜜饯",
@@ -248,6 +249,10 @@
   "block.unicopia.weather_vane": "风向标",
   "block.unicopia.curing_joke": "疗玩笑",
   "block.unicopia.gold_root": "黄金根",
+  "block.unicopia.golden_oak_sprout": "金橡树嫩芽",
+  "block.unicopia.golden_oak_sapling": "金橡树树苗",
+  "block.unicopia.golden_oak_leaves": "金橡树树叶",
+  "block.unicopia.golden_oak_log": "金橡树原木",
   "block.unicopia.mango": "芒果",
   "block.unicopia.mango_leaves": "芒果树叶",
   "block.unicopia.mango_sapling": "芒果树苗",
@@ -347,47 +352,126 @@
   "effect.unicopia.butter_fingers": "手滑",
 
   "effect.unicopia.change_race_earth": "转生陆马",
+  "effect.unicopia.change_race_unicorn": "转生独角兽",
+  "effect.unicopia.change_race_pegasus": "转生天马",
+  "effect.unicopia.change_race_changeling": "转生幻形灵",
+  "effect.unicopia.change_race_bat": "转生夜骐",
+  "effect.unicopia.change_race_kirin": "转生麒麟",
+  "effect.unicopia.change_race_hippogriff": "转生骏鹰",
+
+  "effect.unicopia.morph_race_earth": "变成陆马",
+  "effect.unicopia.morph_race_unicopia": "变成独角兽",
+  "effect.unicopia.morph_race_pegasus": "变成天马",
+  "effect.unicopia.morph_race_changeling": "变成幻形灵",
+  "effect.unicopia.morph_race_bat": "变成夜骐",
+  "effect.unicopia.morph_race_kirin": "变成麒麟",
+  "effect.unicopia.morph_race_hippogriff": "变成骏鹰",
+
   "item.minecraft.potion.effect.unicopia.tribe_swap_earth": "转生陆马药水",
   "item.minecraft.splash_potion.effect.unicopia.tribe_swap_earth": "喷溅型转生陆马药水",
   "item.minecraft.lingering_potion.effect.unicopia.tribe_swap_earth": "滞留型转生陆马药水",
   "item.minecraft.tipped_arrow.effect.unicopia.tribe_swap_earth": "转生陆马之箭",
 
-  "effect.unicopia.change_race_unicorn": "转生独角兽",
   "item.minecraft.potion.effect.unicopia.tribe_swap_unicorn": "转生独角兽药水",
   "item.minecraft.splash_potion.effect.unicopia.tribe_swap_unicorn": "喷溅型转生独角兽药水",
   "item.minecraft.lingering_potion.effect.unicopia.tribe_swap_unicorn": "滞留型转生独角兽药水",
   "item.minecraft.tipped_arrow.effect.unicopia.tribe_swap_unicorn": "转生独角兽之箭",
 
-  "effect.unicopia.change_race_pegasus": "转生天马",
   "item.minecraft.potion.effect.unicopia.tribe_swap_pegasus": "转生天马药水",
   "item.minecraft.splash_potion.effect.unicopia.tribe_swap_pegasus": "喷溅型转生天马药水",
   "item.minecraft.lingering_potion.effect.unicopia.tribe_swap_pegasus": "滞留型转生天马药水",
   "item.minecraft.tipped_arrow.effect.unicopia.tribe_swap_pegasus": "转生天马之箭",
 
-  "effect.unicopia.change_race_changeling": "转生幻形灵",
   "item.minecraft.potion.effect.unicopia.tribe_swap_changeling": "转生幻形灵药水",
   "item.minecraft.splash_potion.effect.unicopia.tribe_swap_changeling": "喷溅型转生幻形灵药水",
   "item.minecraft.lingering_potion.effect.unicopia.tribe_swap_changeling": "滞留型转生幻形灵药水",
   "item.minecraft.tipped_arrow.effect.unicopia.tribe_swap_changeling": "转生幻形灵之箭",
 
-  "effect.unicopia.change_race_bat": "转生夜骐",
   "item.minecraft.potion.effect.unicopia.tribe_swap_bat": "转生夜骐药水",
   "item.minecraft.splash_potion.effect.unicopia.tribe_swap_bat": "喷溅型转生夜骐药水",
   "item.minecraft.lingering_potion.effect.unicopia.tribe_swap_bat": "滞留型转生夜骐药水",
   "item.minecraft.tipped_arrow.effect.unicopia.tribe_swap_bat": "转生夜骐之箭",
 
-  "effect.unicopia.change_race_kirin": "转生麒麟",
   "item.minecraft.potion.effect.unicopia.tribe_swap_kirin": "转生麒麟药水",
   "item.minecraft.splash_potion.effect.unicopia.tribe_swap_kirin": "喷溅型转生麒麟药水",
   "item.minecraft.lingering_potion.effect.unicopia.tribe_swap_kirin": "滞留型转生麒麟药水",
   "item.minecraft.tipped_arrow.effect.unicopia.tribe_swap_kirin": "转生麒麟之箭",
 
-  "effect.unicopia.change_race_hippogriff": "转生骏鹰",
   "item.minecraft.potion.effect.unicopia.tribe_swap_hippogriff": "转生骏鹰药水",
   "item.minecraft.splash_potion.effect.unicopia.tribe_swap_hippogriff": "喷溅型转生骏鹰药水",
   "item.minecraft.lingering_potion.effect.unicopia.tribe_swap_hippogriff": "滞留型转生骏鹰药水",
   "item.minecraft.tipped_arrow.effect.unicopia.tribe_swap_hippogriff": "转生骏鹰之箭",
-
+
+  "item.minecraft.potion.effect.unicopia.short_morph_earth": "短效变成陆马药水",
+  "item.minecraft.splash_potion.effect.unicopia.short_morph_earth": "喷溅型短效变成陆马药水",
+  "item.minecraft.lingering_potion.effect.unicopia.short_morph_earth": "滞留型短效变成陆马药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.short_morph_earth": "短效变成陆马之箭",
+
+  "item.minecraft.potion.effect.unicopia.short_morph_unicorn": "短效变成独角兽药水",
+  "item.minecraft.splash_potion.effect.unicopia.short_morph_unicorn": "喷溅型短效变成独角兽药水",
+  "item.minecraft.lingering_potion.effect.unicopia.short_morph_unicorn": "滞留型短效变成独角兽药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.short_morph_unicorn": "短效变成独角兽之箭",
+
+  "item.minecraft.potion.effect.unicopia.short_morph_pegasus": "短效变成天马药水",
+  "item.minecraft.splash_potion.effect.unicopia.short_morph_pegasus": "喷溅型短效变成天马药水",
+  "item.minecraft.lingering_potion.effect.unicopia.short_morph_pegasus": "滞留型短效变成天马药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.short_morph_pegasus": "短效变成天马之箭",
+
+  "item.minecraft.potion.effect.unicopia.short_morph_changeling": "短效变成幻形灵药水",
+  "item.minecraft.splash_potion.effect.unicopia.short_morph_changeling": "喷溅型短效变成幻形灵药水",
+  "item.minecraft.lingering_potion.effect.unicopia.short_morph_changeling": "滞留型短效变成幻形灵药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.short_morph_changeling": "短效变成幻形灵之箭",
+
+  "item.minecraft.potion.effect.unicopia.short_morph_bat": "短效变成夜骐药水",
+  "item.minecraft.splash_potion.effect.unicopia.short_morph_bat": "喷溅型短效变成夜骐药水",
+  "item.minecraft.lingering_potion.effect.unicopia.short_morph_bat": "滞留型短效变成夜骐药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.short_morph_bat": "短效变成夜骐之箭",
+
+  "item.minecraft.potion.effect.unicopia.short_morph_kirin": "短效变成麒麟药水",
+  "item.minecraft.splash_potion.effect.unicopia.short_morph_kirin": "喷溅型短效变成麒麟药水",
+  "item.minecraft.lingering_potion.effect.unicopia.short_morph_kirin": "滞留型短效变成麒麟药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.short_morph_kirin": "短效变成麒麟之箭",
+
+  "item.minecraft.potion.effect.unicopia.short_morph_hippogriff": "短效变成骏鹰药水",
+  "item.minecraft.splash_potion.effect.unicopia.short_morph_hippogriff": "喷溅型短效变成骏鹰药水",
+  "item.minecraft.lingering_potion.effect.unicopia.short_morph_hippogriff": "滞留型短效变成骏鹰药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.short_morph_hippogriff": "短效变成骏鹰之箭",
+
+  "item.minecraft.potion.effect.unicopia.long_morph_earth": "长效变成陆马药水",
+  "item.minecraft.splash_potion.effect.unicopia.long_morph_earth": "喷溅型长效变成陆马药水",
+  "item.minecraft.lingering_potion.effect.unicopia.long_morph_earth": "滞留型长效变成陆马药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.long_morph_earth": "长效变成陆马之箭",
+
+  "item.minecraft.potion.effect.unicopia.long_morph_unicorn": "长效变成独角兽药水",
+  "item.minecraft.splash_potion.effect.unicopia.long_morph_unicorn": "喷溅型长效变成独角兽药水",
+  "item.minecraft.lingering_potion.effect.unicopia.long_morph_unicorn": "滞留型长效变成独角兽药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.long_morph_unicorn": "长效变成独角兽之箭",
+
+  "item.minecraft.potion.effect.unicopia.long_morph_pegasus": "长效变成天马药水",
+  "item.minecraft.splash_potion.effect.unicopia.long_morph_pegasus": "喷溅型长效变成天马药水",
+  "item.minecraft.lingering_potion.effect.unicopia.long_morph_pegasus": "滞留型长效变成天马药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.long_morph_pegasus": "长效变成天马之箭",
+
+  "item.minecraft.potion.effect.unicopia.long_morph_changeling": "长效变成幻形灵药水",
+  "item.minecraft.splash_potion.effect.unicopia.long_morph_changeling": "喷溅型长效变成幻形灵药水",
+  "item.minecraft.lingering_potion.effect.unicopia.long_morph_changeling": "滞留型长效变成幻形灵药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.long_morph_changeling": "长效变成幻形灵之箭",
+
+  "item.minecraft.potion.effect.unicopia.long_morph_bat": "长效变成夜骐药水",
+  "item.minecraft.splash_potion.effect.unicopia.long_morph_bat": "喷溅型长效变成夜骐药水",
+  "item.minecraft.lingering_potion.effect.unicopia.long_morph_bat": "滞留型长效变成夜骐药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.long_morph_bat": "长效变成夜骐之箭",
+
+  "item.minecraft.potion.effect.unicopia.long_morph_kirin": "长效变成麒麟药水",
+  "item.minecraft.splash_potion.effect.unicopia.long_morph_kirin": "喷溅型长效变成麒麟药水",
+  "item.minecraft.lingering_potion.effect.unicopia.long_morph_kirin": "滞留型长效变成麒麟药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.long_morph_kirin": "长效变成麒麟之箭",
+
+  "item.minecraft.potion.effect.unicopia.long_morph_hippogriff": "长效变成骏鹰药水",
+  "item.minecraft.splash_potion.effect.unicopia.long_morph_hippogriff": "喷溅型长效变成骏鹰药水",
+  "item.minecraft.lingering_potion.effect.unicopia.long_morph_hippogriff": "滞留型长效变成骏鹰药水",
+  "item.minecraft.tipped_arrow.effect.unicopia.long_morph_hippogriff": "长效变成骏鹰之箭",
+
   "potion.withChance": "%s 分之 1 的概率为 %s",
   "potion.potency.6": "VII",
 
@@ -993,6 +1077,10 @@
   "death.attack.unicopia.rock.self": "%1$s 被击中了",
   "death.attack.unicopia.rock.item": "%1$s 被 %2$s 用 %3$s 击中了",
   "death.attack.unicopia.rock.player": "%1$s 被 %2$s 击中了",
+  "death.attack.unicopia.horseshoe": "%1$s 被咣了",
+  "death.attack.unicopia.horseshoe.self": "%1$s 咣了自己",
+  "death.attack.unicopia.horseshoe.item": "%1$s 被 %2$s 用 %3$s 咣了",
+  "death.attack.unicopia.horseshoe.player": "%1$s 被 %2$s 咣了",
 
   "death.fell.accident.ladder.pegasus": "%1$s 从梯子上掉下来时忘了自己会飞",
   "death.fell.accident.vines.pegasus": "%1$s 从藤蔓上掉下来时忘了自己会飞",
@@ -1110,7 +1198,7 @@
   "advancements.unicopia.eat_pinecone.title": "豁出去了",
   "advancements.unicopia.eat_pinecone.description": "吃下一颗松果",
   "advancements.unicopia.imported_oats.title": "昂贵的味道",
-  "advancements.unicopia.imported_oats.description": "用魔法邮寄高档进口燕麦",
+  "advancements.unicopia.imported_oats.description": "寄出或收到高档进口燕麦",
 
   "advancements.unicopia.experimental.title": "你不能带走它",
   "advancements.unicopia.experimental.description": "给一件工具附上经验提取的魔力",
@@ -1159,6 +1247,8 @@
   "advancements.unicopia.earth_route.description": "入伙苹果帮",
   "advancements.unicopia.sticks_and_stones.title": "岩与攻击",
   "advancements.unicopia.sticks_and_stones.description": "扔出石块砸死一位生灵",
+  "advancements.unicopia.dead_ringer.title": "死亡回旋",
+  "advancements.unicopia.dead_ringer.description": "用蹄铁砸死一位生灵",
   "advancements.unicopia.born_on_a_rock_farm.title": "种石得石",
   "advancements.unicopia.born_on_a_rock_farm.description": "播种石籽",
   "advancements.unicopia.thats_unusual.title": "不对劲",