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

Add: Flagship changing

2021-06-29 23:10:13 +08:00

equipment.py

Add: Navbar module

2021-07-10 22:58:11 -04:00

fleet_equipment.py

Fix: Change equipment for the first fleet if multiple daily fleets are set (#324)

2021-01-30 10:34:05 +08:00