mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-10 17:21:10 +00:00
Conflicts were all co-located additions rather than design collisions: - GCode.cpp: adopt upstream's toolchange(filament_id, nozzle_id) signature and per-variant set_config_index() while keeping the IMEX bare-T<n> suppression; rebase the second-layer temperature loop's non-IMEX branch onto upstream's get_filament_config_index() resolution. - Preset.cpp / PresetBundle.cpp / PrintConfig.cpp: keep both sides' option-list and enum-map entries. - GLCanvas3D.cpp: upstream's printable_heights argument plus the IMEX ghost pass. - PartPlate.cpp: keep <set> (still used). - test_gcodewriter.cpp / test_3mf.cpp: keep both sides' test cases.