Merge remote-tracking branch 'upstream/main' into haryr/aug25-rebase

Browse Source

# Conflicts:
#	src/libslic3r/GCode/ToolOrdering.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintApply.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/slic3r/GUI/Tab.cpp

...

This commit is contained in:

harrierpigeon

2026-08-30 23:30:51 -05:00

parent a7bc054974 265ae16160

commit e341a9b84e

110 changed files with 38067 additions and 306 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

14705

resources/filament_mixing/standard_color_recipes.json Normal file

File diff suppressed because it is too large Load Diff