0O0o0oOoO00 8d17eeb803 Merge remote-tracking branch 'LmeSzinc/master' into dev ...

# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json

2026-01-23 10:21:18 +08:00

..

assets.py

Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM

2026-01-23 02:09:08 +08:00

combat.py

Fix: duplicate QUIT clicks canceling QUIT_RECONFIRM

2026-01-23 02:09:08 +08:00

equipment.py

Upd: Flagship changing (#3556)

2024-04-19 01:40:40 +08:00

exercise.py

add: migrate exercise delay implementation

2025-09-15 18:01:01 +08:00

hp_daemon.py

Upd: Battle UI MaidCafe

2026-01-01 23:36:25 +08:00

opponent.py

Fix: Detection of beacon data collected today

2022-06-10 01:58:24 +08:00