Merge conflicts detected syncing main@f4224e9

The automatic merge of upstream main@f4224e9 into orca-latest-parity-bambu produced conflicts.

Conflicted files

src/slic3r/GUI/MainFrame.cpp

Helio-relevant upstream changes

• src/slic3r/GUI/Plater.cpp: 1 file changed, 204 insertions(+), 2190 deletions(-)
• src/slic3r/GUI/Plater.hpp: 1 file changed, 2 insertions(+), 29 deletions(-)
• src/slic3r/GUI/MainFrame.cpp: 1 file changed, 178 insertions(+), 220 deletions(-)
• src/slic3r/GUI/MainFrame.hpp: 1 file changed, 9 insertions(+), 8 deletions(-)
• src/slic3r/GUI/GCodeViewer.cpp: 1 file changed, 25 insertions(+), 212 deletions(-)
• src/slic3r/GUI/NotificationManager.cpp: 1 file changed, 9 insertions(+), 59 deletions(-)
• src/slic3r/GUI/NotificationManager.hpp: 1 file changed, 2 insertions(+), 6 deletions(-)
• src/slic3r/GUI/PartPlate.hpp: 1 file changed, 1 insertion(+), 21 deletions(-)
• src/slic3r/GUI/PartPlate.cpp: 1 file changed, 110 insertions(+), 86 deletions(-)
• src/slic3r/GUI/GUI_App.cpp: 1 file changed, 119 insertions(+), 105 deletions(-)
• src/slic3r/GUI/GUI_App.hpp: 1 file changed, 2 insertions(+), 6 deletions(-)
• src/slic3r/GUI/Preferences.cpp: 1 file changed, 40 insertions(+), 76 deletions(-)
• src/slic3r/GUI/BackgroundSlicingProcess.hpp: 1 file changed, 25 deletions(-)
• src/slic3r/GUI/Widgets/SwitchButton.cpp: 1 file changed, 469 deletions(-)
• src/slic3r/GUI/Widgets/SwitchButton.hpp: 1 file changed, 96 deletions(-)
• src/slic3r/GUI/Widgets/TextInput.cpp: 1 file changed, 68 deletions(-)
• src/slic3r/GUI/Widgets/TextInput.hpp: 1 file changed, 63 deletions(-)
• src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp: 1 file changed, 4 insertions(+), 4 deletions(-)
• src/slic3r/CMakeLists.txt: 1 file changed, 1 insertion(+), 10 deletions(-)
• src/libslic3r/AppConfig.cpp: 1 file changed, 25 deletions(-)
• src/libslic3r/PrintBase.hpp: 1 file changed, 1 deletion(-)
• src/libslic3r/PrintConfig.cpp: 1 file changed, 70 insertions(+), 72 deletions(-)
• src/libslic3r/GCode/GCodeProcessor.cpp: 1 file changed, 51 deletions(-)
• src/libslic3r/GCode/GCodeProcessor.hpp: 1 file changed, 11 deletions(-)
• src/libvgcode/include/PathVertex.hpp: 1 file changed, 6 deletions(-)
• src/libvgcode/include/Types.hpp: 1 file changed, 4 deletions(-)
• src/libvgcode/src/ViewerImpl.cpp: 1 file changed, 10 insertions(+), 63 deletions(-)
• src/libvgcode/src/ViewerImpl.hpp: 1 file changed, 4 deletions(-)
• src/slic3r/GUI/GLCanvas3D.cpp: 1 file changed, 16 insertions(+), 35 deletions(-)
• src/slic3r/GUI/GLToolbar.cpp: 1 file changed, 1 deletion(-)
• src/slic3r/GUI/GLToolbar.hpp: 1 file changed, 1 deletion(-)
• src/slic3r/GUI/Selection.cpp: 1 file changed, 1 insertion(+), 3 deletions(-)

Resolution steps

1. Pull the sync branch and fetch upstream:

   git fetch origin && git checkout helio-upstream-main-2026-03-23-f4224e9
   git remote add upstream https://github.com/SoftFever/OrcaSlicer.git 2>/dev/null || true
   git fetch upstream && git merge f4224e97801a588595cbfe7227e977111e0fbff2

2. Resolve conflicts (use HELIO_INTEGRATION.md as reference):

   claude "Read HELIO_INTEGRATION.md then fix the merge conflicts. Preserve all Helio code."

3. Push fixes — the PR will be created on the next workflow run, or create one manually.

See HELIO_INTEGRATION.md for detailed conflict resolution rules.