3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-21 15:51:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' into sender

Browse source 
Conflicts:
	Build.PL
	lib/Slic3r.pm
	xs/MANIFEST
	xs/src/libslic3r/PrintConfig.hpp
This commit is contained in:
Alessandro Ranellucci 2015-11-01 19:12:13 +01:00
commit 9b21ac877a
93 changed files with 3339 additions and 2050 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xs/MANIFEST
View file

@ -1670,6 +1670,7 @@ src/libslic3r/ExtrusionEntityCollection.cpp
src/libslic3r/ExtrusionEntityCollection.hpp
src/libslic3r/Flow.cpp
src/libslic3r/Flow.hpp
src/libslic3r/GCode.cpp
src/libslic3r/GCode.hpp
src/libslic3r/GCodeSender.cpp
src/libslic3r/GCodeSender.hpp
@ -1691,6 +1692,8 @@ src/libslic3r/MotionPlanner.cpp
src/libslic3r/MotionPlanner.hpp
src/libslic3r/MultiPoint.cpp
src/libslic3r/MultiPoint.hpp
src/libslic3r/PerimeterGenerator.cpp
src/libslic3r/PerimeterGenerator.hpp
src/libslic3r/PlaceholderParser.cpp
src/libslic3r/PlaceholderParser.hpp
src/libslic3r/Point.cpp
@ -1753,6 +1756,7 @@ t/17_boundingbox.t
t/18_motionplanner.t
t/19_model.t
t/20_print.t
t/21_gcode.t
xsp/BoundingBox.xsp
xsp/BridgeDetector.xsp
xsp/Clipper.xsp
@ -1765,6 +1769,7 @@ xsp/ExtrusionLoop.xsp
xsp/ExtrusionPath.xsp
xsp/Flow.xsp
xsp/GCodeSender.xsp
xsp/GCode.xsp
xsp/GCodeWriter.xsp
xsp/Geometry.xsp
xsp/GUI_3DScene.xsp
@ -1774,6 +1779,7 @@ xsp/Model.xsp
xsp/MotionPlanner.xsp
xsp/my.map
xsp/mytype.map
xsp/PerimeterGenerator.xsp
xsp/PlaceholderParser.xsp
xsp/Point.xsp
xsp/Polygon.xsp