mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-11 01:41:03 +00:00
Four files overlapped, and each resolution favours upstream where the two sides had done the same work: WipeTower's M104/M109 tool qualifier. Both sides bounds-checked the physical extruder map lookup; upstream omits the T qualifier when the map cannot answer, where this branch fell back to the logical index and so named a carriage that may not be the one printing. Upstream's behaviour is what this branch documents elsewhere, so its version is taken and the local helper is dropped. get_extruders' mixed-slot switch. Upstream added the same concept to the CLI overload as expand_mixed_slots, so the GUI overloads' parameter is renamed to match rather than carrying two names for one idea. GLCanvas3D's sequential-clearance branch gains upstream's update_compacted_wipe_tower_clearance for the by-layer case. The printer_agent re-sync in TabPrinter::reload_config was upstream's and their preset-undo fix removed it, so it goes; the IMEX modes grid re-sync beside it stays, since it spans three options and is not a Field. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
OrcaSlicer tests
Building, running and writing tests is documented on the wiki, under How to Test.
Two files here rather than there, because coding agents only read what is in the repository: