mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-20 09:22:13 +00:00
Merge branch 'main' into dev/h2d-2
# Conflicts: # src/slic3r/GUI/Preferences.cpp
This commit is contained in:
# Conflicts: # src/slic3r/GUI/Preferences.cpp