LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-23 01:49:30 +08:00
Code Activity
8,551 Commits 12 Branches 0 Tags
af5bcafcc5ccccbbf8d1db5d86d9b3c8a73da621
Commit Graph

6007 Commits

Author SHA1 Message Date
LmeSzinc
6bac6bff7b Add: Event entrance of Frostfall (event_20230323_cn) 2023-03-23 21:58:07 +08:00
xzjjasper
802bb6c26e Upd: [TW] raid assets 2023-03-23 21:52:41 +08:00
LmeSzinc
e0b72d4ede Fix: Handle various returns in _meow_enhance() 2023-03-23 21:51:19 +08:00
LmeSzinc
b90ed0c43a Upd: Update daily indexes after emergency module development event 2023-03-23 21:38:29 +08:00
LmeSzinc
c1656dd273 Refactor: Use new emulator module in easy install 2023-03-23 20:37:44 +08:00
xzjjasper
7175b3969e Upd:[TW] Angel of Iris 2023-03-23 20:36:48 +08:00
LmeSzinc
0728f51b29 Refactor: Move easy install to deploy/Windows 2023-03-23 00:25:16 +08:00
Zuosizhu
1cf33b4a6e Merge branch 'LmeSzinc:master' into master 2023-03-20 17:10:32 +08:00
LmeSzinc
806e15934f Fix: Lower threshold in StatusScanner 2023-03-19 22:38:42 +08:00
LmeSzinc
97e5476d19 Merge branch 'master' into dev 2023-03-19 18:27:20 +08:00
LmeSzinc
ad8d20b78a Fix: Appear animation of research project list (#2373) 2023-03-19 00:19:23 +08:00
Zuosizhu
5a33dfd357 Merge branch 'LmeSzinc:master' into master 2023-03-18 21:48:47 +08:00
LmeSzinc
0c26b7a001 Upd: [EN] MISSION_OVERVIEW_CHECK 2023-03-17 00:49:43 +08:00
Zuosizhu
99aa7f50ce Merge branch 'master_lme' into master_GUI 2023-03-17 00:45:18 +08:00
Zuosizhu
aa91c7a814 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	module/campaign/gems_farming.py
 2023-03-17 00:44:12 +08:00
LmeSzinc
89c36597b2 Add: Emergency module development daily 2023-03-17 00:34:02 +08:00
LmeSzinc
23a4a151b1 Fix: Collect dorm loves and coins in non-U2 family control methods 2023-03-16 22:54:22 +08:00
LmeSzinc
db2055099d Opt: Improve log appearance when changing flagship and vanguard 2023-03-16 22:51:24 +08:00
Zuosizhu
880ddb634e Merge branch 'master_lme' into master_GUI 2023-03-16 12:36:38 +08:00
Zuosizhu
9115938300 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
 2023-03-16 12:35:13 +08:00
LmeSzinc
9aaaf882ad Fix: [TW] Handle OCR error in commission name 2023-03-16 00:56:00 +08:00
LmeSzinc
e9f6781524 Fix: Handle DST in is_in_opsi_explore() 2023-03-15 22:52:21 +08:00
LmeSzinc
7823d6e7da Merge pull request #2366 from syccxcc/master 
Update en-US.json
 2023-03-15 12:00:05 +08:00
Peter Li
482a698bd7 Update en-US.json 
Update the url for ship enhancing on the wiki.
 2023-03-14 15:35:26 -04:00
LmeSzinc
a290a742e4 Upd: Config update 2023-03-14 20:30:28 +08:00
Azusachan
0ad55c1b60 Add: [CN] War Archive Skybound Oratorio (#2363) 2023-03-14 20:21:54 +08:00
Zuosizhu
39d4146f4a Merge branch 'master_lme' into master_GUI 2023-03-14 19:16:27 +08:00
Zuosizhu
aabc691fb1 Merge branch 'master_lme' 2023-03-14 19:14:40 +08:00
Zuosizhu
a5c8488a09 Fix: 12day in ocr cause empty preserved exercise times 2023-03-14 19:13:40 +08:00
LmeSzinc
3a12b9e95e Fix: Handle AUTO_SEARCH_REWARD in question_goto() 2023-03-12 01:10:35 +08:00
LmeSzinc
d5797cb153 Fix: Handle AUTO_SEARCH_REWARD when switching fleet lock 2023-03-11 23:46:47 +08:00
Zuosizhu
129abcb27f Merge branch 'master_lme' into master_GUI 2023-03-11 16:30:03 +08:00
Zuosizhu
53f44f3ff5 Merge branch 'master_lme' 
# Conflicts:
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-11 16:21:26 +08:00
LmeSzinc
4610d9babf Upd: [TW] FLEET_*_ADVICE 2023-03-11 03:56:46 +08:00
LmeSzinc
ac379b0143 Upd: [EN][JP] FLEET_*_ADVICE 2023-03-11 01:58:39 +08:00
LmeSzinc
bab97c81cf Opt: Remove disable option from ChangeFlagship 
Disabling ChangeFlagship makes GemsFarming meaningless
 2023-03-10 23:43:23 +08:00
LmeSzinc
1736d3e6fc Opt: Raise error if user is using EventABCD before stages unlocked 2023-03-10 23:30:28 +08:00
LmeSzinc
cb1d4f24d3 Opt: Raise error when user running a hard mode but haven't prepared the fleets 2023-03-10 23:10:19 +08:00
LmeSzinc
ab79961869 Fix: Protect fleet2 in D2 to archive 3 stars 2023-03-10 21:18:53 +08:00
18870
2f3055b8ac Del: Remove Shanghai reverse proxy 
feat: redirect util allow update the same key
 2023-03-10 20:28:10 +08:00
Alexanded
26885555e1 Upd: [EN] FLEET_CHECK 2023-03-10 00:08:18 +03:00
Alexan-ded
f230f08802 Merge branch 'LmeSzinc:bug_fix' into bug_fix 2023-03-10 00:06:45 +03:00
Zuosizhu
be8529fcbf Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-09 21:09:36 +08:00
LmeSzinc
b08baf0739 Add: Event entrance of Daedalian Hymn Rerun (event_20230309_cn) 2023-03-09 20:26:35 +08:00
xzjjasper
5972522ebb Upd: [TW] Swirling Cherry Blossoms Rerun 2023-03-09 19:15:15 +08:00
Zuosizhu
20da8c8888 Add: 复兴的赞美诗（小开偷跑版） 2023-03-09 15:04:08 +08:00
Zuosizhu
a69c30faa6 Merge remote-tracking branch 'origin/master' 2023-03-09 14:08:22 +08:00
Zuosizhu
0a80de07af Fix: Auto handle game server maintenance 2023-03-09 14:07:57 +08:00
Zuosizhu
2728b60d28 Merge branch 'LmeSzinc:master' into master 2023-03-09 00:54:24 +08:00
Zuosizhu
aad20f1572 Add: choice to empty exercise tries on the second Friday of Exercise season. Fix multi_server issues caused by ocr in exercise days by simply limit it to CN only. 2023-03-09 00:51:25 +08:00