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:
Clifford GarwoodandClaude Opus 5.5 committed 2026-10-02 08:22:47 -04:00
commit e8cd4be675
883 files changed
+15897 -359

No files matched your search

+102 -1
View File
@@ -1,17 +1,96 @@
#include "Plater.hpp"
#include "../Utils/NetworkAgent.hpp"
#include "IPrinterAgent.hpp"
#include "CalibUtils.hpp"
#include "Flashforge.hpp"
#include "libslic3r/Config.hpp"
#include "libslic3r_version.h"
#include <boost/optional/optional.hpp>
#include <cmath>
#include <boost/algorithm/string/join.hpp>
#include <cassert>
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <climits>
#include <array>
#include <boost/filesystem/fstream.hpp>
#include <clocale>
#include <cstddef>
#include <algorithm>
#include <ios>
#include <iomanip>
#include <cstring>
#include <map>
#include <exception>
#include <functional>
#include <memory>
#include <initializer_list>
#include <cstdint>
#include <cstdlib>
#include "libslic3r/CommonDefs.hpp"
#include "libslic3r/TriangleSelector.hpp"
#include <cstdio>
#include "libslic3r/LocalesUtils.hpp"
#include "libslic3r/FlushVolCalc.hpp"
#include "libslic3r/Point.hpp"
#include "libslic3r/GCode/GCodeProcessor.hpp"
#include "libslic3r/Technologies.hpp"
#include "libslic3r/BoundingBox.hpp"
#include "libslic3r/PrintBase.hpp"
#include "libslic3r/Preset.hpp"
#include <fstream>
#include "libslic3r/calib.hpp"
#include <iterator>
#include "libslic3r/Format/OBJ.hpp"
#include "libslic3r/Geometry.hpp"
#include "libslic3r/Arrange.hpp"
#include "libslic3r/MultiNozzleUtils.hpp"
#include "libslic3r/Color.hpp"
#include <miniz.h>
#include "libslic3r/Exception.hpp"
#include "libslic3r/AppConfig.hpp"
#include "libslic3r/CSGMesh/CSGMesh.hpp"
#include "libslic3r/format.hpp"
#include "libslic3r/MeshBoolean.hpp"
#include <numeric>
#include <limits>
#include <sstream>
#include <optional>
#include "slic3r/GUI/Event.hpp"
#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
#include "slic3r/GUI/Widgets/StateColor.hpp"
#include "slic3r/GUI/Widgets/AMSItem.hpp"
#include "slic3r/GUI/Search.hpp"
#include "slic3r/GUI/ObjectDataViewModel.hpp"
#include "slic3r/GUI/Field.hpp"
#include "slic3r/GUI/Widgets/PopupWindow.hpp"
#include <set>
#include "slic3r/GUI/Widgets/StaticLine.hpp"
#include "slic3r/GUI/GUI_ObjectSettings.hpp"
#include "slic3r/GUI/ColorDecomposeDialog.hpp"
#include "slic3r/GUI/SettingsIndex.hpp"
#include "slic3r/GUI/Jobs/Job.hpp"
#include "slic3r/GUI/ParamsPanel.hpp"
#include "slic3r/GUI/SceneRaycaster.hpp"
#include "slic3r/GUI/PrinterWebView.hpp"
#include "slic3r/GUI/ReleaseNote.hpp"
#include "slic3r/GUI/Jobs/Worker.hpp"
#include "slic3r/GUI/UnsavedChangesDialog.hpp"
#include "slic3r/GUI/Printer/PrinterFileSystem.h"
#include "slic3r/GUI/GUI_Geometry.hpp"
#include "slic3r/GUI/Widgets/DialogButtons.hpp"
#include "slic3r/GUI/PrintOptionsDialog.hpp"
#include "slic3r/GUI/CalibrationPanel.hpp"
#include "slic3r/GUI/CalibrationWizard.hpp"
#include "slic3r/GUI/Monitor.hpp"
#include <slic3r/plugin/PluginDescriptor.hpp>
#include <slic3r/plugin/PluginManager.hpp>
#include <slic3r/plugin/PluginResolver.hpp>
#include <utility>
#include <sstream>
#include <unordered_map>
#include <unordered_set>
#include <vector>
#include <string>
#include <regex>
@@ -28,8 +107,25 @@
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
#include <wx/colour.h>
#include <wx/aui/framemanager.h>
#include <wx/gdicmn.h>
#include <wx/anybutton.h>
#include <wx/dcclient.h>
#include <wx/dcbuffer.h>
#include <wx/chartype.h>
#include <wx/busycursor.h>
#include <wx/app.h>
#include <wx/aui/floatpane.h>
#include <wx/bookctrl.h>
#include <wx/dataview.h>
#include <wx/dirdlg.h>
#include <wx/msgdlg.h>
#include <wx/settings.h>
#include <wx/scrolwin.h>
#include <wx/notebook.h>
#include <wx/sizer.h>
#include <wx/spinctrl.h>
#include <wx/stattext.h>
#include <wx/button.h>
#include <wx/bmpcbox.h>
@@ -39,7 +135,12 @@
#include <wx/filedlg.h>
#include <wx/dnd.h>
#include <wx/progdlg.h>
#include <wx/strconv.h>
#include <wx/string.h>
#include <wx/types.h>
#include <wx/utils.h>
#include <wx/toplevel.h>
#include <wx/tglbtn.h>
#include <wx/wupdlock.h>
#include <wx/numdlg.h>
#include <wx/debug.h>