mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-10 17:21:10 +00:00
138 commits. The count is large because texture displacement merged with its whole branch history behind it, going back to July, alongside config and preset file locking across instances, a foundation for configurable printer agent connections, and a day of smaller fixes and CI work. Two conflicts, both the same shape: each side had appended to a sorted list and git could not choose an order. libslic3r's CMakeLists gained InstanceLock alongside our IMEXHelpers and IMEXZones, and the preset bundle loading test gained an include for ParallelResolve alongside ours for IMEXHelpers. Both sides kept, alphabetical. No logic conflicted. Verified: 740 targets build clean under -Werror, and the Release suite passes 1740 of 1740, up from 1665 -- the 75 new cases arrived with the merge and all pass. That mattered more than usual here, since preset loading and config locking are both areas the IMEX preset code touches. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>