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,13 +1,13 @@
{
"type": "filament",
"name": "Generic PA-CF @BBL P1P",
"inherits": "fdm_filament_pa",
"from": "system",
"filament_id": "GFN98",
"setting_id": "GFSN99_10",
"name": "Generic PA-CF @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pa",
"filament_type": [
"PA-CF"
"fan_cooling_layer_time": [
"5"
],
"fan_max_speed": [
"30"
@ -15,22 +15,21 @@
"fan_min_speed": [
"10"
],
"overhang_fan_threshold": [
"0%"
"filament_type": [
"PA-CF"
],
"full_fan_speed_layer": [
"2"
],
"overhang_fan_speed": [
"40"
],
"fan_cooling_layer_time": [
"5"
],
"full_fan_speed_layer": [
"2"
"overhang_fan_threshold": [
"0%"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
],
"version": "01.07.00.18"
]
}