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

Browse Source

...

This commit is contained in:

Sergey Karmanov

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

parent c1194b7601 b987412670

commit ccda1eff74

37 changed files with 1820 additions and 716 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

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