From 2cf06ae17ed281f9eb3e5bfea96637725773f2b0 Mon Sep 17 00:00:00 2001
From: cochcoder <103969142+cochcoder@users.noreply.github.com>
Date: Tue, 30 Apr 2024 13:25:28 -0400
Subject: [PATCH] Resolve merge conflicts

---
 resources/profiles/Creality.json | 48 ++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json
index 277f57e641..a3e7f60d0b 100644
--- a/resources/profiles/Creality.json
+++ b/resources/profiles/Creality.json
@@ -278,6 +278,22 @@
             "name": "0.12mm Fine @Creality CR10Max",
             "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",
             "sub_path": "process/0.12mm Detail @Creality CR-6 0.2.json"
@@ -358,6 +374,22 @@
             "name": "0.15mm Optimal @Creality CR10Max",
             "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",
             "sub_path": "process/0.15mm Optimal @Creality Ender3V2.json"
@@ -670,6 +702,22 @@
             "name": "0.24mm Draft @Creality CR10Max",
             "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",
             "sub_path": "process/0.24mm Draft @Creality CR-6 0.4.json"