Merge remote-tracking branch 'remote/v1.6.0'

Browse Source

# Conflicts:
#	.github/workflows/build_ubuntu.yml
#	src/libslic3r/Print.cpp
#	version.inc

...

This commit is contained in:

SoftFever

2023-07-07 00:38:54 +08:00

parent 93b8d7aeff b953fd0b4d

commit bdf8c8d5b1

48 changed files with 1465 additions and 2272 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

2

resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json

File diff suppressed because one or more lines are too long

2

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

File diff suppressed because one or more lines are too long

2

resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json

File diff suppressed because one or more lines are too long

2

resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json

File diff suppressed because one or more lines are too long

2

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

File diff suppressed because one or more lines are too long

2

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

File diff suppressed because one or more lines are too long

2

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

File diff suppressed because one or more lines are too long

2

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

File diff suppressed because one or more lines are too long

2

resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json

File diff suppressed because one or more lines are too long

2

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

File diff suppressed because one or more lines are too long

2

resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json

File diff suppressed because one or more lines are too long

2

resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json

File diff suppressed because one or more lines are too long