Merge branch 'merge-upstream'

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

View file

@ -1,10 +1,10 @@
{
"name": "Bambu ASA @BBL X1 0.2 nozzle",
"type": "filament",
"instantiation": "true",
"from": "system",
"name": "Bambu ASA @BBL X1 0.2 nozzle",
"inherits": "Bambu ASA @base",
"from": "system",
"setting_id": "GFSB01_03",
"instantiation": "true",
"fan_max_speed": [
"80"
],
@ -13,6 +13,5 @@
],
"compatible_printers": [
"Bambu Lab X1 0.2 nozzle"
],
"version": "01.07.00.18"
]
}