LmeSzinc 4f4f296e44 Merge branch 'master' into dev ...

# Conflicts:
#	module/os/assets.py

2021-04-16 17:51:18 +08:00

..

assets.py

Fix: [JP] assets fix 2 after font changed

2021-04-16 13:58:57 +09:00

auto_search_combat.py

Fix: Mis detection of combat status when combat executing

2021-03-08 10:59:41 +08:00

combat_auto.py

Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev""

2020-08-18 20:48:14 -03:00

combat_manual.py

Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev""

2020-08-18 20:48:14 -03:00

combat.py

Fix: [CN] ASH_POPUP_CHECK

2021-04-05 21:10:43 +08:00

emotion.py

Mov: 2x book check and handle setting

2021-04-02 18:26:00 -04:00

hp_balancer.py

Fix: [JP] Location of HP bar and ship level

2021-01-20 02:36:52 +09:00

level.py

Fix: Ring cover letter "L" in Level OCR

2021-04-01 01:29:38 +08:00

submarine.py

Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev""

2020-08-18 20:48:14 -03:00