LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 17:39:25 +08:00
Code Activity
Files
8fd3c7eedd3d98fb9690f8737b67fd2781183128
Alas/module
History
Zuosizhu 8fd3c7eedd Merge branch 'master_lme_to_merge' 
# 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
2024-04-27 13:00:39 +08:00
..
base
Merge branch 'LmeSzinc:master' into 20230309
2024-04-15 23:25:52 +08:00
campaign
Merge branch 'master_lme_to_merge'
2024-04-27 13:00:39 +08:00
coalition
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
combat
Merge branch 'master_lme'
2023-10-26 00:04:07 +08:00
commission
Fix: Slow OCR is detected as commission flashing bug
2024-01-12 18:29:25 +08:00
config
Merge branch 'master_lme_to_merge'
2024-04-27 13:00:39 +08:00
daemon
Merge branch 'master_lme'
2024-04-10 12:22:40 +08:00
daily
Revert "Upd: Flagship changing (#3556)"
2024-04-27 12:58:56 +08:00
device
Merge branch 'master_lme_to_merge'
2024-04-27 13:00:39 +08:00
dorm
Fix: Chain call minitouch in dorm
2024-04-15 19:20:52 +08:00
equipment
Merge branch 'master_lme_to_merge'
2024-04-27 13:00:39 +08:00
event
…
exercise
Revert "Upd: Flagship changing (#3556)"
2024-04-27 12:58:56 +08:00
freebies
…
gacha
Fix: Dashboard won't refresh after gacha when using gacha tickets(PR =9)
2024-04-13 11:54:12 +08:00
game_setting
…
gg_handler
Add: timeout setting of enabling gg
2023-10-12 22:35:54 +08:00
guild
Opt: Remove meaningless sleep from stone age
2024-04-20 02:50:12 +08:00
handler
Merge branch 'master_lme_to_merge'
2024-04-27 13:00:39 +08:00
hard
Revert "Upd: Flagship changing (#3556)"
2024-04-27 12:58:56 +08:00
log_res
…
map
Merge branch 'master_lme_to_merge'
2024-04-27 13:00:39 +08:00
map_detection
Add: 15图开荒/周回 (#3563)
2024-04-19 01:29:17 +08:00
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: Patch pkg_resources for faster startup
2024-04-15 18:43:42 +08:00
os
Merge branch 'master_lme_to_merge'
2024-04-27 13:00:39 +08:00
os_ash
Fix: Ash power limit not safe enough
2023-12-28 01:19:55 +08:00
os_combat
Merge branch 'LmeSzinc:master' into 20230309
2023-10-19 22:53:32 +08:00
os_handler
Merge branch 'master_lme'
2024-04-26 03:18:16 +08:00
raid
Merge branch 'LmeSzinc:master' into 20230309
2024-03-29 07:09:29 +08:00
research
Fix: [JP] GameTooManyClickError in research_detect()
2023-12-14 00:55:58 +08:00
retire
Revert "Upd: Flagship changing (#3556)"
2024-04-27 12:58:56 +08:00
reward
…
shipyard
[TW]Fix ash beacons and shipyard (#2999)
2023-08-11 19:06:10 +08:00
shop
Merge branch 'dev-revert-gemsfarming'
2024-04-20 15:16:09 +08:00
sos
…
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
…
tactical
Fix: Handle MISSION_POPUP_ACK when receiving tactical class
2024-04-10 21:37:08 +08:00
template
Fix: Duplicated SheffieldIdol template
2024-04-26 04:01:06 +08:00
ui
Merge branch 'dev-revert-gemsfarming'
2024-04-20 15:16:09 +08:00
war_archives
Add: War Archives The Way Home in the Night
2024-03-11 22:57:37 +08:00
webui
Merge branch 'master_lme'
2024-04-26 03:18:16 +08:00
exception.py
…
logger.py
Sync: [SRC] Sync alas changes
2023-09-10 15:04:32 +08:00
logger.pyi
…
notify.py
…
server_checker.py
…