Fix: Resolve merge conflicts, remove deprecated methods

Browse Source

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

# Conflicts:
#	module/reward/assets.py
#	module/reward/guild.py

...

This commit is contained in:

nEEtdo0d

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

parent a68f05e5c0 c2cefd77cb

commit 55a9d73131

18 changed files with 181 additions and 229 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/cn/reward/GUILD_AFFILIATION_CHECK_AXIS.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.7 KiB

BIN

assets/cn/reward/GUILD_AFFILIATION_CHECK_AZUR.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.2 KiB

BIN

assets/cn/reward/GUILD_AFFILIATION_CHECK_LOGISTICS.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/cn/reward/OCR_GUILD_EXCHANGE_INFO.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB

BIN

assets/en/reward/GUILD_AFFILIATION_CHECK_AXIS.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.7 KiB

BIN

assets/en/reward/GUILD_AFFILIATION_CHECK_AZUR.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.2 KiB

BIN

assets/en/reward/GUILD_AFFILIATION_CHECK_LOGISTICS.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/en/reward/OCR_GUILD_EXCHANGE_INFO.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB

BIN

assets/jp/reward/GUILD_AFFILIATION_CHECK_AXIS.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.7 KiB

BIN

assets/jp/reward/GUILD_AFFILIATION_CHECK_AZUR.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.2 KiB

BIN

assets/jp/reward/GUILD_AFFILIATION_CHECK_LOGISTICS.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/jp/reward/OCR_GUILD_EXCHANGE_INFO.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB

BIN

assets/tw/reward/GUILD_AFFILIATION_CHECK_AXIS.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.7 KiB

BIN

assets/tw/reward/GUILD_AFFILIATION_CHECK_AZUR.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.2 KiB

BIN

assets/tw/reward/GUILD_AFFILIATION_CHECK_LOGISTICS.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

assets/tw/reward/OCR_GUILD_EXCHANGE_INFO.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 KiB