LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-23 04:09:29 +08:00
Code Activity
Files
722a96208a8b666372096a3ef22a7614127fbf88
Alas/module
History
LA_DI_DA 722a96208a Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/gui.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
2024-02-18 17:49:13 +08:00
..
auto_login
Add: one click login
2023-12-22 21:06:25 +08:00
base
Merge branch 'LmeSzinc:master' into 20230309
2023-11-10 14:33:24 +08:00
campaign
Add: keep oil for event
2024-02-06 23:19:37 +08:00
coalition
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
combat
Merge branch 'zuosizhu-alas/20230309' into smallkai
2023-10-27 19:28:33 +08:00
commission
Fix: Slow OCR is detected as commission flashing bug
2024-01-12 18:29:25 +08:00
config
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-02-18 17:49:13 +08:00
daemon
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
daily
Fix: Error caused by loop of Daily Emergency Module Development (#3096)
2023-09-08 12:08:55 +08:00
device
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-01-12 10:41:40 +08:00
dorm
Fix: Handle missing / in dorm food ocr
2024-02-06 20:39:23 +08:00
equipment
Merge branch 'zuosizhu-alas/20230309' into smallkai
2023-10-27 19:28:33 +08:00
event
Fix: lack of setting emotion for auto event
2023-10-03 22:08:52 +08:00
exercise
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
extract_account
Add: switch account
2023-12-20 22:26:36 +08:00
freebies
Upd: Assets for entering supply pack
2023-07-14 00:31:52 +08:00
gacha
Merge branch 'master_lme'
2023-07-15 20:26:12 +08:00
game_setting
…
gg_handler
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-01-12 12:23:22 +08:00
guild
Fix: Screenshot interval is not extended in daemon and guild combat
2023-10-21 21:35:17 +08:00
handler
Merge remote-tracking branch '0O0o0oOoO00-alas/smallkai' into dev
2024-01-31 18:40:47 +08:00
hard
…
log_res
…
map
Fix: check stop barrier if equals to campaign name
2024-02-11 09:54:37 +08:00
map_detection
…
meowfficer
Upd:[TW]Update Meowfficer assets (#3341)
2023-12-08 18:02:31 +08:00
meta_reward
Del: unused DOSSIER_REWARD_NOTICE.png
2023-09-09 08:53:51 +08:00
minigame
Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING
2023-09-28 16:26:20 +08:00
ocr
Opt: Add Ocr.SHOW_REVISE_WARNING
2023-06-08 23:27:58 +08:00
os
Merge branch 'zuosizhu-alas/20230309' into smallkai
2024-01-12 10:31:19 +08:00
os_ash
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-01-02 23:10:49 +08:00
os_combat
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
os_handler
Fix: unstoppable loop of entering strategic search setting page when opsi_hazard1_leveling
2023-10-25 00:27:30 +08:00
raid
Merge branch 'LmeSzinc:master' into 20230309
2024-02-07 01:42:58 +08:00
research
Fix: [JP] GameTooManyClickError in research_detect()
2023-12-14 00:55:58 +08:00
research_farming
Fix: wrong click when checking ship's experience
2023-10-11 15:03:09 +08:00
retire
Fix: Same ships are black when changing hard mode flagships
2023-12-24 18:57:53 +08:00
reward
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
shipyard
[TW]Fix ash beacons and shipyard (#2999)
2023-08-11 19:06:10 +08:00
shop
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-02-18 17:49:13 +08:00
sos
Del: [CN][EN][JP] Disable SOS task
2023-06-08 16:49:57 +08:00
statistics
Fix: Limit text length when logging upload errors (#3242)
2023-11-01 01:48:42 +08:00
storage
Add: Siren templates in chapter A
2023-08-18 22:29:25 +08:00
submodule
Opt: No raw command textarea in FpyBenchmark
2023-05-09 14:40:24 +08:00
tactical
Merge branch 'zuosizhu-alas/20230309' into smallkai
2024-02-06 21:48:59 +08:00
template
Upd: Siren templates
2023-12-23 00:38:13 +08:00
ui
Merge branch 'zuosizhu-alas/20230309' into smallkai
2024-02-18 17:43:53 +08:00
war_archives
Upd:[TW]war_archives assets (#3490)
2024-02-18 01:37:15 +08:00
webui
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-02-18 17:49:13 +08:00
exception.py
Add: account's owner login detection
2023-09-22 12:24:08 +08:00
logger.py
Sync: [SRC] Sync alas changes
2023-09-10 15:04:32 +08:00
logger.pyi
…
notify.py
…
server_checker.py
Fix: incorrect place of exit when server is under maintenance
2023-11-20 22:40:22 +08:00