Merge branch 'main' into dev/h2d-2

Browse Source

# Conflicts:
#	src/slic3r/GUI/Preferences.cpp

...

This commit is contained in:

Noisyfox committed 2025-10-15 19:43:14 +08:00

2 parents be18ff3c6f 0493ed03a5

commit 6f36556eaa

24 files changed

+1238 -1026

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

No files matched your search

src/slic3r/GUI/Preferences.cpp

+615 -665

File diff suppressed because it is too large. Load diff