Merge remote-tracking branch 'upstream/main'

Browse Source

# Conflicts:
#	src/libslic3r/Preset.cpp

...

This commit is contained in:

Clifford Garwood

2026-05-02 01:17:02 -04:00

parent 6c7bd484db e66ec7fd70

commit 493a9e96d2

168 changed files with 11213 additions and 4000 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

src/libslic3r/PresetBundle.cpp

+817 -33

File diff suppressed because it is too large Load Diff