mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-18 11:02:08 +00:00
Merge branch 'master' into dynamic-flow
Conflicts: lib/Slic3r/Flow.pm lib/Slic3r/Layer.pm
This commit is contained in:
2
MANIFEST
2
MANIFEST
@@ -34,12 +34,14 @@ lib/Slic3r/GUI/Plater.pm
|
||||
lib/Slic3r/GUI/SkeinPanel.pm
|
||||
lib/Slic3r/GUI/Tab.pm
|
||||
lib/Slic3r/Layer.pm
|
||||
lib/Slic3r/Layer/Region.pm
|
||||
lib/Slic3r/Line.pm
|
||||
lib/Slic3r/Model.pm
|
||||
lib/Slic3r/Point.pm
|
||||
lib/Slic3r/Polygon.pm
|
||||
lib/Slic3r/Polyline.pm
|
||||
lib/Slic3r/Print.pm
|
||||
lib/Slic3r/Print/Region.pm
|
||||
lib/Slic3r/Print/Object.pm
|
||||
lib/Slic3r/Surface.pm
|
||||
lib/Slic3r/SVG.pm
|
||||
|
||||
Reference in New Issue
Block a user