From bb021a3bed7eb42f6d445b85d50843ef289e2f48 Mon Sep 17 00:00:00 2001
From: aaron-yang2009 <75508640+aaron-yang2009@users.noreply.github.com>
Date: Tue, 4 Oct 2022 19:38:19 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=20spirit=20=E6=A8=A1?=
=?UTF-8?q?=E7=BB=84=E7=BF=BB=E8=AF=91?=
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 +++++++++++++++++++
2 files changed, 164 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
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..376bc05904a6
--- /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
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..c6b2106ed408
--- /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": "被摧毁的刷怪笼
查看归魂手册以获取更多信息",
+ "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": "§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": "- 等级",
+ "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到%s ticks",
+ "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
From d1233741de55dea7d65e1c54f91fbf93b0f35300 Mon Sep 17 00:00:00 2001
From: aaron-yang2009 <75508640+aaron-yang2009@users.noreply.github.com>
Date: Tue, 4 Oct 2022 19:56:21 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
projects/1.18/assets/spirit/spirit/lang/zh_cn.json | 4 +---
1 file changed, 1 insertion(+), 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 c6b2106ed408..c48d4e29421e 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": "被摧毁的刷怪笼
查看归魂手册以获取更多信息",
"block.spirit.shiftkey.tooltip": "按住 [SHIFT] 来显示更多信息",
"block.spirit.soul_cage": "灵魂刷怪笼",
@@ -53,8 +53,6 @@
"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": "§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": "- 等级",
"spirit.the_one_probe.soul_cage.bar_suffix": " 个灵魂",
"spirit.tooltip.chipped_loaded": "安装 Chipped 来正确地使用",
From 8332d4846ed896d472391f9f22ae50dc4fe9a24b Mon Sep 17 00:00:00 2001
From: aaron-yang2009 <75508640+aaron-yang2009@users.noreply.github.com>
Date: Tue, 4 Oct 2022 20:42:21 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9C=AA=E7=BF=BB?=
=?UTF-8?q?=E8=AF=91=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
projects/1.18/assets/spirit/spirit/lang/zh_cn.json | 2 ++
1 file changed, 2 insertions(+)
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 c48d4e29421e..7e1cfda664c3 100644
--- a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
@@ -53,6 +53,8 @@
"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 来正确地使用",
From e9682cc4ee7c713f1b32a7b38bd77538ce1caeb8 Mon Sep 17 00:00:00 2001
From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com>
Date: Tue, 25 Oct 2022 12:35:55 +0800
Subject: [PATCH 4/6] Apply suggestions from code review
Co-authored-by: NightOcean <81746538+IdealNightOcean@users.noreply.github.com>
---
projects/1.18/assets/spirit/spirit/lang/zh_cn.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 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 7e1cfda664c3..f0ade1aee4c7 100644
--- a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
@@ -14,7 +14,7 @@
"item.spirit.soul_steel_ingot": "缠魂钢锭",
"item.spirit.soul_crystal.upgrade_message": "你的水晶的灵魂达到了新的高度!等级提升!",
"block.spirit.broken_spawner.tooltip": "被摧毁的刷怪笼
查看归魂手册以获取更多信息",
- "block.spirit.shiftkey.tooltip": "按住 [SHIFT] 来显示更多信息",
+ "block.spirit.shiftkey.tooltip": "按住[SHIFT]来显示更多信息",
"block.spirit.soul_cage": "灵魂刷怪笼",
"block.spirit.soul_slate": "缠魂板岩",
"block.spirit.soul_glass": "缠魂玻璃",
@@ -50,21 +50,21 @@
"enchantment.spirit.soul_reaper.desc": "每增加一级附魔,将在每次击杀后给予额外的一个灵魂",
"config.spirit.toggletooltip": "禁用/启用实体视觉效果",
"tooltip.spirit.soul_crystal.unbound": "未绑定",
- "spirit.item.soul_crystal_shard.tooltip": "包含: %s",
+ "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.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.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_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 296a19bf7e887df2c83d5d21335159c5dc2915f6 Mon Sep 17 00:00:00 2001
From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com>
Date: Tue, 8 Nov 2022 23:18:36 +0800
Subject: [PATCH 5/6] 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 | 8 ++++----
1 file changed, 4 insertions(+), 4 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 f0ade1aee4c7..79596a7da2c4 100644
--- a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
@@ -13,7 +13,7 @@
"item.spirit.glossary": "归魂手册",
"item.spirit.soul_steel_ingot": "缠魂钢锭",
"item.spirit.soul_crystal.upgrade_message": "你的水晶的灵魂达到了新的高度!等级提升!",
- "block.spirit.broken_spawner.tooltip": "被摧毁的刷怪笼
查看归魂手册以获取更多信息",
+ "block.spirit.broken_spawner.tooltip": "被摧毁的刷怪笼\n查看归魂手册以获取更多信息",
"block.spirit.shiftkey.tooltip": "按住[SHIFT]来显示更多信息",
"block.spirit.soul_cage": "灵魂刷怪笼",
"block.spirit.soul_slate": "缠魂板岩",
@@ -51,13 +51,13 @@
"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",
"spirit.the_one_probe.soul_cage.tier_suffix": "- 等级",
"spirit.the_one_probe.soul_cage.bar_suffix": " 个灵魂",
- "spirit.tooltip.chipped_loaded": "安装Chipped来正确地使用",
+ "spirit.tooltip.chipped_loaded": "安装Chipped以正确使用",
"spirit.jei.soul_transmutation.title": "灵魂转化",
"spirit.jei.soul_transmutation.consumes": "消耗物品",
"spirit.jei.soul_transmutation.empty_hand": "空手右键",
@@ -68,7 +68,7 @@
"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到%s ticks",
+ "spirit.jei.soul_cage_info.spawn_delay": "生成间隔从%s到%s tick",
"spirit.jei.soul_cage_info.spawn_count": "每回生成%s只生物",
"spirit.jei.soul_cage_info.spawn_range": "最远生成于%s格远",
"spirit.jei.soul_cage_info.player_nearby": "需要玩家至少在%s格以内",
From abccb5971ee6ffaf7132b3d118457d6601b66cad Mon Sep 17 00:00:00 2001
From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com>
Date: Tue, 8 Nov 2022 23:19:00 +0800
Subject: [PATCH 6/6] Update projects/1.18/assets/spirit/spirit/lang/zh_cn.json
Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>
---
projects/1.18/assets/spirit/spirit/lang/zh_cn.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 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 79596a7da2c4..325712607c5d 100644
--- a/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
+++ b/projects/1.18/assets/spirit/spirit/lang/zh_cn.json
@@ -39,11 +39,11 @@
"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",
+ "spirit.soul_cage.tier_0": "零",
+ "spirit.soul_cage.tier_1": "一",
+ "spirit.soul_cage.tier_2": "二",
+ "spirit.soul_cage.tier_3": "三",
+ "spirit.soul_cage.tier_4": "四",
"effect.spirit.corrupted": "失魂",
"itemGroup.spirit.itemgroup": "Spirit",
"enchantment.spirit.soul_reaper": "灵魂收割者",