juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-16 05:27:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
cochcoder
2024-04-30 13:04:15 -04:00
parent 8892448fcb
commit bf180990c1
1 changed files with 1352 additions and 1356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/profiles/Creality.json
+45 -49
View File
@@ -41,7 +41,7 @@
"sub_path": "machine/Creality Ender-3.json" "sub_path": "machine/Creality Ender-3.json"
}, },
{ {
"name":"Creality Ender-3 Pro", "name": "Creality Ender-3 Pro",
"sub_path": "machine/Creality Ender-3 Pro.json" "sub_path": "machine/Creality Ender-3 Pro.json"
}, },
{ {
@@ -60,6 +60,10 @@
"name": "Creality Ender-3 V3 KE", "name": "Creality Ender-3 V3 KE",
"sub_path": "machine/Creality Ender-3 V3 KE.json" "sub_path": "machine/Creality Ender-3 V3 KE.json"
}, },
{
"name": "Creality Ender-3 V3",
"sub_path": "machine/Creality Ender-3 V3.json"
},
{ {
"name": "Creality Ender-5", "name": "Creality Ender-5",
"sub_path": "machine/Creality Ender-5.json" "sub_path": "machine/Creality Ender-5.json"
@@ -282,22 +286,6 @@
"name": "0.12mm Detail @Creality CR-6 0.4", "name": "0.12mm Detail @Creality CR-6 0.4",
"sub_path": "process/0.12mm Detail @Creality CR-6 0.4.json" "sub_path": "process/0.12mm Detail @Creality CR-6 0.4.json"
}, },
{
"name": "0.12mm Fine @Creality CR10SE 0.2",
"sub_path": "process/0.12mm Fine @Creality CR10SE 0.2.json"
},
{
"name": "0.12mm Fine @Creality CR10SE 0.4",
"sub_path": "process/0.12mm Fine @Creality CR10SE 0.4.json"
},
{
"name": "0.12mm Fine @Creality CR10SE 0.6",
"sub_path": "process/0.12mm Fine @Creality CR10SE 0.6.json"
},
{
"name": "0.12mm Fine @Creality CR10SE 0.8",
"sub_path": "process/0.12mm Fine @Creality CR10SE 0.8.json"
},
{ {
"name": "0.12mm Fine @Creality Ender3V2", "name": "0.12mm Fine @Creality Ender3V2",
"sub_path": "process/0.12mm Fine @Creality Ender3V2.json" "sub_path": "process/0.12mm Fine @Creality Ender3V2.json"
@@ -326,6 +314,10 @@
"name": "0.12mm Fine @Creality Ender3V3SE 0.8", "name": "0.12mm Fine @Creality Ender3V3SE 0.8",
"sub_path": "process/0.12mm Fine @Creality Ender3V3SE 0.8.json" "sub_path": "process/0.12mm Fine @Creality Ender3V3SE 0.8.json"
}, },
{
"name": "0.12mm Fine @Creality Ender3V3",
"sub_path": "process/0.12mm Fine @Creality Ender3V3 0.4 nozzle.json"
},
{ {
"name": "0.12mm Detail @Creality Ender5Pro (2019) 0.2", "name": "0.12mm Detail @Creality Ender5Pro (2019) 0.2",
"sub_path": "process/0.12mm Detail @Creality Ender5Pro (2019) 0.2.json" "sub_path": "process/0.12mm Detail @Creality Ender5Pro (2019) 0.2.json"
@@ -366,22 +358,6 @@
"name": "0.15mm Optimal @Creality CR10Max", "name": "0.15mm Optimal @Creality CR10Max",
"sub_path": "process/0.15mm Optimal @Creality CR10Max.json" "sub_path": "process/0.15mm Optimal @Creality CR10Max.json"
}, },
{
"name": "0.16mm Optimal @Creality CR10SE 0.2",
"sub_path": "process/0.16mm Optimal @Creality CR10SE 0.2.json"
},
{
"name": "0.16mm Optimal @Creality CR10SE 0.4",
"sub_path": "process/0.16mm Optimal @Creality CR10SE 0.4.json"
},
{
"name": "0.16mm Optimal @Creality CR10SE 0.6",
"sub_path": "process/0.16mm Optimal @Creality CR10SE 0.6.json"
},
{
"name": "0.16mm Optimal @Creality CR10SE 0.8",
"sub_path": "process/0.16mm Optimal @Creality CR10SE 0.8.json"
},
{ {
"name": "0.15mm Optimal @Creality Ender3V2", "name": "0.15mm Optimal @Creality Ender3V2",
"sub_path": "process/0.15mm Optimal @Creality Ender3V2.json" "sub_path": "process/0.15mm Optimal @Creality Ender3V2.json"
@@ -450,6 +426,10 @@
"name": "0.16mm Optimal @Creality Ender3V3SE 0.8", "name": "0.16mm Optimal @Creality Ender3V3SE 0.8",
"sub_path": "process/0.16mm Optimal @Creality Ender3V3SE 0.8.json" "sub_path": "process/0.16mm Optimal @Creality Ender3V3SE 0.8.json"
}, },
{
"name": "0.16mm Optimal @Creality Ender3V3",
"sub_path": "process/0.16mm Optimal @Creality Ender3V3 0.4 nozzle.json"
},
{ {
"name": "0.16mm Optimal @Creality Ender5", "name": "0.16mm Optimal @Creality Ender5",
"sub_path": "process/0.16mm Optimal @Creality Ender5.json" "sub_path": "process/0.16mm Optimal @Creality Ender5.json"
@@ -610,6 +590,10 @@
"name": "0.20mm Standard @Creality Ender3V3SE 0.8", "name": "0.20mm Standard @Creality Ender3V3SE 0.8",
"sub_path": "process/0.20mm Standard @Creality Ender3V3SE 0.8.json" "sub_path": "process/0.20mm Standard @Creality Ender3V3SE 0.8.json"
}, },
{
"name": "0.20mm Standard @Creality Ender3V3",
"sub_path": "process/0.20mm Standard @Creality Ender3V3 0.4 nozzle.json"
},
{ {
"name": "0.20mm Standard @Creality Ender5", "name": "0.20mm Standard @Creality Ender5",
"sub_path": "process/0.20mm Standard @Creality Ender5.json" "sub_path": "process/0.20mm Standard @Creality Ender5.json"
@@ -698,22 +682,6 @@
"name": "0.24mm Optimal @Creality CR-6 0.8", "name": "0.24mm Optimal @Creality CR-6 0.8",
"sub_path": "process/0.24mm Optimal @Creality CR-6 0.8.json" "sub_path": "process/0.24mm Optimal @Creality CR-6 0.8.json"
}, },
{
"name": "0.24mm Draft @Creality CR10SE 0.2",
"sub_path": "process/0.24mm Draft @Creality CR10SE 0.2.json"
},
{
"name": "0.24mm Draft @Creality CR10SE 0.4",
"sub_path": "process/0.24mm Draft @Creality CR10SE 0.4.json"
},
{
"name": "0.24mm Draft @Creality CR10SE 0.6",
"sub_path": "process/0.24mm Draft @Creality CR10SE 0.6.json"
},
{
"name": "0.24mm Draft @Creality CR10SE 0.8",
"sub_path": "process/0.24mm Draft @Creality CR10SE 0.8.json"
},
{ {
"name": "0.24mm Draft @Creality Ender3V2", "name": "0.24mm Draft @Creality Ender3V2",
"sub_path": "process/0.24mm Draft @Creality Ender3V2.json" "sub_path": "process/0.24mm Draft @Creality Ender3V2.json"
@@ -742,6 +710,14 @@
"name": "0.24mm Draft @Creality Ender3V3SE 0.8", "name": "0.24mm Draft @Creality Ender3V3SE 0.8",
"sub_path": "process/0.24mm Draft @Creality Ender3V3SE 0.8.json" "sub_path": "process/0.24mm Draft @Creality Ender3V3SE 0.8.json"
}, },
{
"name": "0.24mm Draft @Creality Ender3V3",
"sub_path": "process/0.24mm Draft @Creality Ender3V3 0.4 nozzle.json"
},
{
"name": "0.24mm Draft @Creality Ender3V3",
"sub_path": "process/0.24mm Optimal @Creality Ender3V3 0.6 nozzle.json"
},
{ {
"name": "0.24mm Draft @Creality Ender3S1Plus 0.2", "name": "0.24mm Draft @Creality Ender3S1Plus 0.2",
"sub_path": "process/0.24mm Draft @Creality Ender3S1Plus 0.2.json" "sub_path": "process/0.24mm Draft @Creality Ender3S1Plus 0.2.json"
@@ -794,6 +770,14 @@
"name": "0.28mm SuperDraft @Creality Ender3 0.8", "name": "0.28mm SuperDraft @Creality Ender3 0.8",
"sub_path": "process/0.28mm SuperDraft @Creality Ender3 0.8.json" "sub_path": "process/0.28mm SuperDraft @Creality Ender3 0.8.json"
}, },
{
"name": "0.30mm Standard @Creality Ender3V3",
"sub_path": "process/0.30mm Standard @Creality Ender3V3 0.6 nozzle.json"
},
{
"name": "0.36mm Draft @Creality Ender3V3",
"sub_path": "process/0.36mm Draft @Creality Ender3V3 0.6 nozzle.json"
},
{ {
"name": "0.28mm SuperDraft @Creality CR-6 0.4", "name": "0.28mm SuperDraft @Creality CR-6 0.4",
"sub_path": "process/0.28mm SuperDraft @Creality CR-6 0.4.json" "sub_path": "process/0.28mm SuperDraft @Creality CR-6 0.4.json"
@@ -1044,6 +1028,10 @@
"name": "Creality Generic ASA @Ender-3V3-all", "name": "Creality Generic ASA @Ender-3V3-all",
"sub_path": "filament/Creality Generic ASA @Ender-3V3-all.json" "sub_path": "filament/Creality Generic ASA @Ender-3V3-all.json"
}, },
{
"name": "Creality Generic PA-CF @Ender-3V3-all",
"sub_path": "filament/Creality Generic PA-CF @Ender-3V3-all.json"
},
{ {
"name": "Creality Generic PETG @Ender-3V3-all", "name": "Creality Generic PETG @Ender-3V3-all",
"sub_path": "filament/Creality Generic PETG @Ender-3V3-all.json" "sub_path": "filament/Creality Generic PETG @Ender-3V3-all.json"
@@ -1266,6 +1254,14 @@
"name": "Creality Ender-3 V3 KE 0.4 nozzle", "name": "Creality Ender-3 V3 KE 0.4 nozzle",
"sub_path": "machine/Creality Ender-3 V3 KE 0.4 nozzle.json" "sub_path": "machine/Creality Ender-3 V3 KE 0.4 nozzle.json"
}, },
{
"name": "Creality Ender-3 V3 0.4 nozzle",
"sub_path": "machine/Creality Ender-3 V3 0.4 nozzle.json"
},
{
"name": "Creality Ender-3 V3 0.6 nozzle",
"sub_path": "machine/Creality Ender-3 V3 0.6 nozzle.json"
},
{ {
"name": "Creality Ender-5 0.4 nozzle", "name": "Creality Ender-5 0.4 nozzle",
"sub_path": "machine/Creality Ender-5 0.4 nozzle.json" "sub_path": "machine/Creality Ender-5 0.4 nozzle.json"