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": "GFSC99_01",
"name": "Generic PC @BBL P1P 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic PC @base",
"from": "system",
"setting_id": "GFSC99_01",
"instantiation": "true",
"eng_plate_temp": [
"100"
],
@ -34,6 +34,5 @@
],
"compatible_printers": [
"Bambu Lab P1P 0.2 nozzle"
],
"version": "01.07.00.18"
]
}