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": "GFSA04",
|
||||
"name": "Bambu PLA Basic @BBL X1",
|
||||
"from": "system",
|
||||
"instantiation": "true",
|
||||
"inherits": "Bambu PLA Basic @base",
|
||||
"from": "system",
|
||||
"setting_id": "GFSA04",
|
||||
"instantiation": "true",
|
||||
"filament_max_volumetric_speed": [
|
||||
"21"
|
||||
],
|
||||
@@ -15,6 +15,5 @@
|
||||
"Bambu Lab X1 0.4 nozzle",
|
||||
"Bambu Lab X1 0.6 nozzle",
|
||||
"Bambu Lab X1 0.8 nozzle"
|
||||
],
|
||||
"version": "01.07.00.18"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user