nEEtdo0d 59445a437d Fix: Resolve merge conflicts ...

Merge remote-tracking branch 'remotes/origin/revised_guild_reward' into guild_reward

# Conflicts:
#	module/reward/guild.py

2021-01-04 18:24:55 -05:00

..

assets.py

Fix: Resolve merge conflicts, remove deprecated methods

2021-01-04 17:47:35 -05:00

commission.py

Opt: Remove code for DOA commissions to avoid errors in the future

2020-12-15 15:55:06 +08:00

data_key.py

Fix: stuck in retreat confirmation on potato pcs

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

dorm.py

Fix: Too many clicks when having too many wrong coins and loves in dorm

2020-11-09 00:35:34 +08:00

guild.py

Fix: Resolve merge conflicts

2021-01-04 18:24:55 -05:00

meowfficer.py

Fix: Reduce time getting a meowfficer by multi-click

2020-12-24 21:23:27 -05:00

reward.py

Merge remote-tracking branch 'origin/master' into guild_reward

2020-12-29 13:18:37 -05:00

tactical_class.py

Fix: Handle game loading after TACTICAL_CLASS_START appears

2020-10-17 20:17:12 +08:00