mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-21 12:15:21 +00:00
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:
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"type": "filament",
|
||||
"setting_id": "GFSC99_04",
|
||||
"name": "Generic PC @BBL P1S",
|
||||
"from": "system",
|
||||
"instantiation": "true",
|
||||
"inherits": "Generic PC",
|
||||
"from": "system",
|
||||
"setting_id": "GFSC99_04",
|
||||
"instantiation": "true",
|
||||
"eng_plate_temp": [
|
||||
"100"
|
||||
],
|
||||
@@ -27,6 +27,5 @@
|
||||
"Bambu Lab P1S 0.4 nozzle",
|
||||
"Bambu Lab P1S 0.6 nozzle",
|
||||
"Bambu Lab P1S 0.8 nozzle"
|
||||
],
|
||||
"version": "01.07.00.18"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user