From 3e8ae89d3edf26d39b70b874aa75e071fa6f1d9b Mon Sep 17 00:00:00 2001
From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com>
Date: Mon, 7 Aug 2023 16:58:30 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../1.18/assets/spirit/spirit/lang/en_us.json |  82 +++++++++++++
 .../1.18/assets/spirit/spirit/lang/zh_cn.json |  82 +++++++++++++
 .../1.19/assets/spirit/spirit/lang/en_us.json | 108 ++++++++++++++++++
 .../1.19/assets/spirit/spirit/lang/zh_cn.json | 108 ++++++++++++++++++
 4 files changed, 380 insertions(+)
 create mode 100644 projects/1.18/assets/spirit/spirit/lang/en_us.json
 create mode 100644 projects/1.18/assets/spirit/spirit/lang/zh_cn.json
 create mode 100644 projects/1.19/assets/spirit/spirit/lang/en_us.json
 create mode 100644 projects/1.19/assets/spirit/spirit/lang/zh_cn.json

diff --git a/projects/1.18/assets/spirit/spirit/lang/en_us.json b/projects/1.18/assets/spirit/spirit/lang/en_us.json
new file mode 100644
index 000000000000..c116b802f22e
--- /dev/null
+++ b/projects/1.18/assets/spirit/spirit/lang/en_us.json
@@ -0,0 +1,82 @@
+{
+    "item.spirit.soul_crystal": "Soul Crystal",
+    "item.spirit.crude_soul_crystal": "Crude Soul Crystal",
+    "item.spirit.soul_crystal_shard": "Soul Crystal Shard",
+    "item.spirit.soul_steel_axe": "Soul Steel Axe",
+    "item.spirit.soul_steel_bow": "Soul Steel Bow",
+    "item.spirit.soul_steel_hoe": "Soul Steel Hoe",
+    "item.spirit.soul_steel_pickaxe": "Soul Steel Pickaxe",
+    "item.spirit.soul_steel_shovel": "Soul Steel Shovel",
+    "item.spirit.soul_steel_sword": "Soul Steel Sword",
+    "item.spirit.soul_steel_wand": "Soul Steel Wand",
+    "item.spirit.soul_powder": "Soul Powder",
+    "item.spirit.glossary": "Revenant Enchiridion",
+    "item.spirit.soul_steel_ingot": "Soul Steel Ingot",
+    "item.spirit.soul_crystal.upgrade_message": "Your crystal's spirit reaches new heights! Tier upgraded.",
+    "block.spirit.broken_spawner.tooltip": "Remains of destoyed spawner<br>See the Revenant Enchiridion for more info",
+    "block.spirit.shiftkey.tooltip": "Hold [SHIFT] for more info",
+    "block.spirit.soul_cage": "Soul Cage",
+    "block.spirit.soul_slate": "Soul Slate",
+    "block.spirit.soul_glass": "Soul Glass",
+    "block.spirit.soul_glass_1": "Soul Glass",
+    "block.spirit.soul_glass_2": "Soul Glass",
+    "block.spirit.soul_glass_3": "Soul Glass",
+    "block.spirit.soul_glass_4": "Soul Glass",
+    "block.spirit.soul_glass_5": "Soul Glass",
+    "block.spirit.soul_glass_6": "Soul Glass",
+    "block.spirit.soul_glass_7": "Soul Glass",
+    "block.spirit.soul_glass_8": "Soul Glass",
+    "block.spirit.soul_glass_9": "Soul Glass",
+    "block.spirit.soul_glass_10": "Soul Glass",
+    "block.spirit.soul_glass_11": "Soul Glass",
+    "block.spirit.soul_glass_12": "Soul Glass",
+    "block.spirit.soul_glass_13": "Soul Glass",
+    "block.spirit.soul_pedestal": "Soul Pedestal",
+    "block.spirit.crystal_pedestal": "Crystal Pedestal",
+    "block.spirit.pedestal": "Pedestal",
+    "block.spirit.soul_steel_block": "Soul Steel Block",
+    "block.spirit.soul_cage.empty_hover_text": "Empty",
+    "block.spirit.broken_spawner": "Broken Spawner",
+    "block.spirit.soul_powder_block": "Soul Powder Block",
+    "entity.spirit.soul": "Crude Soul",
+    "spirit.soul_cage.tier_0": "Null",
+    "spirit.soul_cage.tier_1": "Eins",
+    "spirit.soul_cage.tier_2": "Zwei",
+    "spirit.soul_cage.tier_3": "Drei",
+    "spirit.soul_cage.tier_4": "Vier",
+    "effect.spirit.corrupted": "Soulless",
+    "itemGroup.spirit.itemgroup": "Spirit",
+    "enchantment.spirit.soul_reaper": "Soul Reaper",
+    "enchantment.spirit.soul_reaper.desc": "Grants one additional soul per kill for every level of enchantment",
+    "config.spirit.toggletooltip": "Disable/Enable Entity Visual Effect",
+    "tooltip.spirit.soul_crystal.unbound": "Unbound",
+    "spirit.item.soul_crystal_shard.tooltip": "Contains: %s",
+    "spirit.item.crude_soul_crystal.tooltip": "Souls: ",
+    "spirit.item.crude_soul_crystal.tooltip_empty": "Empty",
+    "spirit.item.soul_steel_tool.empowered": "§7Press §8[%s§8]§7 to Depower§r",
+    "spirit.item.soul_steel_tool.unpowered": "§7Press §8[%s§8]§7 to Empower§r",
+    "spirit.the_one_probe.soul_cage.tier_suffix": "- Tier",
+    "spirit.the_one_probe.soul_cage.bar_suffix": " Souls",
+    "spirit.tooltip.chipped_loaded": "Install Chipped to use this properly",
+    "spirit.jei.soul_transmutation.title": "Soul Transmutation",
+    "spirit.jei.soul_transmutation.consumes": "Consumes Item",
+    "spirit.jei.soul_transmutation.empty_hand": "Right Click With Empty Hand",
+    "spirit.jei.soul_engulfing.title": "Soul Engulfing",
+    "spirit.jei.soul_engulfing.consumes": "Consumes Blocks",
+    "spirit.jei.soul_engulfing.layer": "Layer %s",
+    "spirit.jei.soul_engulfing.duration": "Duration: %ss",
+    "spirit.jei.soul_cage_tier.title": "Soul Cage Info",
+    "spirit.jei.soul_cage_info.tier_prefix": "Tier %s",
+    "spirit.jei.soul_cage_info.required_souls": "Requires %s Souls",
+    "spirit.jei.soul_cage_info.spawn_delay": "Delay between %s and %s ticks",
+    "spirit.jei.soul_cage_info.spawn_count": "Spawns %s mobs per cycle",
+    "spirit.jei.soul_cage_info.spawn_range": "Spawns up to %s blocks away",
+    "spirit.jei.soul_cage_info.player_nearby": "Requires player be %s blocks away",
+    "spirit.jei.soul_cage_info.player_nearby_not_required": "Nearby player not required",
+    "spirit.jei.soul_cage_info.redstone_controlled_true": "Controllable with redstone",
+    "spirit.jei.soul_cage_info.redstone_controlled_false": "Not controlled with redstone",
+    "spirit.jei.soul_cage_info.ignored_spawn_conditions_true": "Follows spawn conditions",
+    "spirit.jei.soul_cage_info.ignored_spawn_conditions_false": "Ignores spawn conditions",
+    "category.spirit.soul_steel_tools": "Spirit",
+    "key.spirit.toggle": "Toggle Empowered"
+  }
\ No newline at end of file
diff --git a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
new file mode 100644
index 000000000000..d247eceadeb2
--- /dev/null
+++ b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
@@ -0,0 +1,82 @@
+{
+    "item.spirit.soul_crystal": "灵魂水晶",
+    "item.spirit.crude_soul_crystal": "粗制灵魂水晶",
+    "item.spirit.soul_crystal_shard": "灵魂水晶碎片",
+    "item.spirit.soul_steel_axe": "灵魂钢斧",
+    "item.spirit.soul_steel_bow": "灵魂钢弓",
+    "item.spirit.soul_steel_hoe": "灵魂钢锄",
+    "item.spirit.soul_steel_pickaxe": "灵魂钢镐",
+    "item.spirit.soul_steel_shovel": "灵魂钢锹",
+    "item.spirit.soul_steel_sword": "灵魂钢剑",
+    "item.spirit.soul_steel_wand": "灵魂钢法杖",
+    "item.spirit.soul_powder": "灵魂尘",
+    "item.spirit.glossary": "亡灵手册",
+    "item.spirit.soul_steel_ingot": "灵魂钢锭",
+    "item.spirit.soul_crystal.upgrade_message": "你水晶中蕴含的灵魂已到达了新的高度! 已升级。",
+    "block.spirit.broken_spawner.tooltip": "被损毁的刷怪笼残骸<br>查看亡灵手册获取更多信息",
+    "block.spirit.shiftkey.tooltip": "按住[SHIFT]获取更多信息",
+    "block.spirit.soul_cage": "灵魂笼",
+    "block.spirit.soul_slate": "灵魂板岩",
+    "block.spirit.soul_glass": "灵魂玻璃",
+    "block.spirit.soul_glass_1": "灵魂玻璃",
+    "block.spirit.soul_glass_2": "灵魂玻璃",
+    "block.spirit.soul_glass_3": "灵魂玻璃",
+    "block.spirit.soul_glass_4": "灵魂玻璃",
+    "block.spirit.soul_glass_5": "灵魂玻璃",
+    "block.spirit.soul_glass_6": "灵魂玻璃",
+    "block.spirit.soul_glass_7": "灵魂玻璃",
+    "block.spirit.soul_glass_8": "灵魂玻璃",
+    "block.spirit.soul_glass_9": "灵魂玻璃",
+    "block.spirit.soul_glass_10": "灵魂玻璃",
+    "block.spirit.soul_glass_11": "灵魂玻璃",
+    "block.spirit.soul_glass_12": "灵魂玻璃",
+    "block.spirit.soul_glass_13": "灵魂玻璃",
+    "block.spirit.soul_pedestal": "灵魂基座",
+    "block.spirit.crystal_pedestal": "水晶基座",
+    "block.spirit.pedestal": "基座",
+    "block.spirit.soul_steel_block": "灵魂钢块",
+    "block.spirit.soul_cage.empty_hover_text": "空",
+    "block.spirit.broken_spawner": "破损的刷怪笼",
+    "block.spirit.soul_powder_block": "灵魂尘块",
+    "entity.spirit.soul": "粗糙灵魂",
+    "spirit.soul_cage.tier_0": "Null",
+    "spirit.soul_cage.tier_1": "Eins",
+    "spirit.soul_cage.tier_2": "Zwei",
+    "spirit.soul_cage.tier_3": "Drei",
+    "spirit.soul_cage.tier_4": "Vier",
+    "effect.spirit.corrupted": "失魂",
+    "itemGroup.spirit.itemgroup": "Spirit",
+    "enchantment.spirit.soul_reaper": "灵魂收割者",
+    "enchantment.spirit.soul_reaper.desc": "魔咒等级每增加一级，每次击杀后额外给予一个灵魂",
+    "config.spirit.toggletooltip": "禁用/启用实体视觉效果",
+    "tooltip.spirit.soul_crystal.unbound": "未绑定",
+    "spirit.item.soul_crystal_shard.tooltip": "包含：%s",
+    "spirit.item.crude_soul_crystal.tooltip": "灵魂：",
+    "spirit.item.crude_soul_crystal.tooltip_empty": "空",
+    "spirit.item.soul_steel_tool.empowered": "§7按下§8[%s§8]§7以释能§r",
+    "spirit.item.soul_steel_tool.unpowered": "§7按下§8[%s§8]§7以冲能§r",
+    "spirit.the_one_probe.soul_cage.tier_suffix": "- 等级",
+    "spirit.the_one_probe.soul_cage.bar_suffix": " 灵魂",
+    "spirit.tooltip.chipped_loaded": "安装Chipped以正常使用此功能",
+    "spirit.jei.soul_transmutation.title": "灵魂嬗变",
+    "spirit.jei.soul_transmutation.consumes": "消耗物品",
+    "spirit.jei.soul_transmutation.empty_hand": "空手右键点击",
+    "spirit.jei.soul_engulfing.title": "灵魂吞噬",
+    "spirit.jei.soul_engulfing.consumes": "消耗方块",
+    "spirit.jei.soul_engulfing.layer": "第%s层",
+    "spirit.jei.soul_engulfing.duration": "数量: %ss",
+    "spirit.jei.soul_cage_tier.title": "灵魂笼信息",
+    "spirit.jei.soul_cage_info.tier_prefix": "等级%s",
+    "spirit.jei.soul_cage_info.required_souls": "需要%s个灵魂",
+    "spirit.jei.soul_cage_info.spawn_delay": "生成间隔从%s到%stick",
+    "spirit.jei.soul_cage_info.spawn_count": "每次生成%s只生物",
+    "spirit.jei.soul_cage_info.spawn_range": "最远生成于%s格外",
+    "spirit.jei.soul_cage_info.player_nearby": "需要玩家在%s格以内",
+    "spirit.jei.soul_cage_info.player_nearby_not_required": "附近不需要有玩家",
+    "spirit.jei.soul_cage_info.redstone_controlled_true": "可用红石控制",
+    "spirit.jei.soul_cage_info.redstone_controlled_false": "不可用红石控制",
+    "spirit.jei.soul_cage_info.ignored_spawn_conditions_true": "遵循生成条件",
+    "spirit.jei.soul_cage_info.ignored_spawn_conditions_false": "无视生成条件",
+    "category.spirit.soul_steel_tools": "Spirit",
+    "key.spirit.toggle": "切换技能"
+  }
\ No newline at end of file
diff --git a/projects/1.19/assets/spirit/spirit/lang/en_us.json b/projects/1.19/assets/spirit/spirit/lang/en_us.json
new file mode 100644
index 000000000000..13f93e1f2110
--- /dev/null
+++ b/projects/1.19/assets/spirit/spirit/lang/en_us.json
@@ -0,0 +1,108 @@
+{
+    "item.spirit.soul_crystal": "Soul Crystal",
+    "item.spirit.crude_soul_crystal": "Crude Soul Crystal",
+    "item.spirit.soul_crystal_shard": "Soul Crystal Shard",
+    "item.spirit.soul_steel_axe": "Soul Steel Axe",
+    "item.spirit.soul_steel_bow": "Soul Steel Bow",
+    "item.spirit.soul_steel_hoe": "Soul Steel Hoe",
+    "item.spirit.soul_steel_pickaxe": "Soul Steel Pickaxe",
+    "item.spirit.soul_steel_shovel": "Soul Steel Shovel",
+    "item.spirit.soul_steel_sword": "Soul Steel Sword",
+    "item.spirit.soul_steel_wand": "Soul Steel Wand",
+    "item.spirit.soul_powder": "Soul Powder",
+    "item.spirit.glossary": "Revenant Enchiridion",
+    "item.spirit.soul_steel_ingot": "Soul Steel Ingot",
+    "item.spirit.soul_crystal.upgrade_message": "Your crystal's spirit reaches new heights! Tier upgraded.",
+    "block.spirit.soul_cage": "Soul Cage",
+    "block.spirit.soul_slate": "Soul Slate",
+    "block.spirit.soul_glass": "Soul Glass",
+    "block.spirit.soul_glass_1": "Soul Glass",
+    "block.spirit.soul_glass_2": "Soul Glass",
+    "block.spirit.soul_glass_3": "Soul Glass",
+    "block.spirit.soul_glass_4": "Soul Glass",
+    "block.spirit.soul_glass_5": "Soul Glass",
+    "block.spirit.soul_glass_6": "Soul Glass",
+    "block.spirit.soul_glass_7": "Soul Glass",
+    "block.spirit.soul_glass_8": "Soul Glass",
+    "block.spirit.soul_glass_9": "Soul Glass",
+    "block.spirit.soul_glass_10": "Soul Glass",
+    "block.spirit.soul_glass_11": "Soul Glass",
+    "block.spirit.soul_glass_12": "Soul Glass",
+    "block.spirit.soul_glass_13": "Soul Glass",
+    "block.spirit.soul_pedestal": "Soul Pedestal",
+    "block.spirit.crystal_pedestal": "Crystal Pedestal",
+    "block.spirit.pedestal": "Pedestal",
+    "block.spirit.soul_steel_block": "Soul Steel Block",
+    "block.spirit.soul_cage.empty_hover_text": "Empty",
+    "block.spirit.broken_spawner": "Broken Spawner",
+    "block.spirit.soul_powder_block": "Soul Powder Block",
+    "block.spirit.compressed_soul_powder_block": "Compressed Soul Powder Block",
+    "block.spirit.compressed_soul_sand": "Compressed Soul Sand",
+    "entity.spirit.soul": "Crude Soul",
+    "spirit.soul_cage.tier_0": "Useless",
+    "spirit.soul_cage.tier_1": "Mediocre",
+    "spirit.soul_cage.tier_2": "Average",
+    "spirit.soul_cage.tier_3": "Advanced",
+    "spirit.soul_cage.tier_4": "Ultimate",
+    "effect.spirit.corrupted": "Soulless",
+    "itemGroup.spirit.itemgroup": "Spirit",
+    "enchantment.spirit.soul_reaper": "Soul Reaper",
+    "enchantment.spirit.soul_reaper.desc": "Grants one additional soul per kill for every level of enchantment",
+    "config.spirit.toggletooltip": "Disable/Enable Entity Visual Effect",
+    "tooltip.spirit.soul_crystal.unbound": "Unbound",
+    "spirit.item.soul_crystal_shard.tooltip": "Contains: %s",
+    "spirit.item.crude_soul_crystal.tooltip": "Souls: ",
+    "spirit.item.crude_soul_crystal.tooltip_empty": "Empty",
+    "spirit.item.soul_steel_tool.empowered": "§7Press §8[%s§8]§7 to Depower§r",
+    "spirit.item.soul_steel_tool.unpowered": "§7Press §8[%s§8]§7 to Empower§r",
+    "spirit.the_one_probe.soul_cage.tier_suffix": "- Tier",
+    "spirit.the_one_probe.soul_cage.bar_suffix": " Souls",
+    "spirit.tooltip.chipped_loaded": "Install Chipped to use this properly",
+    "spirit.jei.soul_transmutation.title": "Soul Transmutation",
+    "spirit.jei.soul_transmutation.consumes": "Consumes Item",
+    "spirit.jei.soul_transmutation.empty_hand": "Right Click With Empty Hand",
+    "spirit.jei.soul_engulfing.title": "Soul Engulfing",
+    "spirit.jei.soul_engulfing.consumes": "Consumes Blocks",
+    "spirit.jei.soul_engulfing.layer": "Layer %s",
+    "spirit.jei.soul_engulfing.duration": "Duration: %ss",
+    "spirit.jei.soul_cage_tier.title": "Soul Cage Info",
+    "spirit.jei.soul_cage_info.tier_prefix": "Tier %s",
+    "spirit.jei.soul_cage_info.required_souls": "Requires %s Souls",
+    "spirit.jei.soul_cage_info.spawn_delay": "Delay between %s & %s ticks",
+    "spirit.jei.soul_cage_info.spawn_count": "Spawns %s mobs per cycle",
+    "spirit.jei.soul_cage_info.spawn_range": "Spawns up to %s blocks away",
+    "spirit.jei.soul_cage_info.player_nearby": "Needs player within %s blocks",
+    "spirit.jei.soul_cage_info.player_nearby_not_required": "Does not require nearby player",
+    "spirit.jei.soul_cage_info.redstone_controlled_true": "Controllable with redstone",
+    "spirit.jei.soul_cage_info.redstone_controlled_false": "Not controlled with redstone",
+    "spirit.jei.soul_cage_info.ignored_spawn_conditions_true": "Follows spawn conditions",
+    "spirit.jei.soul_cage_info.ignored_spawn_conditions_false": "Ignores spawn conditions",
+    "key.spirit.toggle": "Toggle Empowered",
+    "category.spirit.keybinds": "Spirit",
+  
+    "item.spirit.soul_crystal.tooltip": "§b☠§r %s",
+    "item.spirit.soul_crystal.entity_component": "%s \uD83D\uDD25 %s",
+    "item.spirit.soul_crystal.none": "Empty",
+    "misc.spirit.shift.shift_info": "Hold §8[%s§8]§r for more info",
+    "misc.spirit.shift.key": "SHIFT",
+    "item.spirit.soul_crystal.info_empty": "Kill 1 mob to bind",
+    "misc.spirit.soul_cage_compatible": "§2✔§r Mob is Soul Cage Compatible",
+    "misc.spirit.soul_cage_incompatible": "§4❌§r Mob is Soul Cage Incompatible",
+    "misc.vitalize.machine_compatible": "§2✔§r Mob is Soul Revitalizer Compatible",
+    "misc.vitalize.machine_incompatible": "§4❌§r Mob is Soul Revitalizer Incompatible",
+    "misc.spirit.tier": "§b♦§r %s Tier",
+    "misc.spirit.not_viable": "§4⚠§r Needs more souls for cage",
+    "misc.spirit.not_viable_vitalize": "§4⚠§r Needs more souls for cage/revitalizer",
+    "misc.spirit.next_tier": "§b\uD83D\uDDE1§r %s \uD83D\uDD25 until %s Tier",
+  
+    "item.spirit.soul_steel_bow.description": "§b\uD83C\uDFF9§r Requires any Soul Crystal to shoot",
+    "item.spirit.soul_steel_tools.description": "§b\uD83D\uDDE1§r Grants extra \uD83D\uDD25 on kill",
+    "item.spirit.soul_steel_tools.soul_fire_repairable": "§b\uD83D\uDD25§r Repairs tool when in Soul Fire",
+    "item.spirit.soul_steel_wand.desc": "§b\uD83D\uDD25§r Converts soul on Soul Pedestal to Crude Soul",
+  
+    "rarity.spirit.common": "Common",
+    "rarity.spirit.uncommon": "Uncommon",
+    "rarity.spirit.rare": "Rare",
+    "rarity.spirit.epic": "Epic",
+    "rarity.spirit.legendary": "Legendary"
+  }
\ No newline at end of file
diff --git a/projects/1.19/assets/spirit/spirit/lang/zh_cn.json b/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
new file mode 100644
index 000000000000..9333fe341f5f
--- /dev/null
+++ b/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
@@ -0,0 +1,108 @@
+{
+    "item.spirit.soul_crystal": "灵魂水晶",
+   "item.spirit.crude_soul_crystal": "粗制灵魂水晶",
+   "item.spirit.soul_crystal_shard": "灵魂水晶碎片",
+   "item.spirit.soul_steel_axe": "灵魂钢斧",
+   "item.spirit.soul_steel_bow": "灵魂钢弓",
+   "item.spirit.soul_steel_hoe": "灵魂钢锄",
+   "item.spirit.soul_steel_pickaxe": "灵魂钢稿",
+   "item.spirit.soul_steel_shovel": "灵魂钢锹",
+   "item.spirit.soul_steel_sword": "灵魂钢剑",
+   "item.spirit.soul_steel_wand": "灵魂钢法杖",
+   "item.spirit.soul_powder": "灵魂粉",
+   "item.spirit.glossary": "亡灵手册",
+   "item.spirit.soul_steel_ingot": "灵魂钢锭",
+   "item.spirit.soul_crystal.upgrade_message": "你水晶中蕴含的灵魂已到达了新的高度! 已升级。",
+   "block.spirit.soul_cage": "灵魂笼",
+   "block.spirit.soul_slate": "灵魂板岩",
+   "block.spirit.soul_glass": "灵魂玻璃",
+   "block.spirit.soul_glass_1": "灵魂玻璃",
+   "block.spirit.soul_glass_2": "灵魂玻璃",
+   "block.spirit.soul_glass_3": "灵魂玻璃",
+   "block.spirit.soul_glass_4": "灵魂玻璃",
+   "block.spirit.soul_glass_5": "灵魂玻璃",
+   "block.spirit.soul_glass_6": "灵魂玻璃",
+   "block.spirit.soul_glass_7": "灵魂玻璃",
+   "block.spirit.soul_glass_8": "灵魂玻璃",
+   "block.spirit.soul_glass_9": "灵魂玻璃",
+   "block.spirit.soul_glass_10": "灵魂玻璃",
+   "block.spirit.soul_glass_11": "灵魂玻璃",
+   "block.spirit.soul_glass_12": "灵魂玻璃",
+   "block.spirit.soul_glass_13": "灵魂玻璃",
+   "block.spirit.soul_pedestal": "灵魂基座",
+   "block.spirit.crystal_pedestal": "水晶基座",
+   "block.spirit.pedestal": "基座",
+   "block.spirit.soul_steel_block": "灵魂钢块",
+   "block.spirit.soul_cage.empty_hover_text": "空",
+   "block.spirit.broken_spawner": "破损的刷怪笼",
+   "block.spirit.soul_powder_block": "灵魂尘块",
+   "block.spirit.compressed_soul_powder_block": "灵魂尘块",
+   "block.spirit.compressed_soul_sand": "压缩灵魂沙",
+   "entity.spirit.soul": "粗糙的灵魂",
+   "spirit.soul_cage.tier_0": "Null",
+   "spirit.soul_cage.tier_1": "Eins",
+   "spirit.soul_cage.tier_2": "Zwei",
+   "spirit.soul_cage.tier_3": "Drei",
+   "spirit.soul_cage.tier_4": "Vier",
+   "effect.spirit.corrupted": "失魂",
+   "itemGroup.spirit.itemgroup": "灵魂",
+  "enchantment.spirit.soul_reaper": "灵魂收割者",
+   "enchantment.spirit.soul_reaper.desc": "魔咒等级每增加一级，每次击杀后额外给予一个灵魂",
+   "config.spirit.toggletooltip": "禁用/启用实体视觉效果",
+   "tooltip.spirit.soul_crystal.unbound": "取消绑定",
+   "spirit.item.soul_crystal_shard.tooltip": "包含：%s",
+   "spirit.item.crude_soul_crystal.tooltip": "灵魂数: ",
+   "spirit.item.crude_soul_crystal.tooltip_empty": "空的",
+   "spirit.item.soul_steel_tool.empowered": "§7按下§8[%s§8]§7以释能§r",
+   "spirit.item.soul_steel_tool.unpowered": "§7按下§8[%s§8]§7以充能§r",
+   "spirit.the_one_probe.soul_cage.tier_suffix": "- 等级",
+   "spirit.the_one_probe.soul_cage.bar_suffix": " 灵魂",
+   "spirit.tooltip.chipped_loaded": "安装Chipped以正常使用此功能",
+   "spirit.jei.soul_transmutation.title": "灵魂嬗变",
+   "spirit.jei.soul_transmutation.consumes": "消耗物品",
+   "spirit.jei.soul_transmutation.empty_hand": "空手右键点击",
+   "spirit.jei.soul_engulfing.title": "灵魂吞噬",
+   "spirit.jei.soul_engulfing.consumes": "消耗方块",
+   "spirit.jei.soul_engulfing.layer": "第%s层",
+   "spirit.jei.soul_engulfing.duration": "数量：%ss",
+   "spirit.jei.soul_cage_tier.title": "灵魂笼信息",
+   "spirit.jei.soul_cage_info.tier_prefix": "等级%s",
+   "spirit.jei.soul_cage_info.required_souls": "需要%s个灵魂",
+   "spirit.jei.soul_cage_info.spawn_delay": "生成间隔从%s到%stick",
+   "spirit.jei.soul_cage_info.spawn_count": "每次生成%s只生物",
+   "spirit.jei.soul_cage_info.spawn_range": "最远生成于%s格外",
+   "spirit.jei.soul_cage_info.player_nearby": "需要玩家在%s格以内",
+   "spirit.jei.soul_cage_info.player_nearby_not_required": "附近不需要有玩家",
+   "spirit.jei.soul_cage_info.redstone_controlled_true": "可用红石控制",
+   "spirit.jei.soul_cage_info.redstone_controlled_false": "不可用红石控制",
+   "spirit.jei.soul_cage_info.ignored_spawn_conditions_true": "遵循生成条件",
+   "spirit.jei.soul_cage_info.ignored_spawn_conditions_false": "忽略生成条件",
+   "key.spirit.toggle": "切换技能",
+   "category.spirit.keybinds": "灵魂",
+ 
+   "item.spirit.soul_crystal.tooltip": "§b☠§r%s",
+   "item.spirit.soul_crystal.entity_component": "%s\uD83D\uDD25%s",
+   "item.spirit.soul_crystal.none": "空",
+   "misc.spirit.shift.shift_info": "按注§8[%s§8]§r查看更多信息",
+   "misc.spirit.shift.key": "SHIFT",
+   "item.spirit.soul_crystal.info_empty": "击杀1个生物以完成绑定",
+   "misc.spirit.soul_cage_compatible": "§2✔§r该生物可存放于灵魂笼",
+   "misc.spirit.soul_cage_incompatible": "§4❌§r该生物不可存放于灵魂笼",
+   "misc.vitalize.machine_compatible": "§2✔§r该生物可用于灵魂复活药水",
+   "misc.vitalize.machine_incompatible": "§4❌§r该生物不可用于灵魂复活药水",
+   "misc.spirit.tier": "§b♦§r%s等级",
+   "misc.spirit.not_viable": "§4⚠§r灵魂笼需要更多灵魂",
+   "misc.spirit.not_viable_vitalize": "§4⚠§r灵魂笼/灵魂复活药水需要更多灵魂",
+   "misc.spirit.next_tier": "§b\uD83D\uDDE1§r%s\uD83D\uDD25以到达%s等级",
+ 
+   "item.spirit.soul_steel_bow.description": "§b\uD83C\uDFF9§r需要任意一个灵魂水晶来发射",
+   "item.spirit.soul_steel_tools.description": "§b\uD83D\uDDE1§r击杀获取额外的\uD83D\uDD25",
+   "item.spirit.soul_steel_tools.soul_fire_repairable": "§b\uD83D\uDD25§r在灵魂火中修复工具",
+   "item.spirit.soul_steel_wand.desc": "§b\uD83D\uDD25§r在灵魂基座上将灵魂转化为粗制灵魂",
+ 
+   "rarity.spirit.common": "普通",
+   "rarity.spirit.uncommon": "少见",
+   "rarity.spirit.rare": "罕见",
+   "rarity.spirit.epic": "史诗",
+   "rarity.spirit.legendary": "传说"
+}
\ No newline at end of file

From 994a81c099d06e0931028563ca735753d09ded2a Mon Sep 17 00:00:00 2001
From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com>
Date: Wed, 9 Aug 2023 17:51:45 +0800
Subject: [PATCH 2/7] 1.18 Fix

Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
---
 projects/1.18/assets/spirit/spirit/lang/zh_cn.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
index d247eceadeb2..fc7e8005bfea 100644
--- a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
@@ -12,7 +12,7 @@
     "item.spirit.soul_powder": "灵魂尘",
     "item.spirit.glossary": "亡灵手册",
     "item.spirit.soul_steel_ingot": "灵魂钢锭",
-    "item.spirit.soul_crystal.upgrade_message": "你水晶中蕴含的灵魂已到达了新的高度! 已升级。",
+    "item.spirit.soul_crystal.upgrade_message": "你水晶中蕴含的灵魂已到达了新的高度！已升级。",
     "block.spirit.broken_spawner.tooltip": "被损毁的刷怪笼残骸<br>查看亡灵手册获取更多信息",
     "block.spirit.shiftkey.tooltip": "按住[SHIFT]获取更多信息",
     "block.spirit.soul_cage": "灵魂笼",
@@ -60,11 +60,11 @@
     "spirit.tooltip.chipped_loaded": "安装Chipped以正常使用此功能",
     "spirit.jei.soul_transmutation.title": "灵魂嬗变",
     "spirit.jei.soul_transmutation.consumes": "消耗物品",
