Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_gcode_detection

Browse Source

...

This commit is contained in:

enricoturri1966

2021-04-21 14:52:52 +02:00

parent 16c55a3e4c 0c1953a929

commit 82d577645e

9 changed files with 19 additions and 23 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/splashscreen-gcodepreview.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 124 KiB After Width:  |  Height:  |  Size: 232 KiB

BIN

resources/icons/splashscreen.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 125 KiB After Width:  |  Height:  |  Size: 221 KiB