Skip to content

Commit d7a7227

Browse files
ZHAY10086ZHAY10086
committed
Revert "fixes"
This reverts commit 1265a3f.
1 parent 5a3957a commit d7a7227

File tree

7 files changed

+76
-128
lines changed

7 files changed

+76
-128
lines changed

‎projects/1.12.2/assets/scaling-health/scalinghealth/lang/zh_cn.lang‎

Lines changed: 24 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,31 @@
1-
itemGroup.scalinghealth=Scaling Health
2-
3-
##########
4-
# Blocks #
5-
##########
6-
7-
tile.scalinghealth.crystalore.name=心之水晶矿石
8-
9-
10-
11-
#########
12-
# Items #
13-
#########
14-
15-
item.scalinghealth.crystalshard.name=心之水晶碎片
16-
item.scalinghealth.enchanted_heart.name=蕴魔之心
1+
blight.scalinghealth.killedByPlayer=瘟疫生物——%s死于%s之手！
2+
blight.scalinghealth.name=瘟疫生物——%s
3+
command.scalinghealth.outOfBounds=设定值必须介于 %s 与 %s 之间。
4+
command.scalinghealth.setDifficulty=将玩家%s的难度设定为%s。
5+
command.scalinghealth.setHealth=将玩家%s的生命值设定为 %d。
6+
command.scalinghealth.setWorldDifficulty=将当前世界的全局难度设置为%s。
7+
command.scalinghealth.showDifficulty=%s的当前难度：%s / %s
8+
command.scalinghealth.showHealth=%s的当前生命值：%s / %s（%s）
9+
command.scalinghealth.showWorldDifficulty=当前世界全局难度：%s / %s
10+
effect.scalinghealth.bandaged=包扎愈合
11+
item.scalinghealth.bandage.name=绷带
12+
item.scalinghealth.crystalshard.name=心晶碎片
1713
item.scalinghealth.cursed_heart.name=诅咒之心
1814
item.scalinghealth.difficultychanger.effectDesc=难度 %s
19-
item.scalinghealth.heartcontainer.name=心之容器
15+
item.scalinghealth.enchanted_heart.name=蕴魔之心
16+
item.scalinghealth.healingitem.healingValue=总计恢复 %d%% 生命值，持续 %d 秒。
17+
item.scalinghealth.healingitem.howToUse=使用耗时%d秒。
2018
item.scalinghealth.heartcontainer.desc=提高生命值上限
19+
item.scalinghealth.heartcontainer.name=心之容器
2120
item.scalinghealth.heartcontainer.notEnoughXP=你需要 %d 级经验来使用它
22-
item.scalinghealth.heartdust.name=心之尘
23-
item.scalinghealth.bandage.name=绷带
21+
item.scalinghealth.heartdust.name=心粉
2422
item.scalinghealth.medkit.name=医疗包
25-
item.scalinghealth.healingitem.healingValue=总计恢复 %d%% 生命值，持续 %d 秒。
26-
item.scalinghealth.healingitem.howToUse=使用耗时%d秒。
27-
28-
29-
###########
30-
# Potions #
31-
###########
32-
33-
effect.scalinghealth.bandaged=包扎
34-
35-
36-
37-
###########
38-
# Blights #
39-
###########
40-
41-
blight.scalinghealth.name=枯萎种%s
42-
blight.scalinghealth.killedByPlayer=枯萎种%s死于%s之手！
43-
44-
45-
46-
############
47-
# Commands #
48-
############
49-
50-
command.scalinghealth.outOfBounds=设定值必须介于 %s 与 %s 之间。
51-
command.scalinghealth.recalculate.result=已为%d个实体重新计算难度和数值，更多详情请参阅日志
52-
command.scalinghealth.showDifficulty=%s的当前难度：%s / %s
53-
command.scalinghealth.setDifficulty=将玩家%s的难度设定为%s。
54-
command.scalinghealth.showHealth=%s的当前生命值：%s / %s（%s）
55-
command.scalinghealth.setHealth=将玩家%s的生命值设定为 %d。
56-
command.scalinghealth.showWorldDifficulty=当前世界全局难度：%s / %s
57-
command.scalinghealth.setWorldDifficulty=将当前世界的全局难度设置为%s。
58-
59-
60-
61-
########
62-
# Misc #
63-
########
64-
65-
misc.scalinghealth.sleepWarning=[Scaling Health] 警告：睡觉将会改变你的游戏难度！
23+
itemGroup.scalinghealth=Scaling Health
6624
misc.scalinghealth.difficultyMeterText=难度
67-
68-
69-
70-
# Sound effect subtitles
71-
72-
scalinghealth.subtitle.cursed_heart_use=诅咒之心：使用
73-
scalinghealth.subtitle.enchanted_heart_use=蕴魔之心：使用
74-
scalinghealth.subtitle.heart_container_use=心之容器：使用
75-
76-
# April Fool's sounds
25+
misc.scalinghealth.sleepWarning=[Scaling Health] 警告：睡觉将会改变你的游戏难度！
26+
scalinghealth.subtitle.cursed_heart_use=已使用诅咒之心
27+
scalinghealth.subtitle.enchanted_heart_use=已使用蕴魔之心
28+
scalinghealth.subtitle.heart_container_use=已使用心之容器
7729
scalinghealth.subtitle.player_died=有人死掉了（啊哈哈）
30+
tile.scalinghealth.crystalore.name=心晶矿石
31+
command.scalinghealth.recalculate.result=已为%d个实体重新计算难度和数值，更多详情请参阅日志

