mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-31 00:52:51 +00:00
Merge branch 'master' into sender
Conflicts: Build.PL
This commit is contained in:
@@ -1677,6 +1677,8 @@ src/libslic3r/GCodeWriter.cpp
|
||||
src/libslic3r/GCodeWriter.hpp
|
||||
src/libslic3r/Geometry.cpp
|
||||
src/libslic3r/Geometry.hpp
|
||||
src/libslic3r/GUI/3DScene.cpp
|
||||
src/libslic3r/GUI/3DScene.hpp
|
||||
src/libslic3r/Layer.cpp
|
||||
src/libslic3r/Layer.hpp
|
||||
src/libslic3r/LayerRegion.cpp
|
||||
@@ -1765,6 +1767,7 @@ xsp/Flow.xsp
|
||||
xsp/GCodeSender.xsp
|
||||
xsp/GCodeWriter.xsp
|
||||
xsp/Geometry.xsp
|
||||
xsp/GUI_3DScene.xsp
|
||||
xsp/Layer.xsp
|
||||
xsp/Line.xsp
|
||||
xsp/Model.xsp
|
||||
|
||||
Reference in New Issue
Block a user