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,16 @@
{
"type": "filament",
"setting_id": "GFSA02_11",
"name": "Bambu PLA Metal @BBL P1P 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"from": "system",
"setting_id": "GFSA02_11",
"instantiation": "true",
"fan_cooling_layer_time": [
"80"
],
"fan_min_speed": [
"50"
],
"filament_max_volumetric_speed": [
"2"
],
@ -20,14 +26,7 @@
"textured_plate_temp_initial_layer": [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"compatible_printers": [
"Bambu Lab P1P 0.2 nozzle"
],
"version": "01.07.00.18"
]
}