Skip to content

Commit 57725f9

Browse files
Merge branch 'main' into modrinth-path-support
2 parents e1fa386 + 1cb9ef2 commit 57725f9

1,044 files changed

Lines changed: 68293 additions & 3846 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Packer-Doc.md

Lines changed: 175 additions & 36 deletions
Large diffs are not rendered by default.

config/packer/1.19.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"zh_cn"
66
],
77
"exclusionMods": [],
8-
"exclusionNamespaces": []
8+
"exclusionNamespaces": [
9+
"nochatreports"
10+
]
911
},
1012
"floating": {
1113
"inclusionDomains": [
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
################################################################
2+
## ##
3+
## 模组名称:Deep Mob Learning - Blood Magic Addon ##
4+
## CurseForge项目名称:deep-mob-learning-blood-magic-addon ##
5+
## 命名空间:deepmoblearningbm ##
6+
## 冲突模组:Deep Blood Evolution ##
7+
## ##
8+
################################################################
9+
10+
item.deepmoblearningbm.altar_linker.name=Altar Linker
11+
tile.deepmoblearningbm.digital_agonizer.name=Digital Mob Agonizer
12+
cfpa.conflictnamespace.itemGroup.deepmoblearningbm=DML - Blood Magic Addon
13+
14+
################################################################
15+
## ##
16+
## 模组名称:Deep Blood Evolution ##
17+
## CurseForge项目名称:deep-blood-evolution ##
18+
## 命名空间:deepmoblearningbm ##
19+
## 冲突模组:Deep Mob Learning - Blood Magic Addon ##
20+
## ##
21+
################################################################
22+
23+
cfpa.conflictnamespace.itemGroup.deepmoblearningbm=DML - Blood Magic Addon
24+
25+
item.deepmoblearningbm.altar_linker.name=Altar Linker
26+
item.deepmoblearningbm.blood_infused_glitch_ingot.name=§cBlood Infused Glitch Ingot§r
27+
item.deepmoblearningbm.blood_infused_glitch_nugget.name=§cBlood Infused Glitch Nugget§r
28+
29+
tile.deepmoblearningbm.digital_agonizer.name=Digital Mob Agonizer
30+
tile.deepmoblearningbm.digital_will_injector.name=Digital Demon Will Injector
31+
tile.deepmoblearningbm.block_blood_infused_glitch_ingot.name=§cBlock of Blood Infused Glitch Ingot§r
32+
33+
fluid.blood_infused_glitch.name=Molten Blood Infused Glitch
34+
35+
material.blood_infused_glitch.name=Blood Infused Glitch
36+
37+
tooltip.altar_linker.0=Max linking range: §r%s blocks
38+
tooltip.altar_linker.1=Agonizer target: §f(x: %s y: %s z: %s)§r
39+
tooltip.altar_linker.2=§fSneak + Right-click§7 to link an altar
40+
tooltip.altar_linker.3=Clear target with §rRight-click
41+
tooltip.altar_linker.4=No Agonizer target, link while sneaking
42+
tooltip.altar_linker.5=Clear target with §rRight-click
43+
44+
text.altar_linker.clear=Cleared Target!
45+
text.altar_linker.set=Set Agonizer target!
46+
text.altar_linker.success=Linked Altar to target Agonizer!
47+
text.altar_linker.error.0=Altar is already linked to an Agonizer.
48+
text.altar_linker.error.1=Altar too far away from Agonizer!
49+
text.altar_linker.highlight=Displaying altar position for 20 seconds!
50+
51+
gui.digital_agonizer.energy=Operational cost: %s RF/t
52+
gui.digital_agonizer.catalyst_operations=%s / %s
53+
gui.progress=Progress: %s / %s
54+
gui.digital_agonizer.run.0=Altar has %s sacrifice runes.
55+
gui.digital_agonizer.run.1=Rune multiplier: %sx
56+
gui.digital_agonizer.run.2=Catalyst multiplier: %sx
57+
gui.digital_agonizer.run.3=Final multiplier: %sx
58+
gui.digital_agonizer.altar.0=Linked to altar at position
59+
gui.digital_agonizer.altar.1=x: %s, y: %s, z: %s
60+
gui.digital_agonizer.altar.2=Tank: %s/%s mB
61+
gui.digital_agonizer.altar.3=§oClick icon to reveal altar§r
62+
gui.digital_agonizer.altar.4=§oposition for 20 seconds.§r
63+
gui.digital_agonizer.altar.5=No linked altar!
64+
gui.digital_agonizer.altar.6=Use the Altar Linker to link this
65+
gui.digital_agonizer.altar.7=machine to an Altar.
66+
gui.digital_agonizer.issue.0=§cIssues§r
67+
gui.digital_agonizer.issue.1=- No Data Model
68+
gui.digital_agonizer.issue.2=- Data Model Tier too low
69+
gui.digital_agonizer.issue.3=- No linked Altar
70+
71+
gui.digital_will_injector.energy=Running cost: %s RF/t
72+
gui.digital_will_injector.issue.0=§cIssues§r
73+
gui.digital_will_injector.issue.1=- No Data Model
74+
gui.digital_will_injector.issue.2=- Data Model not evil enough
75+
gui.digital_will_injector.issue.3=- Data Model Tier too low
76+
gui.digital_will_injector.issue.4=- No Sentient Weapon
77+
gui.digital_will_injector.issue.5=- Demon Will type not match
78+
79+
jei.catalyst.info.0=Multiplier: §b%sx
80+
jei.catalyst.info.1=Operations: §b%s
81+
82+
modifier.bloodlust.name=Bloodlust
83+
modifier.glitch.name=Glitch
84+
modifier.overflow.name=Overflow
85+
86+
modifier.bloodlust.desc=§oI want more blood.§r\nAdds life essence to your soul network when killing.
87+
modifier.glitch.desc=§oCatch an exception!§r\nDrops Glitch Heart sometimes when killing.
88+
modifier.overflow.desc=§o-2147483648§r\nThere is a 25% probability that this weapon directly wipes off half of target's health each attack.
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
################################################################
2+
## ##
3+
## 模组名称:Deep Mob Learning - Blood Magic Addon ##
4+
## CurseForge项目名称:deep-mob-learning-blood-magic-addon ##
5+
## 命名空间:deepmoblearningbm ##
6+
## 冲突模组:Deep Blood Evolution ##
7+
## ##
8+
################################################################
9+
10+
item.deepmoblearningbm.altar_linker.name=祭坛连接器
11+
tile.deepmoblearningbm.digital_agonizer.name=数字化苦难之井
12+
cfpa.conflictnamespace.itemGroup.deepmoblearningbm=DML - 血魔法扩展
13+
14+
################################################################
15+
## ##
16+
## 模组名称:Deep Blood Evolution ##
17+
## CurseForge项目名称:deep-blood-evolution ##
18+
## 命名空间:deepmoblearningbm ##
19+
## 冲突模组:Deep Mob Learning - Blood Magic Addon ##
20+
## ##
21+
################################################################
22+
23+
cfpa.conflictnamespace.itemGroup.deepmoblearningbm=深度怪物学习-血魔法插件
24+
25+
item.deepmoblearningbm.altar_linker.name=祭坛连接器
26+
item.deepmoblearningbm.blood_infused_glitch_ingot.name=§c注血故障锭§r
27+
item.deepmoblearningbm.blood_infused_glitch_nugget.name=§c注血故障粒§r
28+
29+
tile.deepmoblearningbm.digital_agonizer.name=数字化苦难之井
30+
tile.deepmoblearningbm.digital_will_injector.name=数字化恶魔意志汲取器
31+
tile.deepmoblearningbm.block_blood_infused_glitch_ingot.name=§c注血故障块§r
32+
33+
fluid.blood_infused_glitch.name=熔融注血故障
34+
35+
material.blood_infused_glitch.name=注血故障
36+
37+
tooltip.altar_linker.0=§7最大连接范围:§r%s格
38+
tooltip.altar_linker.1=§7目标数字化苦难之井:§r§f(x: %s y: %s z: %s)§r
39+
tooltip.altar_linker.2=潜行+右键点击§7以连接祭坛§r
40+
tooltip.altar_linker.3=右键点击§r§7以清除目标§r
41+
tooltip.altar_linker.4=§7无目标数字化苦难之井,潜行+右键点击以连接§r
42+
tooltip.altar_linker.5=右键点击§7以清除目标
43+
44+
text.altar_linker.clear=目标已清除!
45+
text.altar_linker.set=已设置目标数字化苦难之井!
46+
text.altar_linker.success=已连接祭坛至目标数字化苦难之井!
47+
text.altar_linker.error.0=祭坛已与其他数字化苦难之井链接。
48+
text.altar_linker.error.1=祭坛距离数字化苦难之井过远!
49+
text.altar_linker.highlight=显示祭坛位置,持续20秒!
50+
51+
gui.digital_agonizer.energy=运行成本:%s RF/t
52+
gui.digital_agonizer.catalyst_operations=%s / %s
53+
gui.progress=进度:%s / %s
54+
gui.digital_agonizer.run.0=祭坛拥有%s个献祭符文。
55+
gui.digital_agonizer.run.1=符文倍率:%sx
56+
gui.digital_agonizer.run.2=催化剂倍率:%sx
57+
gui.digital_agonizer.run.3=最终倍率:%sx
58+
gui.digital_agonizer.altar.0=已连接至位于以下坐标的祭坛
59+
gui.digital_agonizer.altar.1=x: %s, y: %s, z: %s
60+
gui.digital_agonizer.altar.2=祭坛容量:%s/%s mB
61+
gui.digital_agonizer.altar.3=§o点击图标以高亮祭坛§r
62+
gui.digital_agonizer.altar.4=§o效果将持续20秒。§r
63+
gui.digital_agonizer.altar.5=未连接至祭坛!
64+
gui.digital_agonizer.altar.6=使用祭坛连接器将
65+
gui.digital_agonizer.altar.7=该机器连接至祭坛。
66+
gui.digital_agonizer.issue.0=§c错误§r
67+
gui.digital_agonizer.issue.1=- 无数据模型
68+
gui.digital_agonizer.issue.2=- 数据模型等级过低
69+
gui.digital_agonizer.issue.3=- 未连接至祭坛
70+
71+
gui.digital_will_injector.energy=运行成本:%s RF/t
72+
gui.digital_will_injector.issue.0=§c错误§r
73+
gui.digital_will_injector.issue.1=- 无数据模型
74+
gui.digital_will_injector.issue.2=- 数据模型不够邪恶
75+
gui.digital_will_injector.issue.3=- 数据模型等级过低
76+
gui.digital_will_injector.issue.4=- 无感知武器
77+
gui.digital_will_injector.issue.5=- 恶魔意志种类不匹配
78+
79+
jei.catalyst.info.0=倍率:§b%sx
80+
jei.catalyst.info.1=运行次数:§b%s
81+
82+
modifier.bloodlust.name=嗜血
83+
modifier.glitch.name=故障
84+
modifier.overflow.name=溢出
85+
86+
modifier.bloodlust.desc=§o我渴望更多鲜血。§r\n击杀生物时,为灵魂网络增加生命源质。
87+
modifier.glitch.desc=§o捕获到异常!§r\n击杀生物有概率掉落损坏的故障心脏。
88+
modifier.overflow.desc=§o-2147483648§r\n武器每次攻击时有25%概率直接抹除目标一半的生命值。

projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ enderio.power.format.of=%s / %s µI
740740
enderio.power.format.pertick=%s µI/t
741741
enderio.power.format.name=Micro Infinity(%s)
742742
enderio.power.format.details=一单位的能量
743-
enderio.temperature.format.deg_c=%s
743+
enderio.temperature.format.deg_c=%s °C
744744
enderio.format.percent_efficiency=%s%% 效率
745745
enderio.fluid.millibucket.format=%s mB
746746
enderio.fluid.millibucket.format.name=%s mB %s
@@ -751,7 +751,7 @@ enderio.fuel.tooltip.heading=燃料详情
751751
enderio.fuel.tooltip.generates=生成 %s 消耗 %s
752752
enderio.fuel.tooltip.burnTime=燃烧时间:%s ticks
753753
enderio.coolant.tooltip.heading=冷却剂
754-
enderio.coolant.tooltip.degreesPerBucket=%s /桶
754+
enderio.coolant.tooltip.degreesPerBucket=%s °C/桶
755755
enderio.tooltip.anvilupgrades=可用升级:
756756
enderio.tooltip.anvilupgrades.all=所有升级:
757757
enderio.darksteel.upgrade.empowered_one.name=注能 I
@@ -2129,7 +2129,7 @@ tile.block_lava_generator.tooltip.detailed.line1=通过冷却熔岩产能。
21292129
tile.block_lava_generator.tooltip.detailed.line2=确保它不会过热!
21302130
tile.block_lava_generator.tooltip.detailed.line3=可以通过在其周围放置冷流体或冰来冷却。
21312131
enderio.gui.lavagen.heat=热量
2132-
tile.block_niard.name=The Niard
2132+
tile.block_niard.name=流体填充机
21332133
tile.block_niard.tooltip.detailed.line1=倒出流体到世界
21342134
tile.block_niard.tooltip.detailed.line2=我们正在寻找一个更好的名字。在 Discord 提出建议。获胜者的名字会显示在此工具提示中。
21352135

projects/1.12.2/assets/1UNKNOWN/germplasm/lang/zh_cn.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ germplasm.gui.pcr.stop=停止
8787
germplasm.gui.pcr.denature=变性中……
8888
germplasm.gui.pcr.annealing=复性中……
8989
germplasm.gui.pcr.extension=延长中……
90-
germplasm.gui.pcr.celsius=
90+
germplasm.gui.pcr.celsius=°C
9191
germplasm.gui.incubator.name=孵化器
9292
germplasm.gui.electroporator.name=电穿孔器
9393
germplasm.gui.gene_isolator.name=基因分离器

projects/1.12.2/assets/better-diving/better_diving/lang/zh_cn.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ config.garryfish=咖喱鱼
127127
config.holefish=洞洞鱼
128128
config.boomerang=飞镖鱼
129129
#Gui
130-
gui.temperature=
130+
gui.temperature=°C
131131
entity.entity_seamoth.name=Seamoth
132132
entity.entity_peeper.name=窥视者
133133
item.habitat_builder.name=建造器(未完成)

0 commit comments

Comments
 (0)