Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev

Browse source

...

This commit is contained in:

Enrico Turri 2018-08-27 14:01:03 +02:00

parent fef5a5252e d4c8bc0720

commit 4b25d3924b

52 changed files with 5698 additions and 537 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/add_object.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 829 B

BIN

resources/icons/colorchange_add_off.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 600 B

BIN

resources/icons/colorchange_add_on.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 695 B

BIN

resources/icons/colorchange_delete_off.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 589 B

BIN

resources/icons/colorchange_delete_on.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 628 B

BIN

resources/icons/disclosure_triangle_close.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 212 B

BIN

resources/icons/disclosure_triangle_open.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 210 B

BIN

resources/icons/down_half_circle.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 506 B

BIN

resources/icons/erase.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 488 B

BIN

resources/icons/exclamation_mark_.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1 KiB

BIN

resources/icons/lambda.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 913 B

BIN

resources/icons/lambda_.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 422 B

BIN

resources/icons/left_half_circle.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 518 B

BIN

resources/icons/object.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1,017 B

BIN

resources/icons/one_layer_lock_off.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 577 B

BIN

resources/icons/one_layer_lock_on.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 528 B

BIN

resources/icons/one_layer_unlock_off.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 508 B

BIN

resources/icons/one_layer_unlock_on.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 483 B

BIN

resources/icons/right_half_circle.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 521 B

BIN

resources/icons/split.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1,021 B

BIN

resources/icons/up_half_circle.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 517 B