juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 20:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 7a7187f9ed 4fd2177625
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/Generic ASA.json
View File

@@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSB98",
"name": "Generic ASA",
"from": "system",
"instantiation": "true",
"inherits": "Generic ASA @base",
"from": "system",
"setting_id": "GFSB98",
"instantiation": "true",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle",
@@ -15,6 +15,5 @@
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle"
],
"version": "01.07.00.18"
]
}