-    "spirit.jei.soul_transmutation.empty_hand": "空手右键点击",
+    "spirit.jei.soul_transmutation.empty_hand": "空手右击",
     "spirit.jei.soul_engulfing.title": "灵魂吞噬",
     "spirit.jei.soul_engulfing.consumes": "消耗方块",
     "spirit.jei.soul_engulfing.layer": "第%s层",
-    "spirit.jei.soul_engulfing.duration": "数量: %ss",
+    "spirit.jei.soul_engulfing.duration": "数量：%ss",
     "spirit.jei.soul_cage_tier.title": "灵魂笼信息",
     "spirit.jei.soul_cage_info.tier_prefix": "等级%s",
     "spirit.jei.soul_cage_info.required_souls": "需要%s个灵魂",

From 46dd605e0760100c5a39ada75ab1d1ca3d118203 Mon Sep 17 00:00:00 2001
From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com>
Date: Wed, 9 Aug 2023 17:52:13 +0800
Subject: [PATCH 3/7] Apply suggestions from code review

Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
---
 projects/1.18/assets/spirit/spirit/lang/zh_cn.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
index fc7e8005bfea..1de664353514 100644
--- a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
@@ -54,7 +54,7 @@
     "spirit.item.crude_soul_crystal.tooltip": "灵魂：",
     "spirit.item.crude_soul_crystal.tooltip_empty": "空",
     "spirit.item.soul_steel_tool.empowered": "§7按下§8[%s§8]§7以释能§r",