‎projects/1.16/assets/scaling-health/scalinghealth/lang/en_us.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,5 @@
4848
"scalinghealth.subtitle.cursed_heart_use": "Cursed Heart used",
4949
"scalinghealth.subtitle.enchanted_heart_use": "Enchanted Heart used",
5050
"scalinghealth.subtitle.heart_crystal_use": "Heart Crystal used",
51-
"scalinghealth.subtitle.player_died": "Somebody died (LOL)",
52-
"misc.scalinghealth.blight": "Blight %s"
51+
"scalinghealth.subtitle.player_died": "Somebody died (LOL)"
5352
}

‎projects/1.16/assets/scaling-health/scalinghealth/lang/zh_cn.json‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"blight.scalinghealth": "枯萎种%s",
2+
"blight.scalinghealth": "瘟疫%s",
33
"blight.scalinghealth.killedByPlayer": "%s 死于 %s！",
4-
"block.scalinghealth.heart_crystal_ore": "心之水晶矿石",
5-
"block.scalinghealth.power_crystal_ore": "力量水晶矿石",
4+
"block.scalinghealth.heart_crystal_ore": "心晶矿石",
5+
"block.scalinghealth.power_crystal_ore": "力晶矿石",
66
"command.scalinghealth.difficulty.area": "区域难度：%s",
77
"command.scalinghealth.difficulty.player": "玩家难度：%s",
8-
"command.scalinghealth.difficulty.server": "服务器难度：%s",
8+
"command.scalinghealth.difficulty.server": "服务器难度： %s",
99
"command.scalinghealth.health.actual": "实际生命值：%s",
10-
"command.scalinghealth.health.heartCrystals": "心之水晶：%s",
10+
"command.scalinghealth.health.heartCrystals": "心晶：%s",
1111
"command.scalinghealth.health.heartCrystals.values": "%d （%s 生命值）",
1212
"command.scalinghealth.outOfBounds": "该数值必须在 %s 与 %s 之间。",
1313
"command.scalinghealth.playerName": "玩家: %s %s",
1414
"command.scalinghealth.playerName.inDimension": "（在 %s 维度）",
1515
"command.scalinghealth.power.actual": "实际攻击伤害：%s",
16-
"command.scalinghealth.power.powerCrystals": "力量水晶：%s",
16+
"command.scalinghealth.power.powerCrystals": "力晶：%s",
1717
"command.scalinghealth.power.powerCrystals.values": "%d：（%s 伤害）",
1818
"command.scalinghealth.recalculate.finish": "重新计算完成！已处理 %d 个实体。",
1919
"command.scalinghealth.recalculate.start": "重新计算所有实体的难度！这会花一些时间……",
@@ -26,22 +26,21 @@
2626
"item.scalinghealth.enchanted_heart": "蕴魔之心",
2727
"item.scalinghealth.healing_item.howToUse": "需要 %d 秒来使用。",
2828
"item.scalinghealth.healing_item.value": "恢复你 %d%% 的生命值，作用时长 %d 秒。",
29-
"item.scalinghealth.heart_crystal": "心之水晶",
29+
"item.scalinghealth.heart_crystal": "心晶",
3030
"item.scalinghealth.heart_crystal.desc": "增加最大生命值",
31-
"item.scalinghealth.heart_crystal_shard": "心之水晶碎片",
32-
"item.scalinghealth.heart_dust": "心之尘",
31+
"item.scalinghealth.heart_crystal_shard": "心晶碎片",
32+
"item.scalinghealth.heart_dust": "心尘",
3333
"item.scalinghealth.medkit": "医疗包",
34-
"item.scalinghealth.power_crystal": "力量水晶",
34+
"item.scalinghealth.power_crystal": "力晶",
3535
"item.scalinghealth.power_crystal.desc": "增加基础攻击伤害",
36-
"item.scalinghealth.power_crystal_shard": "力量水晶碎片",
36+
"item.scalinghealth.power_crystal_shard": "力晶碎片",
3737
"item.scalinghealth.stat_booster.notEnoughXP": "你需要%d级来使用这个物品",
3838
"itemGroup.scalinghealth": "Scaling Health",
3939
"misc.scalinghealth.afkmessage": "你当前处于AFK状态，随时间推移而增加的难度值将减少",
4040
"misc.scalinghealth.difficultyMeterText": "难度",
4141
"misc.scalinghealth.sleepWarning": "[Scaling Health] 警告:睡觉会改变你的难度！",
42-
"scalinghealth.subtitle.cursed_heart_use": "诅咒之心：使用",
43-
"scalinghealth.subtitle.enchanted_heart_use": "蕴魔之心：使用",
44-
"scalinghealth.subtitle.heart_crystal_use": "心之水晶：使用",
45-
"scalinghealth.subtitle.player_died": "有人死掉了 （哈哈）",
46-
"misc.scalinghealth.blight": "枯萎种%s"
42+
"scalinghealth.subtitle.cursed_heart_use": "已使用诅咒之心",
43+
"scalinghealth.subtitle.enchanted_heart_use": "已使用蕴魔之心",
44+
"scalinghealth.subtitle.heart_crystal_use": "已使用心晶",
45+
"scalinghealth.subtitle.player_died": "有人死掉了 （哈哈）"
4746
}

