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

Browse Source

...

This commit is contained in:

YuSanka

2018-07-26 11:27:25 +02:00

parent da18e25dfb dd724e9dab

commit e0bb6bafd5

153 changed files with 20775 additions and 4724 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_top.png

Binary file not shown.

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

BIN

resources/icons/bed/mk3_bottom.png

Binary file not shown.

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

BIN

resources/icons/bed/mk3_top.png

Binary file not shown.

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

BIN

resources/icons/printers/PrusaResearch_MK3MM2.png Normal file

Binary file not shown.

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