Merge remote-tracking branch 'upstream/main' into dev/h2d

Browse Source

# Conflicts:
#	resources/profiles/BBL.json
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/MediaFilePanel.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/StatusPanel.cpp

...

This commit is contained in:

Noisyfox

2025-09-16 11:27:44 +08:00

parent e7e6405ad3 1e87666487

commit 2375ab860a

6267 changed files with 210560 additions and 178856 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

6382

resources/profiles/BBL.json

File diff suppressed because it is too large Load Diff