‎projects/1.18/assets/scaling-health/scalinghealth/lang/en_us.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,5 @@
5050
"scalinghealth.subtitle.cursed_heart_use": "Cursed Heart used",
5151
"scalinghealth.subtitle.enchanted_heart_use": "Enchanted Heart used",
5252
"scalinghealth.subtitle.heart_crystal_use": "Heart Crystal used",
53-
"scalinghealth.subtitle.player_died": "Somebody died (LOL)",
54-
"misc.scalinghealth.blight": "Blight %s"
53+
"scalinghealth.subtitle.player_died": "Somebody died (LOL)"
5554
}

‎projects/1.18/assets/scaling-health/scalinghealth/lang/zh_cn.json‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"blight.scalinghealth": "枯萎种%s",
2+
"blight.scalinghealth": "瘟疫%s",
33
"blight.scalinghealth.killedByPlayer": "%s 死于 %s！",
4-
"block.scalinghealth.heart_crystal_ore": "心之水晶矿石",
5-
"block.scalinghealth.power_crystal_ore": "力量水晶矿石",
4+
"block.scalinghealth.heart_crystal_ore": "心晶矿石",
5+
"block.scalinghealth.power_crystal_ore": "力晶矿石",
66
"command.scalinghealth.difficulty.area": "区域难度：%s",
77
"command.scalinghealth.difficulty.player": "玩家难度：%s",
8-
"command.scalinghealth.difficulty.server": "服务器难度：%s",
8+
"command.scalinghealth.difficulty.server": "服务器难度： %s",
99
"command.scalinghealth.health.actual": "实际生命值：%s",
10-
"command.scalinghealth.health.heartCrystals": "心之水晶：%s",
10+
"command.scalinghealth.health.heartCrystals": "心晶：%s",
1111
"command.scalinghealth.health.heartCrystals.values": "%d （%s 生命值）",
1212
"command.scalinghealth.outOfBounds": "该数值必须在 %s 与 %s 之间。",
1313
"command.scalinghealth.playerName": "玩家: %s %s",
1414
"command.scalinghealth.playerName.inDimension": "（在 %s 维度）",
1515
"command.scalinghealth.power.actual": "实际攻击伤害：%s",
16-
"command.scalinghealth.power.powerCrystals": "力量水晶：%s",
16+
"command.scalinghealth.power.powerCrystals": "力晶：%s",
1717
"command.scalinghealth.power.powerCrystals.values": "%d：（%s 伤害）",
1818
"command.scalinghealth.recalculate.finish": "重新计算完成！已处理 %d 个实体。",
1919
"command.scalinghealth.recalculate.start": "重新计算所有实体的难度！这会花一些时间……",
@@ -26,22 +26,21 @@
2626
"item.scalinghealth.enchanted_heart": "蕴魔之心",
2727
"item.scalinghealth.healing_item.howToUse": "需要 %d 秒来使用。",
2828
"item.scalinghealth.healing_item.value": "恢复你 %d%% 的生命值，作用时长 %d 秒。",
29-
"item.scalinghealth.heart_crystal": "心之水晶",
29+
"item.scalinghealth.heart_crystal": "心晶",
3030
"item.scalinghealth.heart_crystal.desc": "增加最大生命值",
31-
"item.scalinghealth.heart_crystal_shard": "心之水晶碎片",
32-
"item.scalinghealth.heart_dust": "心之尘",
31+
"item.scalinghealth.heart_crystal_shard": "心晶碎片",
32+
"item.scalinghealth.heart_dust": "心尘",
3333
"item.scalinghealth.medkit": "医疗包",
34-
"item.scalinghealth.power_crystal": "力量水晶",
34+
"item.scalinghealth.power_crystal": "力晶",
3535
"item.scalinghealth.power_crystal.desc": "增加基础攻击伤害",
36-
"item.scalinghealth.power_crystal_shard": "力量水晶碎片",
36+
"item.scalinghealth.power_crystal_shard": "力晶碎片",
3737
"item.scalinghealth.stat_booster.notEnoughXP": "你需要%d级来使用这个物品",
3838
"itemGroup.scalinghealth": "Scaling Health",
3939
"misc.scalinghealth.afkmessage": "你当前处于AFK状态，随时间推移而增加的难度值将减少",
4040
"misc.scalinghealth.difficultyMeterText": "难度",
4141
"misc.scalinghealth.sleepWarning": "[Scaling Health] 警告:睡觉会改变你的难度！",
42-
"scalinghealth.subtitle.cursed_heart_use": "诅咒之心：使用",
43-
"scalinghealth.subtitle.enchanted_heart_use": "蕴魔之心：使用",
44-
"scalinghealth.subtitle.heart_crystal_use": "心之水晶：使用",
45-
"scalinghealth.subtitle.player_died": "有人死掉了 （哈哈）",
46-
"misc.scalinghealth.blight": "枯萎种%s"
42+
"scalinghealth.subtitle.cursed_heart_use": "已使用诅咒之心",
43+
"scalinghealth.subtitle.enchanted_heart_use": "已使用蕴魔之心",
44+
"scalinghealth.subtitle.heart_crystal_use": "已使用心晶",
45+
"scalinghealth.subtitle.player_died": "有人死掉了 （哈哈）"
4746
}

