1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:59:24 +08:00

Merge branch 'master_lme' into brocore_dev

# Conflicts:
#	config/template.json
#	module/awaken/awaken.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/menu.json
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
This commit is contained in:
Zuosizhu
2025-07-25 11:44:23 +08:00
90 changed files with 3057 additions and 463 deletions

View File

@@ -155,7 +155,7 @@
"help": ""
},
"Coalition": {
"name": "Little Academy",
"name": "Neon City Investigator",
"help": ""
},
"MaritimeEscort": {
@@ -166,10 +166,6 @@
"name": "War Archives",
"help": "Due to the lack of maintenance of war archives, continuous clear may not work normally, if Alas runs abnormally, Please manually finish clearing and use auto search"
},
"CoalitionSp": {
"name": "Little Academy SP",
"help": ""
},
"EventA": {
"name": "Event Daily A",
"help": ""
@@ -194,6 +190,10 @@
"name": "Raid Daily",
"help": ""
},
"CoalitionSp": {
"name": "Neon City Investigator SP",
"help": ""
},
"Commission": {
"name": "Commission",
"help": ""
@@ -405,6 +405,7 @@
"com.YoStarJP.AzurLane": "JP",
"com.hkmanjuu.azurlane.gp": "TW",
"com.bilibili.blhx.huawei": "CN com.bilibili.blhx.huawei",
"com.bilibili.blhx.honor": "CN com.bilibili.blhx.honor",
"com.bilibili.blhx.mi": "CN com.bilibili.blhx.mi",
"com.tencent.tmgp.bilibili.blhx": "CN com.tencent.tmgp.bilibili.blhx",
"com.bilibili.blhx.baidu": "CN com.bilibili.blhx.baidu",
@@ -1109,6 +1110,7 @@
"event_20250227_cn": "Paradiso of Shackled Light",
"event_20250424_cn": "Toward Tulipas Seas",
"event_20250520_cn": "A Rose on the High Tower",
"event_20250724_cn": "The Alchemist and the Tower of Horizons",
"raid_20200624": "Air Raid Drills with Essex Rerun",
"raid_20210708": "Cross Wave rerun",
"raid_20220127": "Mystery Investigation",
@@ -1156,6 +1158,7 @@
"war_archives_20220224_cn": "archives Abyssal Refrain",
"war_archives_20220324_cn": "archives Virtual Tower",
"war_archives_20220414_cn": "archives Aurora Noctis",
"war_archives_20220428_cn": "archives Rondo at Rainbows End",
"war_archives_20220526_cn": "archives Pledge of the Radiant Court",
"war_archives_20220728_cn": "archives Aquilifers Ballade"
},