mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-29 11:51:24 +00:00
Merge upstream/main into cad-mainline (530 commits)
Catches the fork up from449a4cf9fc(2026-06-28) tod6cb667b89(2026-07-24). Upstream touched 2326 files; 17 of them overlap the 164 this branch touches. 16 of the 17 auto-merged, including all three CMakeLists.txt, the build_all.yml CI workflow, and every GUI file. The CAD core never conflicts: CadDocument, SketchEngine, SketchSolver, McpControl and test_caddocument are files this fork adds, so upstream does not touch them. The one conflict, tests/libslic3r/test_3mf.cpp, was purely additive in all three hunks and is resolved as a union: our test pinning that store_bbs_3mf embeds the CAD recipe as Metadata/SnapOrca_cad.bin, upstream's multi-nozzle plate-metadata round-trip tests, and both sets of includes. All three were verified present after resolution rather than assumed. NOT BUILD-VERIFIED, for a reason that predates this merge and is not caused by it: this fork cannot be configured on nativedev at all. Its CMakeLists has required Eigen3 5.0.1 since before the merge (line 592 pre-merge), while the only deps image on the machine is snaporca-deps, built for snaporca's find_package(Eigen3 3.3). CMake fails at configure, so nothing compiles. That means this fork's Catch2 suite has never run. Every "suite green" figure recorded for M1-M8 was snaporca's suite; the ports were verified by patch-apply plus the CAD sources being byte-identical to snaporca's. Building an orca_cad deps image with Eigen 5.0.1 is what would finally close that gap. Pre-merge state is preserved at branch cad-mainline-pre-upstream-2026-07-25 (30d54f0074). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
+1974
-429
File diff suppressed because it is too large
Load Diff
+2202
-509
File diff suppressed because it is too large
Load Diff
+2182
-501
File diff suppressed because it is too large
Load Diff
+2320
-545
File diff suppressed because it is too large
Load Diff
+1975
-430
File diff suppressed because it is too large
Load Diff
+2632
-1185
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+2371
-545
File diff suppressed because it is too large
Load Diff
+2206
-504
File diff suppressed because it is too large
Load Diff
+2229
-533
File diff suppressed because it is too large
Load Diff
+2169
-494
File diff suppressed because it is too large
Load Diff
+2158
-493
File diff suppressed because it is too large
Load Diff
@@ -41,12 +41,23 @@ src/slic3r/GUI/DeviceCore/DevMapping.h
|
||||
src/slic3r/GUI/DeviceCore/DevMapping.cpp
|
||||
src/slic3r/GUI/DeviceCore/DevNozzleSystem.h
|
||||
src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp
|
||||
src/slic3r/GUI/DeviceCore/DevNozzleRack.h
|
||||
src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp
|
||||
src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp
|
||||
src/slic3r/GUI/DeviceCore/DevUtil.h
|
||||
src/slic3r/GUI/DeviceCore/DevUtil.cpp
|
||||
src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h
|
||||
src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
|
||||
src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h
|
||||
src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp
|
||||
src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h
|
||||
src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp
|
||||
src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.h
|
||||
src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.cpp
|
||||
src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h
|
||||
src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp
|
||||
src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h
|
||||
src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp
|
||||
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
|
||||
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
|
||||
src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
|
||||
@@ -97,6 +108,8 @@ src/slic3r/GUI/Widgets/FilamentLoad.cpp
|
||||
src/slic3r/GUI/Widgets/TempInput.cpp
|
||||
src/slic3r/GUI/Widgets/CheckList.cpp
|
||||
src/slic3r/GUI/Widgets/SwitchButton.cpp
|
||||
src/slic3r/GUI/Widgets/MultiNozzleSync.cpp
|
||||
src/slic3r/GUI/Widgets/ProgressDialog.cpp
|
||||
src/slic3r/GUI/ImGuiWrapper.cpp
|
||||
src/slic3r/GUI/Jobs/ArrangeJob.cpp
|
||||
src/slic3r/GUI/Jobs/OrientJob.cpp
|
||||
@@ -227,11 +240,14 @@ src/slic3r/GUI/CreatePresetsDialog.cpp
|
||||
src/slic3r/GUI/DailyTips.cpp
|
||||
src/slic3r/Utils/CalibUtils.cpp
|
||||
src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
||||
src/slic3r/GUI/CrealityDiscoveryDialog.cpp
|
||||
src/slic3r/GUI/TroubleshootDialog.cpp
|
||||
src/slic3r/Utils/3DPrinterOS.cpp
|
||||
src/slic3r/Utils/AstroBox.cpp
|
||||
src/slic3r/Utils/Duet.cpp
|
||||
src/slic3r/Utils/FlashAir.cpp
|
||||
src/slic3r/Utils/MKS.cpp
|
||||
src/slic3r/Utils/Moonraker.cpp
|
||||
src/slic3r/Utils/OctoPrint.cpp
|
||||
src/slic3r/Utils/Repetier.cpp
|
||||
src/slic3r/Utils/ProfileDescription.hpp
|
||||
@@ -271,4 +287,6 @@ src/slic3r/GUI/DownloaderFileGet.cpp
|
||||
src/slic3r/GUI/FileArchiveDialog.cpp
|
||||
src/slic3r/GUI/PrinterCloudAuthDialog.cpp
|
||||
src/slic3r/GUI/PrinterWebViewHandler.cpp
|
||||
src/slic3r/GUI/AMSDryControl.cpp
|
||||
src/slic3r/GUI/AMSDryControl.hpp
|
||||
src/libslic3r/PresetBundle.cpp
|
||||
|
||||
+6994
-5404
File diff suppressed because it is too large
Load Diff
+2076
-472
File diff suppressed because it is too large
Load Diff
+2171
-502
File diff suppressed because it is too large
Load Diff
+2628
-1060
File diff suppressed because it is too large
Load Diff
+3280
-1157
File diff suppressed because it is too large
Load Diff
+2077
-469
File diff suppressed because it is too large
Load Diff
+2326
-556
File diff suppressed because it is too large
Load Diff
+2211
-517
File diff suppressed because it is too large
Load Diff
+3480
-1775
File diff suppressed because it is too large
Load Diff
+2109
-476
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+3097
-1313
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user