LmeSzinc e918a5db97 Merge branch 'gems_farming' into dev ...

# Conflicts:
#	module/campaign/campaign_ocr.py
#	module/equipment/equipment.py
#	module/guild/base.py

2021-07-24 17:33:58 +08:00

..

assets.py

Fix: [JP] Switch to SP/EX asset

2021-04-25 19:27:30 -04:00

auto_search_combat.py

Fix: Lock new ships in auto search combat

2021-07-23 16:03:52 +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

Opt: Template.match_result returns similarity and Button

2021-06-30 13:59:24 +08:00

emotion.py

Revert "Opt: Disable emotion bug handler"

2021-06-09 12:35:17 +08:00

hp_balancer.py

Opt: Cache ButtonGrid.buttons and add move() crop()

2021-06-29 23:04:19 +08:00

level.py

Add: Change flagship when level >= 32

2021-06-30 18:04:31 +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