-    "spirit.item.soul_steel_tool.unpowered": "§7按下§8[%s§8]§7以冲能§r",
+    "spirit.item.soul_steel_tool.unpowered": "§7按下§8[%s§8]§7以充能能§r",
     "spirit.the_one_probe.soul_cage.tier_suffix": "- 等级",
     "spirit.the_one_probe.soul_cage.bar_suffix": " 灵魂",
     "spirit.tooltip.chipped_loaded": "安装Chipped以正常使用此功能",

From 725d02a4b2b456b84b2348e9937b04b57bfc0403 Mon Sep 17 00:00:00 2001
From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com>
Date: Wed, 9 Aug 2023 17:52:50 +0800
Subject: [PATCH 4/7] Update zh_cn.json

---
 projects/1.18/assets/spirit/spirit/lang/zh_cn.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
index 1de664353514..22036b1cc4fd 100644
--- a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
@@ -54,7 +54,7 @@
     "spirit.item.crude_soul_crystal.tooltip": "灵魂：",
     "spirit.item.crude_soul_crystal.tooltip_empty": "空",
     "spirit.item.soul_steel_tool.empowered": "§7按下§8[%s§8]§7以释能§r",
-    "spirit.item.soul_steel_tool.unpowered": "§7按下§8[%s§8]§7以充能能§r",
+    "spirit.item.soul_steel_tool.unpowered": "§7按下§8[%s§8]§7以充能§r",
     "spirit.the_one_probe.soul_cage.tier_suffix": "- 等级",
     "spirit.the_one_probe.soul_cage.bar_suffix": " 灵魂",
     "spirit.tooltip.chipped_loaded": "安装Chipped以正常使用此功能",
