Skip to content

Commit f8deec9

Browse files
ChuijkYahusChuijkYahus
authored
Merge branch 'CFPAOrg:main' into main-moresnifferflowers
2 parents 91f3455 + 8138391 commit f8deec9

2,120 files changed

Lines changed: 162690 additions & 20635 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.

‎.github/workflows/packer.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
2727
- name: Cache Packer
2828
id: cache-packer
29-
uses: actions/cache@v3
29+
uses: actions/cache@v4
3030
with:
3131
key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
3232
path: |
@@ -53,7 +53,7 @@ jobs:
5353
# # actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
5454
# - name: Cache Uploader
5555
# id: cache-uploader
56-
# uses: actions/cache@v3
56+
# uses: actions/cache@v4
5757
# with:
5858
# key: ${{ runner.os }}-Uploader-${{ hashFiles('src/Uploader/**') }}
5959
# path: Uploader.exe
@@ -109,8 +109,7 @@ jobs:
109109
# 由于Github的限制，这里需要重新拉取打包程序。
110110
- name: Restore Packer
111111
id: cache-restore
112-
# https://github.com/actions/cache/issues/1265#issuecomment-1819612829 `fail-on-cache-miss` for restore action not failing the workflow
113-
uses: actions/cache/restore@v3.3.1
112+
uses: actions/cache/restore@v4
114113
with:
115114
key: ${{ runner.os }}-Packer-${{ hashFiles('source/Packer/**') }}
116115
path: |
@@ -177,7 +176,12 @@ jobs:
177176
- name: Restore Artifacts
178177
uses: actions/download-artifact@v4
179178
with:
180-
path: artifacts/
179+
path: artifacts/
180+
181+
# feat: UTC 20:00~21:00 取消上传（避开远程服务器的4:00-4:10）
182+
- name: Fail at inappropriate time
183+
run: if [ `date -u +%H` -eq 20 ]; then exit -1; fi
184+
shell: bash
181185

182186
- name: Run Uploader
183187
run: .\Uploader --host="${{ secrets.SSH_IP }}" --name="${{ secrets.SSH_USER }}" --password="${{ secrets.SSH_PWD }}"

‎.github/workflows/pr-packer.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- 'src/**'
99
- 'config/packer/**'
1010
- 'projects/**'
11+
- '.github/workflows/pr-packer.yml'
1112

1213

1314

@@ -27,7 +28,7 @@ jobs:
2728
# actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
2829
- name: Cache Packer
2930
id: cache-packer
30-
uses: actions/cache@v3
31+
uses: actions/cache@v4
3132
with:
3233
key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
3334
path: |
@@ -61,8 +62,7 @@ jobs:
6162
# 由于Github的限制，这里需要重新拉取打包程序。
6263
- name: Restore Packer
6364
id: cache-restore
64-
# https://github.com/actions/cache/issues/1265#issuecomment-1819612829 `fail-on-cache-miss` for restore action not failing the workflow
65-
uses: actions/cache/restore@v3.3.1
65+
uses: actions/cache/restore@v4
6666
with:
6767
key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
6868
path: |
@@ -102,7 +102,7 @@ jobs:
102102
if: steps.check-changes.outputs.changed == 'true' || github.event_name == 'workflow_dispatch'
103103

