mirror of
https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git
synced 2025-07-15 16:51:48 +08:00

# "resolved" Conflicts: # lib/Slic3r/GUI/Plater.pm # lib/Slic3r/GUI/Plater/2DToolpaths.pm # lib/Slic3r/GUI/Plater/ObjectCutDialog.pm # lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm # lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm # lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm # src/libslic3r/EdgeGrid.cpp # src/libslic3r/EdgeGrid.hpp # src/libslic3r/ExPolygon.cpp # src/libslic3r/ExtrusionEntity.hpp # src/libslic3r/ExtrusionEntityCollection.hpp # src/libslic3r/Fill/Fill.cpp # src/libslic3r/Fill/FillBase.cpp # src/libslic3r/Flow.cpp # src/libslic3r/GCode.cpp # src/libslic3r/GCode/ToolOrdering.cpp # src/libslic3r/GCode/WipeTowerPrusaMM.cpp # src/libslic3r/Geometry.cpp # src/libslic3r/LayerRegion.cpp # src/libslic3r/Model.cpp # src/libslic3r/MultiPoint.cpp # src/libslic3r/MultiPoint.hpp # src/libslic3r/PerimeterGenerator.cpp # src/libslic3r/PerimeterGenerator.hpp # src/libslic3r/Polyline.cpp # src/libslic3r/Polyline.hpp # src/libslic3r/Print.cpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp # src/libslic3r/PrintObject.cpp # src/libslic3r/SupportMaterial.cpp # src/libslic3r/TriangleMesh.cpp # src/libslic3r/TriangleMesh.hpp # src/libslic3r/Utils.hpp # src/libslic3r/utils.cpp # src/slic3r/AppController.hpp # src/slic3r/AppControllerWx.cpp # src/slic3r/GUI/3DScene.cpp # src/slic3r/GUI/GUI.cpp # src/slic3r/GUI/GUI.hpp # src/slic3r/GUI/Preset.cpp # src/slic3r/GUI/ProgressIndicator.hpp # src/slic3r/GUI/Tab.hpp # xs/CMakeLists.txt # xs/src/libslic3r/Layer.hpp # xs/src/libslic3r/Line.cpp # xs/src/libslic3r/Line.hpp # xs/src/libslic3r/Point.hpp # xs/src/libslic3r/Print.hpp # xs/src/libslic3r/PrintRegion.cpp # xs/src/slic3r/AppController.cpp # xs/xsp/AppController.xsp # xs/xsp/GUI.xsp # xs/xsp/Print.xsp