LA-DI-DA c45954c4b0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev ...

# Conflicts:
#	module/device/device.py

2023-12-23 11:07:19 +08:00

..

assets.py

Upd: [EN] ACADEMY_CHECK

2023-12-22 02:33:03 +08:00

navbar.py

Fix: Navigating to Odin in shipyard (#2611)

2023-07-02 16:56:05 +08:00

page.py

Revert "Add: scroll dock to load all ship's data for changing attribute"

2023-10-19 13:42:22 +08:00

scroll.py

Add: [ALAS] Returns in Scroll.set()

2023-07-02 15:28:39 +08:00

setting.py

Fix: Use retry interval instead of bare sleep

2023-01-09 01:10:48 +08:00

switch.py

Fix: Handle AUTO_SEARCH_REWARD when switching fleet lock

2023-03-11 23:46:47 +08:00

ui.py

Merge branch 'master_lme'

2023-10-20 01:01:54 +08:00