mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-11 01:41:03 +00:00
Merge upstream, including deterministic painted multi-material slicing
Seven commits: painted multi-material segmentation made deterministic, missing includes added across src/slic3r/GUI, U1 high-flow nozzle variants, Windows ARM64 build and HTTPS fixes, and a rule added to the wxWidgets agent skill. Three conflicts, all include lists: upstream's include pass and ours each added to the same lists in GCodeViewer.hpp, PartPlate.hpp and PartPlate.cpp. Resolved as the union of both. Three includes both sides had added at different places, which git kept twice, are kept once: Color.hpp and <set> in PartPlate.cpp, <sstream> in Plater.cpp. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -16,6 +16,27 @@
|
||||
#include "slic3r/plugin/PluginManager.hpp"
|
||||
|
||||
#include "libnest2d/common.hpp"
|
||||
#include "libslic3r/Arrange.hpp"
|
||||
#include <utility>
|
||||
#include "libslic3r/Point.hpp"
|
||||
#include "libslic3r/Polygon.hpp"
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <cstddef>
|
||||
#include <vector>
|
||||
#include "slic3r/GUI/Selection.hpp"
|
||||
#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
|
||||
#include <set>
|
||||
#include <algorithm>
|
||||
#include "libslic3r/PrintConfig.hpp"
|
||||
#include <map>
|
||||
#include <cassert>
|
||||
#include "slic3r/GUI/Jobs/Job.hpp"
|
||||
#include "libslic3r/ExPolygon.hpp"
|
||||
#include "libslic3r/libslic3r.h"
|
||||
#include <numeric>
|
||||
#include <exception>
|
||||
#include "libslic3r/LifecycleEvents.hpp"
|
||||
#include <optional>
|
||||
|
||||
#define SAVE_ARRANGE_POLY 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user