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

Browse Source

# [EN] equipment assets update
# sync _dorm_receive update across branches

...

This commit is contained in:

nEEtdo0d

2021-10-16 20:00:35 -04:00

parent dd6be5c1e1 c31366cb73

commit 4f09c65868

5 changed files with 4 additions and 4 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/EQUIPMENT_OPEN.png

Binary file not shown.

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

BIN

assets/en/equipment/EQUIP_1.png

Binary file not shown.

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

BIN

assets/en/equipment/EQUIP_2.png

Binary file not shown.

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

BIN

assets/en/equipment/EQUIP_3.png

Binary file not shown.

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