@@ -79,4 +79,4 @@
     "spirit.jei.soul_cage_info.ignored_spawn_conditions_false": "无视生成条件",
     "category.spirit.soul_steel_tools": "Spirit",
     "key.spirit.toggle": "切换技能"
-  }
\ No newline at end of file
+  }

From 8382d4b8cadaafeceee798353a4ef777d470896d Mon Sep 17 00:00:00 2001
From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com>
Date: Wed, 9 Aug 2023 17:54:13 +0800
Subject: [PATCH 5/7] Apply suggestions from code review

Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
---
 projects/1.19/assets/spirit/spirit/lang/zh_cn.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/1.19/assets/spirit/spirit/lang/zh_cn.json b/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
index 9333fe341f5f..665ced73268c 100644
--- a/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
@@ -46,12 +46,12 @@
    "spirit.soul_cage.tier_4": "Vier",
    "effect.spirit.corrupted": "失魂",
    "itemGroup.spirit.itemgroup": "灵魂",
-  "enchantment.spirit.soul_reaper": "灵魂收割者",
+   "enchantment.spirit.soul_reaper": "灵魂收割者",
    "enchantment.spirit.soul_reaper.desc": "魔咒等级每增加一级，每次击杀后额外给予一个灵魂",
    "config.spirit.toggletooltip": "禁用/启用实体视觉效果",
    "tooltip.spirit.soul_crystal.unbound": "取消绑定",
    "spirit.item.soul_crystal_shard.tooltip": "包含：%s",
