Merge remote-tracking branch 'upstream/master'

Browse Source

...

This commit is contained in:

Sys Quatre

2021-01-24 12:40:06 +01:00

parent 99a01301a8 fd596ea83b

commit df9e8aea4b

828 changed files with 88659 additions and 89233 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

itemframes/textures/itemframes_frame.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 104 B After Width:  |  Height:  |  Size: 103 B

BIN

itemframes/textures/itemframes_pedestal.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 286 B After Width:  |  Height:  |  Size: 285 B