LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 13:39:25 +08:00
Code Activity

Merge branch 'master_lme_to_merge'

Browse Source 
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
This commit is contained in:
Zuosizhu
2024-04-27 13:00:39 +08:00
parent 055720dd52 e99c8ad341
commit 8fd3c7eedd
87 changed files with 1419 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/config/i18n/en-US.json
View File

@@ -727,6 +727,7 @@
"event_20231123_cn": "The Ninja Scrolls: Azur Flash",
"event_20231221_cn": "Light-Chasing Sea of Stars",
"event_20240229_cn": "Snowrealm Peregrination",
"event_20240425_cn": "Heart-Linking Harmony",
"raid_20200624": "Air Raid Drills with Essex Rerun",
"raid_20210708": "Cross Wave rerun",
"raid_20220127": "Mystery Investigation",