Merge remote-tracking branch 'upstream/master'

Browse Source

...

This commit is contained in:

bri cassa

2021-03-06 16:49:10 +01:00

parent 2b535ee887 31aa979215

commit bda0db7c04

74 changed files with 1729 additions and 2811 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

shields/textures/shields_inv_shield_wood.png

Binary file not shown.

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

BIN

shields/textures/shields_shield_admin_preview.png

Binary file not shown.

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

BIN

shields/textures/shields_shield_enhanced_cactus_preview.png

Binary file not shown.

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

BIN

shields/textures/shields_shield_mithril_preview.png

Binary file not shown.

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