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

Browse Source

...

This commit is contained in:

YuSanka

2018-06-26 09:26:27 +02:00

parent 8a3cf3f71d 40b327eb11

commit 0371f368a4

87 changed files with 12046 additions and 4249 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

resources/icons/bed/mk2_bottom.png Normal file

Binary file not shown.

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

BIN

resources/icons/bed/mk2_top.png Normal file

Binary file not shown.

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

BIN

resources/icons/bed/mk3_bottom.png Normal file

Binary file not shown.

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

BIN

resources/icons/bed/mk3_top.png Normal file

Binary file not shown.

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

BIN

resources/icons/overlay/rotate_hover.png Normal file

Binary file not shown.

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

BIN

resources/icons/overlay/rotate_off.png Normal file

Binary file not shown.

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

BIN

resources/icons/overlay/rotate_on.png Normal file

Binary file not shown.

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

BIN

resources/icons/overlay/scale_hover.png Normal file

Binary file not shown.

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

BIN

resources/icons/overlay/scale_off.png Normal file

Binary file not shown.

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

BIN

resources/icons/overlay/scale_on.png Normal file

Binary file not shown.

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