-   "spirit.item.crude_soul_crystal.tooltip": "灵魂数: ",
+   "spirit.item.crude_soul_crystal.tooltip": "灵魂数：",
    "spirit.item.crude_soul_crystal.tooltip_empty": "空的",
    "spirit.item.soul_steel_tool.empowered": "§7按下§8[%s§8]§7以释能§r",
    "spirit.item.soul_steel_tool.unpowered": "§7按下§8[%s§8]§7以充能§r",
@@ -60,7 +60,7 @@
    "spirit.tooltip.chipped_loaded": "安装Chipped以正常使用此功能",
    "spirit.jei.soul_transmutation.title": "灵魂嬗变",
    "spirit.jei.soul_transmutation.consumes": "消耗物品",
-   "spirit.jei.soul_transmutation.empty_hand": "空手右键点击",
+   "spirit.jei.soul_transmutation.empty_hand": "空手右击",
    "spirit.jei.soul_engulfing.title": "灵魂吞噬",
    "spirit.jei.soul_engulfing.consumes": "消耗方块",
    "spirit.jei.soul_engulfing.layer": "第%s层",
@@ -83,7 +83,7 @@
    "item.spirit.soul_crystal.tooltip": "§b☠§r%s",
    "item.spirit.soul_crystal.entity_component": "%s\uD83D\uDD25%s",
    "item.spirit.soul_crystal.none": "空",
