Merge branch 'merge-upstream'

Browse Source

Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp

...

This commit is contained in:

SoftFever

2023-09-30 08:44:32 +08:00

parent 7a7187f9ed 4fd2177625

commit 59bab91da9

579 changed files with 23269 additions and 11097 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

14

resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json

File diff suppressed because one or more lines are too long