Merge branch 'master' into avoid-crossing-perimeters
Conflicts: README.markdown lib/Slic3r/Config.pm lib/Slic3r/GCode.pm lib/Slic3r/Print.pm slic3r.pl
This commit is contained in:
commit
cc8d8bd26f
34 changed files with 531 additions and 267 deletions
1
MANIFEST
1
MANIFEST
|
@ -36,6 +36,7 @@ lib/Slic3r/GUI/SkeinPanel.pm
|
|||
lib/Slic3r/GUI/Tab.pm
|
||||
lib/Slic3r/Layer.pm
|
||||
lib/Slic3r/Line.pm
|
||||
lib/Slic3r/Model.pm
|
||||
lib/Slic3r/Point.pm
|
||||
lib/Slic3r/Polygon.pm
|
||||
lib/Slic3r/Polyline.pm
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue