LmeSzinc f71a151678 Merge branch 'master' into app ...

# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config.py

2021-09-19 23:34:30 +08:00

..

assets.py

Add tactical class

2021-09-14 17:09:41 +08:00

data_key.py

Fix: stuck in retreat confirmation on potato pcs

2020-12-27 11:55:52 +09:00

dorm.py

Merge branch 'master' into dev

2021-08-07 14:32:31 +08:00

meowfficer.py

Fix: [EN] meow_confirm increase horizontal offset

2021-09-03 23:17:56 -04:00

reward.py

Add: [EN, JP] War Archives daily option

2021-09-18 13:16:54 -04:00