mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-10 17:21:10 +00:00
Resolves two conflicts: - GLCanvas3D.hpp: keep both the IMEX ghost render declarations and upstream's _render_wireframe_overlay(). - test_gcodewriter.cpp: both sides appended test cases to the same region; keep upstream's origin/machine-limit tests alongside the pressure-advance and temperature scenarios.