-   "misc.spirit.shift.shift_info": "按注§8[%s§8]§r查看更多信息",
+   "misc.spirit.shift.shift_info": "按住§8[%s§8]§r查看更多信息",
    "misc.spirit.shift.key": "SHIFT",
    "item.spirit.soul_crystal.info_empty": "击杀1个生物以完成绑定",
    "misc.spirit.soul_cage_compatible": "§2✔§r该生物可存放于灵魂笼",
@@ -95,7 +95,7 @@
    "misc.spirit.not_viable_vitalize": "§4⚠§r灵魂笼/灵魂复活药水需要更多灵魂",
    "misc.spirit.next_tier": "§b\uD83D\uDDE1§r%s\uD83D\uDD25以到达%s等级",
  
-   "item.spirit.soul_steel_bow.description": "§b\uD83C\uDFF9§r需要任意一个灵魂水晶来发射",
+   "item.spirit.soul_steel_bow.description": "§b\uD83C\uDFF9§r需要一个任意灵魂水晶来发射",
    "item.spirit.soul_steel_tools.description": "§b\uD83D\uDDE1§r击杀获取额外的\uD83D\uDD25",
    "item.spirit.soul_steel_tools.soul_fire_repairable": "§b\uD83D\uDD25§r在灵魂火中修复工具",
    "item.spirit.soul_steel_wand.desc": "§b\uD83D\uDD25§r在灵魂基座上将灵魂转化为粗制灵魂",

