Merge remote-tracking branch 'upstream/main' into libvgcode

Browse Source

# Conflicts:
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCode/GCodeProcessor.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GLCanvas3D.hpp
#	src/slic3r/GUI/GUI_Preview.cpp

...

This commit is contained in:

Andrew Sun

2025-11-09 18:48:04 -05:00

parent fd22fc9131 4501bf6f57

commit 7814605906

2978 changed files with 1208720 additions and 66304 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3251

src/libslic3r/GCode/GCodeProcessor.cpp

File diff suppressed because it is too large Load Diff