Merge branch 'master' into dev

Browse Source

# Conflicts:
#	module/ui/assets.py

...

This commit is contained in:

LmeSzinc

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

parent 22e8b73570 59a17f59e5

commit 772bf15f62

26 changed files with 88 additions and 49 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/jp/guild/BATTLE_STATUS_CF.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

assets/jp/ui/MEOWFFICER_INFO.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 19 KiB

BIN

assets/jp/ui/SHIPYARD_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 22 KiB