From d07fd555dd2dfef1d9ac34f485e35dcf9517bd86 Mon Sep 17 00:00:00 2001
From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com>
Date: Wed, 9 Aug 2023 19:14:29 +0800
Subject: [PATCH 6/7] 1.19 Fix

Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
---
 projects/1.19/assets/spirit/spirit/lang/zh_cn.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/1.19/assets/spirit/spirit/lang/zh_cn.json b/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
index 665ced73268c..18620531e59d 100644
--- a/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
@@ -12,7 +12,7 @@
    "item.spirit.soul_powder": "灵魂粉",
    "item.spirit.glossary": "亡灵手册",
    "item.spirit.soul_steel_ingot": "灵魂钢锭",
-   "item.spirit.soul_crystal.upgrade_message": "你水晶中蕴含的灵魂已到达了新的高度! 已升级。",
+   "item.spirit.soul_crystal.upgrade_message": "你水晶中蕴含的灵魂已到达了新的高度！已升级。",
    "block.spirit.soul_cage": "灵魂笼",
    "block.spirit.soul_slate": "灵魂板岩",
    "block.spirit.soul_glass": "灵魂玻璃",
@@ -38,7 +38,7 @@
    "block.spirit.soul_powder_block": "灵魂尘块",
    "block.spirit.compressed_soul_powder_block": "灵魂尘块",
    "block.spirit.compressed_soul_sand": "压缩灵魂沙",
-   "entity.spirit.soul": "粗糙的灵魂",
+   "entity.spirit.soul": "粗糙灵魂",
    "spirit.soul_cage.tier_0": "Null",
    "spirit.soul_cage.tier_1": "Eins",
    "spirit.soul_cage.tier_2": "Zwei",

From 633ebc0c06bf1e962c3d40de821c20686a7b90c1 Mon Sep 17 00:00:00 2001
From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com>
Date: Wed, 9 Aug 2023 19:15:21 +0800
Subject: [PATCH 7/7] Update zh_cn.json

---
 projects/1.19/assets/spirit/spirit/lang/zh_cn.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/1.19/assets/spirit/spirit/lang/zh_cn.json b/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
index 18620531e59d..a4fcfbdd81b3 100644
--- a/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.19/assets/spirit/spirit/lang/zh_cn.json
@@ -45,7 +45,7 @@
    "spirit.soul_cage.tier_3": "Drei",
    "spirit.soul_cage.tier_4": "Vier",
    "effect.spirit.corrupted": "失魂",
-   "itemGroup.spirit.itemgroup": "灵魂",
+   "itemGroup.spirit.itemgroup": "Spirit",
    "enchantment.spirit.soul_reaper": "灵魂收割者",
    "enchantment.spirit.soul_reaper.desc": "魔咒等级每增加一级，每次击杀后额外给予一个灵魂",
    "config.spirit.toggletooltip": "禁用/启用实体视觉效果",
@@ -105,4 +105,4 @@
    "rarity.spirit.rare": "罕见",
    "rarity.spirit.epic": "史诗",
    "rarity.spirit.legendary": "传说"
-}
\ No newline at end of file
+}