mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-19 14:51:11 -06: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:
commit
59bab91da9
579 changed files with 23269 additions and 11097 deletions
|
@ -1,10 +1,13 @@
|
|||
{
|
||||
"name": "Bambu PLA Aero @BBL X1",
|
||||
"type": "filament",
|
||||
"instantiation": "true",
|
||||
"from": "system",
|
||||
"name": "Bambu PLA Aero @BBL X1",
|
||||
"inherits": "Bambu PLA Aero @base",
|
||||
"from": "system",
|
||||
"setting_id": "GFSA11_00",
|
||||
"instantiation": "true",
|
||||
"additional_cooling_fan_speed": [
|
||||
"0"
|
||||
],
|
||||
"slow_down_layer_time": [
|
||||
"8"
|
||||
],
|
||||
|
@ -12,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"
|
||||
]
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue