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: Resolve merge conflict ui/assets.py

2021-07-23 10:21:26 -04:00

navbar.py

Add: Navbar module

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

page.py

Upd: commented with explanation

2021-07-18 10:07:44 -04:00

scroll.py

Fix: Able to do over scrolling

2021-06-29 23:01:44 +08:00

switch.py

Opt: Switch class

2020-10-20 15:44:32 +08:00

ui.py

Fix: Resolve merge conflict ui/assets.py

2021-07-23 10:21:26 -04:00