mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-11 11:07:40 +00:00
Resolve merge conflicts
This commit is contained in:
@@ -278,6 +278,22 @@
|
|||||||
"name": "0.12mm Fine @Creality CR10Max",
|
"name": "0.12mm Fine @Creality CR10Max",
|
||||||
"sub_path": "process/0.12mm Fine @Creality CR10Max.json"
|
"sub_path": "process/0.12mm Fine @Creality CR10Max.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 Detail @Creality CR-6 0.2",
|
"name": "0.12mm Detail @Creality CR-6 0.2",
|
||||||
"sub_path": "process/0.12mm Detail @Creality CR-6 0.2.json"
|
"sub_path": "process/0.12mm Detail @Creality CR-6 0.2.json"
|
||||||
@@ -358,6 +374,22 @@
|
|||||||
"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"
|
||||||
@@ -670,6 +702,22 @@
|
|||||||
"name": "0.24mm Draft @Creality CR10Max",
|
"name": "0.24mm Draft @Creality CR10Max",
|
||||||
"sub_path": "process/0.24mm Draft @Creality CR10Max.json"
|
"sub_path": "process/0.24mm Draft @Creality CR10Max.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 CR-6 0.4",
|
"name": "0.24mm Draft @Creality CR-6 0.4",
|
||||||
"sub_path": "process/0.24mm Draft @Creality CR-6 0.4.json"
|
"sub_path": "process/0.24mm Draft @Creality CR-6 0.4.json"
|
||||||
|
|||||||
Reference in New Issue
Block a user