3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-19 14:51:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'merge-upstream'

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

9
resources/profiles/BBL/filament/Bambu PLA Marble @BBL X1C.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSA07_00",
"name": "Bambu PLA Marble @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Marble @base",
"from": "system",
"setting_id": "GFSA07_00",
"instantiation": "true",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
@ -12,6 +12,5 @@
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle"
],
"version": "01.07.00.18"
]
}