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

Browse Source

...

This commit is contained in:

serega404 committed 2020-11-15 22:41:57 +03:00

2 parents c1194b7601 b987412670

commit ccda1eff74

37 files changed

+1820 -716

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

No files matched your search

src/main/resources/assets/textures/entities/pyotr.png

BIN

Binary file not shown.

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

src/main/resources/assets/textures/entities/test_skin.png

BIN

Binary file not shown.

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

src/main/resources/assets/textures/entities/test_skin_layout.png

BIN

Binary file not shown.

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