104104
- name: Upload Artifact for ${{ matrix.version }}
105-
uses: actions/upload-artifact@v3.0.0
105+
uses: actions/upload-artifact@v4
106106
with:
107107
name: Minecraft-Mod-Language-Package-${{ matrix.version }}
108108
path: Minecraft-Mod-Language-Package-${{ matrix.version }}/*

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565

6666
- [Minecraft Wiki:译名标准化](https://zh.minecraft.wiki/w/Minecraft_Wiki:%E8%AF%91%E5%90%8D%E6%A0%87%E5%87%86%E5%8C%96)丨[译名历史](https://zh.minecraft.wiki/w/Minecraft_Wiki:%E8%AF%91%E5%90%8D%E6%A0%87%E5%87%86%E5%8C%96/%E5%8E%86%E5%8F%B2) - 原版词汇中英对照及变更记录。
6767
- [Minecraft 中文标准译名查询](https://mcst.teahouse.team/) - 搜索原版词条在 简中/港繁/台繁/文言 中的翻译。
68-
- [Minecraft 模组翻译参考词典](https://dict.mcmod.cn/) - 以英文检索本仓库中的翻译条目。
68+
- [Minecraft 模组翻译参考词典](https://dict.vmct-cn.top/) - 以英文或中文检索本仓库中的翻译条目。
69+
- [MC百科 Minecraft 模组翻译参考词典](https://dict.mcmod.cn/) - 以英文检索本仓库中的翻译条目，数据更新较慢。
6970
- [MC百科社群的翻译讨论](https://bbs.mcmod.cn/forum.php?mod=forumdisplay&fid=31&filter=typeid&typeid=116) - 模组翻译讨论，零散汉化发布。
7071

7172
### 其他

‎config/packer/1.12.2.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"zh_cn"
66
],
77
"exclusionMods": [
8-
"gregtechce"
8+
"gregtechce",
9+
"matteroverdrive-legacy"
910
],
1011
"exclusionNamespaces": [
1112
"srparasites"

‎config/packer/1.19.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
],
77
"exclusionMods": [],
88
"exclusionNamespaces": [
9-
"nochatreports"
9+
"nochatreports",
10+
"illager_additions"
1011
]
1112
},
1213
"floating": {

‎config/packer/1.21.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"floating": {
1111
"inclusionDomains": [
1212
"font",
13-
"textures"
13+
"textures",
14+
"gui"
1415
],
1516
"exclusionDomains": [
1617
],

‎projects/1.12.2/assets/allomancy/allomancy/lang/en_us.lang‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
itemGroup.Allomancy=Allomancy
2+
3+
tile.oreTin.name=Tin Ore
4+
tile.oreLead.name=Lead Ore
5+
tile.oreCopper.name=Copper Ore
6+
tile.oreZinc.name=Zinc Ore
7+
tile.iron_lever.name=Iron Lever
8+
tile.iron_lever.lore=This lever seems to heavy to move by ordinary means
9+
10+
item.handgrinder.name=Hand Grinder
11+
item.nuggetLerasium.name=Lerasium Nugget
12+
item.nuggetLerasium.lore=This item is endowed with strange powers, perhaps you should ingest it?
13+
item.mistcloak.name=Mistcloak
14+
item.coinbag.name=Coin Bag
15+
16+
key.categories.allomancy=Allomancy
17+
key.burn=Burn Metals
18+
19+
commands.allomancy.usage=/allomancy <power level> [player]
20+
commands.allomancy.success=Setting %s to %s
21+
22+
item.itemVial.name=Allomantic Vial
23+
24+
25+
item.flakeBrass.name=Brass Flakes
26+
item.flakeBronze.name=Bronze Flakes
27+
item.flakeIron.name=Iron Flakes
28+
item.flakeSteel.name=Steel Flakes
29+
item.flakePewter.name=Pewter Flakes
30+
item.flakeCopper.name=Copper Flakes
31+
item.flakeTin.name=Tin Flakes
32+
item.flakeZinc.name=Zinc Flakes
33+
item.flakeLead.name=Lead Flakes
34+
35+
item.ingotZinc.name=Zinc Ingot
36+
item.ingotLead.name=Lead Ingot
37+
item.ingotTin.name=Tin Ingot
38+
item.ingotCopper.name=Copper Ingot
39+
item.ingotBrass.name=Brass Ingot
40+
item.ingotBronze.name=Bronze Ingot
41+
42+
advancements.becomeMistborn.title=Become Mistborn!
43+
advancements.becomeMistborn.desc=You have a power most people envy...

‎projects/1.12.2/assets/allomancy/allomancy/lang/zh_cn.lang‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
itemGroup.Allomancy=镕金术
2+
3+
tile.oreTin.name=锡矿石
4+
tile.oreLead.name=铅矿石
5+
tile.oreCopper.name=铜矿石
6+
tile.oreZinc.name=锌矿石
7+
tile.iron_lever.name=铁拉杆
8+
tile.iron_lever.lore=这根拉杆似乎太重了，无法以普通方法拉动。
9+
10+
item.handgrinder.name=手动粉碎器
11+
item.nuggetLerasium.name=天铂粒
12+
item.nuggetLerasium.lore=这件物品拥有奇异的力量，也许你应该把它吃下去？
13+
item.mistcloak.name=迷雾斗篷
14+
item.coinbag.name=钱袋
15+
16+
key.categories.allomancy=镕金术
17+
key.burn=冶炼金属
18+
19+
commands.allomancy.usage=/allomancy <能力等级> [玩家]
20+
commands.allomancy.success=已将 %s 设置为 %s
21+
22+
item.itemVial.name=镕金瓶
23+
24+
25+
item.flakeBrass.name=黄铜碎片
26+
item.flakeBronze.name=青铜碎片
27+
item.flakeIron.name=铁碎片
28+
item.flakeSteel.name=钢碎片
29+
item.flakePewter.name=白镴碎片
30+
item.flakeCopper.name=铜碎片
31+
item.flakeTin.name=锡碎片
32+
item.flakeZinc.name=锌碎片
33+
item.flakeLead.name=铅碎片
34+
35+
item.ingotZinc.name=锌锭
36+
item.ingotLead.name=铅锭
37+
item.ingotTin.name=锡锭
38+
item.ingotCopper.name=铜锭
39+
item.ingotBrass.name=黄铜锭
40+
item.ingotBronze.name=青铜锭
41+
42+
advancements.becomeMistborn.title=成为迷雾之子！
43+
advancements.becomeMistborn.desc=你拥有大多数人都羡慕的力量……

‎projects/1.12.2/assets/ancient-spellcraft/ancientspellcraft/lang/zh_cn.lang‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ item.ancientspellcraft\:crystal_silver_nugget.name=晶银粒
7979
item.ancientspellcraft\:enchanted_filament.name=附魔细丝
8080
wizard_armour_class.sage=贤者
8181
wizard_armour_class.battlemage=战斗法师
82-
wizard_armour_class.warlock=狂术士
82+
wizard_armour_class.warlock=巫术士
8383

8484
#entity
8585
entity.ancientspellcraft\:devoritium_bomb.name=噬法炸弹
@@ -248,7 +248,7 @@ item.ancientspellcraft\:advanced_stone_fist.name=石拳
248248
item.ancientspellcraft\:amulet_arcane_catalyst.desc=转化出的法术会与被转化法术的元素相同。
249249
item.ancientspellcraft\:amulet_arcane_catalyst.name=奥术触媒护符
250250
item.ancientspellcraft\:amulet_curse_ward.desc=免疫一切诅咒类法术。
251-
item.ancientspellcraft\:amulet_curse_ward.name=袪咒护符
251+
item.ancientspellcraft\:amulet_curse_ward.name=祛咒护符
252252
item.ancientspellcraft\:amulet_healing_mushroom.desc=当你受伤时，你周围有一定几率生长出一些治愈蘑菇。
253253
item.ancientspellcraft\:amulet_healing_mushroom.name=琥珀蘑菇护符
254254
item.ancientspellcraft\:amulet_mana.desc=减少 10%% 的魔力消耗。
@@ -798,7 +798,7 @@ spell.ancientspellcraft\:dimensional_anchor=维度锚
798798
spell.ancientspellcraft\:dispel_greater_magic.desc=解除最高进阶等级的魔法构造物和魔法攻击，消灭所有召唤物，还能驱除敌人的全部增益效果。
799799
spell.ancientspellcraft\:dispel_greater_magic=解除高等法术
800800
spell.ancientspellcraft\:dispel_item_curse.desc=移除附于施法者副手的一件物品或者穿戴的一件盔甲上的诅咒。
801-
spell.ancientspellcraft\:dispel_item_curse=袪咒
801+
spell.ancientspellcraft\:dispel_item_curse=祛咒
802802
spell.ancientspellcraft\:dispel_lesser_magic.desc=解除最高学徒等级的魔法构造物和魔法攻击，如果命中敌人，还能够驱除目标的一项增益效果。
803803
spell.ancientspellcraft\:dispel_lesser_magic=解除低等法术
804804
spell.ancientspellcraft\:drought.desc=枯萎皱缩，\n凋谢靡弱，\n生命垂朽，\n草木零落。

‎projects/1.12.2/assets/animus/animus/lang/zh_cn.lang‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ item.kama_stone.name=石扣派刀
5959
item.kama_wood.name=木扣派刀
6060
item.keybinding.name=绑定键位
6161
item.mobsoul.name=生物灵魂
62-
item.sigil_builder.name=速建仪式
63-
item.sigil_chains.name=幻影链仪式
64-
item.sigil_consumption.name=消耗仪式
65-
item.sigil_leech.name=自然汲取仪式
66-
item.sigil_storm.name=暴风仪式
62+
item.sigil_builder.name=速建印记
63+
item.sigil_chains.name=幻影链印记
64+
item.sigil_consumption.name=消耗印记
65+
item.sigil_leech.name=自然汲取印记
66+
item.sigil_storm.name=暴风印记
6767
item.sigil_transposition.name=获取印记
6868
potion.vengefulspirits.name=复仇之魂
6969
ritual.animus.ritualCulling=剔除仪式

0 commit comments

Comments
 (0)