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 @@
{
"type": "filament",
"setting_id": "GFSG50_02",
"name": "Bambu PETG-CF @BBL X1C 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PETG-CF @base",
"from": "system",
"setting_id": "GFSG50_02",
"instantiation": "true",
"filament_max_volumetric_speed": [
"13"
],
@ -12,6 +12,5 @@
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab P1S 0.4 nozzle"
],
"version": "01.07.00.18"
]
}