Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-11-02 00:22:03 +08:00

parent f31c6bf7e8 67b9d294f9

commit 383b8893c2

24 changed files with 221 additions and 156 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/en/equipment/EQUIP_1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.8 KiB After Width:  |  Height:  |  Size: 4.7 KiB

BIN

assets/en/equipment/EQUIP_2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.8 KiB After Width:  |  Height:  |  Size: 4.6 KiB

BIN

assets/en/equipment/EQUIP_3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.8 KiB After Width:  |  Height:  |  Size: 4.5 KiB

BIN

assets/en/raid/ALBION_RAID_HARD.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 11 KiB After Width:  |  Height:  |  Size: 9.8 KiB

BIN

assets/en/ui/RAID_CHECK.png

Binary file not shown.

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

BIN

assets/en/war_archives/TEMPLATE_SWIRLING_CHERRY_BLOSSOMS.png Normal file

Binary file not shown.

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