‎projects/1.19/assets/scaling-health/scalinghealth/lang/en_us.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,5 @@
5050
"scalinghealth.subtitle.cursed_heart_use": "Cursed Heart used",
5151
"scalinghealth.subtitle.enchanted_heart_use": "Enchanted Heart used",
5252
"scalinghealth.subtitle.heart_crystal_use": "Heart Crystal used",
53-
"scalinghealth.subtitle.player_died": "Somebody died (LOL)",
54-
"misc.scalinghealth.blight": "Blight %s"
53+
"scalinghealth.subtitle.player_died": "Somebody died (LOL)"
5554
}

‎projects/1.19/assets/scaling-health/scalinghealth/lang/zh_cn.json‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
{
2-
"blight.scalinghealth": "枯萎种%s",
3-
"blight.scalinghealth.killedByPlayer": "枯萎种%1$s被%2$s击杀了！",
4-
"block.scalinghealth.deepslate_heart_crystal_ore": "深层心之水晶矿石",
5-
"block.scalinghealth.deepslate_power_crystal_ore": "深层力量水晶矿石",
6-
"block.scalinghealth.heart_crystal_ore": "心之水晶矿石",
7-
"block.scalinghealth.power_crystal_ore": "力量水晶矿石",
2+
"blight.scalinghealth": "瘟疫%s",
3+
"blight.scalinghealth.killedByPlayer": "瘟疫%1$s被%2$s杀了！",
4+
"block.scalinghealth.deepslate_heart_crystal_ore": "深层心晶矿石",
5+
"block.scalinghealth.deepslate_power_crystal_ore": "深层力晶矿石",
6+
"block.scalinghealth.heart_crystal_ore": "心晶矿石",
7+
"block.scalinghealth.power_crystal_ore": "力晶矿石",
88
"command.scalinghealth.difficulty.area": "区域难度：%s",
99
"command.scalinghealth.difficulty.player": "玩家难度：%s",
10-
"command.scalinghealth.difficulty.server": "服务器难度：%s",
10+
"command.scalinghealth.difficulty.server": "服务器难度： %s",
1111
"command.scalinghealth.health.actual": "实际生命值：%s",
12-
"command.scalinghealth.health.heartCrystals": "心之水晶：%s",
12+
"command.scalinghealth.health.heartCrystals": "心晶：%s",
1313
"command.scalinghealth.health.heartCrystals.values": "%d（%s生命值）",
1414
"command.scalinghealth.outOfBounds": "该数值必须在%s与%s之间。",
1515
"command.scalinghealth.playerName": "玩家：%s %s",
1616
"command.scalinghealth.playerName.inDimension": "（在%s维度）",
1717
"command.scalinghealth.power.actual": "实际攻击伤害：%s",
18-
"command.scalinghealth.power.powerCrystals": "力量水晶：%s",
18+
"command.scalinghealth.power.powerCrystals": "力晶：%s",
1919
"command.scalinghealth.power.powerCrystals.values": "%d（%s 伤害）",
2020
"command.scalinghealth.recalculate.finish": "重新计算完成！处理了%d个实体。",
2121
"command.scalinghealth.recalculate.start": "正在重新计算所有实体的难度！这会花一些时间……",
2222
"command.scalinghealth.valueOverMax": "%s / %s",
23-
"effect.scalinghealth.bandaged": "包扎",
23+
"effect.scalinghealth.bandaged": "已包扎",
2424
"item.scalinghealth.bandages": "绷带",
2525
"item.scalinghealth.chance_heart": "运势之心",
2626
"item.scalinghealth.cursed_heart": "诅咒之心",
2727
"item.scalinghealth.difficulty_changer.effectDesc": "难度 %s",
2828
"item.scalinghealth.enchanted_heart": "蕴魔之心",
2929
"item.scalinghealth.healing_item.howToUse": "需要%d秒来使用。",
3030
"item.scalinghealth.healing_item.value": "恢复你%d%%生命值，作用时长%d秒。",
31-
"item.scalinghealth.heart_crystal": "心之水晶",
31+
"item.scalinghealth.heart_crystal": "心晶",
3232
"item.scalinghealth.heart_crystal.desc": "增加最大生命值",
33-
"item.scalinghealth.heart_crystal_shard": "心之水晶碎片",
34-
"item.scalinghealth.heart_dust": "心之尘",
33+
"item.scalinghealth.heart_crystal_shard": "心晶碎片",
34+
"item.scalinghealth.heart_dust": "心尘",
3535
"item.scalinghealth.medkit": "医疗包",
36-
"item.scalinghealth.power_crystal": "力量水晶",
36+
"item.scalinghealth.power_crystal": "力晶",
3737
"item.scalinghealth.power_crystal.desc": "增加基础攻击伤害",
38-
"item.scalinghealth.power_crystal_shard": "力量水晶碎片",
38+
"item.scalinghealth.power_crystal_shard": "力晶碎片",
3939
"item.scalinghealth.stat_booster.notEnoughXP": "你需要%d级来使用这个物品",
4040
"itemGroup.scalinghealth": "Scaling Health",
4141
"key.scalinghealth.difficultyMeter": "开关难度计",
@@ -47,9 +47,8 @@
4747
"scalinghealth.modes.difficulty.distance_and_time": "距离和时间",
4848
"scalinghealth.modes.difficulty.extrema": "极值",
4949
"scalinghealth.modes.difficulty.server_wide": "服务器统一",
50-
"scalinghealth.subtitle.cursed_heart_use": "诅咒之心：使用",
51-
"scalinghealth.subtitle.enchanted_heart_use": "蕴魔之心：使用",
52-
"scalinghealth.subtitle.heart_crystal_use": "心之水晶：使用",
53-
"scalinghealth.subtitle.player_died": "有人死掉了（哈哈）",
54-
"misc.scalinghealth.blight": "枯萎种%s"
50+
"scalinghealth.subtitle.cursed_heart_use": "已使用诅咒之心",
51+
"scalinghealth.subtitle.enchanted_heart_use": "已使用蕴魔之心",
52+
"scalinghealth.subtitle.heart_crystal_use": "已使用心晶",
53+
"scalinghealth.subtitle.player_died": "有人死掉了（哈哈）"
5554
}

0 commit comments

Comments
 (0)