Give generic filaments one name and one identity across every vendor

resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json

@@ -1,19 +0,0 @@
-{
-	"type": "filament",
-	"name": "Creality Generic ASA-CF @Hi-all",
-	"inherits": "Creality Generic ASA @Hi-all",
-	"from": "system",
-	"setting_id": "C7IB6HSJxW598zFA",
-	"filament_id": "OFLuczRG",
-	"instantiation": "true",
-	"filament_max_volumetric_speed": [
-		"9"
-	],
-	"slow_down_layer_time": [
-		"5"
-	],
-	"compatible_printers": [
-		"Creality Hi 0.4 nozzle",
-		"Creality Hi 0.6 nozzle"
-	]
-}

resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json

@@ -1,19 +0,0 @@
-{
-	"type": "filament",
-	"name": "Creality Generic PETG-CF @Hi-all",
-	"inherits": "Creality Generic PETG @Hi-all",
-	"from": "system",
-	"setting_id": "G4ZIJDNOpQvutOfs",
-	"filament_id": "OFqKmLJe",
-	"instantiation": "true",
-	"filament_max_volumetric_speed": [
-		"9"
-	],
-	"filament_flow_ratio": [
-		"0.95"
-	],
-	"compatible_printers": [
-		"Creality Hi 0.4 nozzle",
-		"Creality Hi 0.6 nozzle"
-	]
-}

resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json

@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Creality Generic PLA @Hi-all",
-	"inherits": "Creality Generic PLA",
+	"inherits": "Generic PLA @Creality",
 	"from": "system",
 	"setting_id": "3gf0CImK4nJwfXrB",
 	"instantiation": "true",

resources/profiles/Creality/filament/Creality Generic PLA-CF @Hi-all.json

@@ -1,15 +0,0 @@
-{
-	"type": "filament",
-	"name": "Creality Generic PLA-CF @Hi-all",
-	"inherits": "Creality Generic PLA-CF",
-	"from": "system",
-	"setting_id": "9nAovlPz0SEUcovr",
-	"instantiation": "true",
-	"filament_max_volumetric_speed": [
-		"18"
-	],
-	"compatible_printers": [
-		"Creality Hi 0.4 nozzle",
-		"Creality Hi 0.6 nozzle"
-	]
-}

resources/profiles/Creality/filament/Generic ABS @Creality Ender-3V3-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ABS @Ender-3V3-all",
-	"inherits": "Creality Generic ABS",
+	"name": "Generic ABS @Creality Ender-3V3-all",
+	"inherits": "Generic ABS @Creality",
+	"renamed_from": "Creality Generic ABS @Ender-3V3-all;Creality Generic ABS Ender-3V3-all",
 	"from": "system",
-	"setting_id": "Jvnq628y3IlGGHK6",
+	"setting_id": "RqMPGyaU3l17zFrA",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"9"

resources/profiles/Creality/filament/Generic ABS @Creality Ender-5Max-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ABS @Ender-5Max-all",
+	"name": "Generic ABS @Creality Ender-5Max-all",
 	"inherits": "fdm_filament_common",
+	"renamed_from": "Creality Generic ABS @Ender-5Max-all;Creality Generic ABS Ender-5Max-all",
 	"from": "system",
-	"setting_id": "mriWPwWZUKmr7ws0",
-	"filament_id": "OFYPdJ7t",
+	"setting_id": "qurtvw5OhkVfgpaC",
+	"filament_id": "OFY9muEs",
 	"instantiation": "true",
 	"activate_air_filtration": "0",
 	"activate_chamber_temp_control": "0",

resources/profiles/Creality/filament/Generic ABS @Creality Hi-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ABS @Hi-all",
-	"inherits": "Creality Generic ABS",
+	"name": "Generic ABS @Creality Hi-all",
+	"inherits": "Generic ABS @Creality",
+	"renamed_from": "Creality Generic ABS @Hi-all;Creality Generic ABS Hi-all",
 	"from": "system",
-	"setting_id": "mKgdNahVCaxQLMJE",
+	"setting_id": "W2NhLx7Lw4NxWJY6",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"9"
@@ -15,7 +16,6 @@
 		"; filament start gcode\n{if (position[2] > first_layer_height) }\nM104 S[nozzle_temperature]\n{else}\nM104 S[first_layer_temperature]\n{endif}\n"
 	],
 	"compatible_printers": [
-		"Creality Hi 0.4 nozzle",
 		"Creality Hi 0.6 nozzle"
 	]
 }

resources/profiles/Creality/filament/Generic ABS @Creality K1-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ABS @K1-all",
-	"inherits": "Creality Generic ABS",
+	"name": "Generic ABS @Creality K1-all",
+	"inherits": "Generic ABS @Creality",
+	"renamed_from": "Creality Generic ABS @K1-all;Creality Generic ABS K1-all",
 	"from": "system",
-	"setting_id": "lbMWwEM2Rb9ylrkA",
+	"setting_id": "9hr2XywDT7lTehYd",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"14"
@@ -15,9 +16,7 @@
 		"20"
 	],
 	"compatible_printers": [
-		"Creality K1C 0.4 nozzle",
 		"Creality K1C 0.6 nozzle",
-		"Creality K1C 0.8 nozzle",
-		"Creality K1 SE 0.4 nozzle"
+		"Creality K1C 0.8 nozzle"
 	]
 }

resources/profiles/Creality/filament/Generic ABS @Creality K2-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ABS @K2-all",
-	"inherits": "Creality Generic ABS",
+	"name": "Generic ABS @Creality K2-all",
+	"inherits": "Generic ABS @Creality",
+	"renamed_from": "Creality Generic ABS @K2-all;Creality Generic ABS K2-all",
 	"from": "system",
-	"setting_id": "jl0usGdbqac1xcGN",
+	"setting_id": "39krWtacUjDnf03V",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"
@@ -22,15 +23,10 @@
 	],
 	"compatible_printers": [
 		"Creality K2 0.2 nozzle",
-		"Creality K2 0.4 nozzle",
 		"Creality K2 0.6 nozzle",
 		"Creality K2 0.8 nozzle",
 		"Creality K2 Plus 0.2 nozzle",
-		"Creality K2 Plus 0.4 nozzle",
-		"Creality K2 Plus 0.6 nozzle",
-		"Creality K2 Plus 0.8 nozzle",
 		"Creality K2 Pro 0.2 nozzle",
-		"Creality K2 Pro 0.4 nozzle",
 		"Creality K2 Pro 0.6 nozzle",
 		"Creality K2 Pro 0.8 nozzle"
 	]

resources/profiles/Creality/filament/Generic ABS @Creality.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ABS",
+	"name": "Generic ABS @Creality",
 	"inherits": "fdm_filament_abs",
+	"renamed_from": "Creality Generic ABS",
 	"from": "system",
-	"setting_id": "fv5g33ofjgyjVexC",
-	"filament_id": "OFYPdJ7t",
+	"setting_id": "My3UvJeg30wW7hLq",
+	"filament_id": "OFY9muEs",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.926"

resources/profiles/Creality/filament/Generic ASA @Creality Ender-3V3-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ASA @Ender-3V3-all",
-	"inherits": "Creality Generic ASA",
+	"name": "Generic ASA @Creality Ender-3V3-all",
+	"inherits": "Generic ASA @Creality",
+	"renamed_from": "Creality Generic ASA @Ender-3V3-all;Creality Generic ASA Ender-3V3-all",
 	"from": "system",
-	"setting_id": "3KXcINpeRKqx9Hhw",
+	"setting_id": "LXPKRyWzBzo9nU8k",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"9"

resources/profiles/Creality/filament/Generic ASA @Creality Ender-5Max-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ASA @Ender-5Max-all",
+	"name": "Generic ASA @Creality Ender-5Max-all",
 	"inherits": "fdm_filament_common",
+	"renamed_from": "Creality Generic ASA @Ender-5Max-all;Creality Generic ASA Ender-5Max-all",
 	"from": "system",
-	"setting_id": "4muzPKAzy8FJKM5D",
-	"filament_id": "OFpAaY6w",
+	"setting_id": "7qyRWm8KXa1YUPpl",
+	"filament_id": "OFLPAxz3",
 	"instantiation": "true",
 	"activate_air_filtration": "0",
 	"activate_chamber_temp_control": "0",

resources/profiles/Creality/filament/Generic ASA @Creality Hi-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ASA @Hi-all",
-	"inherits": "Creality Generic ASA",
+	"name": "Generic ASA @Creality Hi-all",
+	"inherits": "Generic ASA @Creality",
+	"renamed_from": "Creality Generic ASA @Hi-all;Creality Generic ASA Hi-all",
 	"from": "system",
-	"setting_id": "DaPUW1rMtWyZLo3H",
+	"setting_id": "kcMcMJUiRgTRFe8P",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"9"

resources/profiles/Creality/filament/Generic ASA @Creality K1-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ASA @K1-all",
-	"inherits": "Creality Generic ASA",
+	"name": "Generic ASA @Creality K1-all",
+	"inherits": "Generic ASA @Creality",
+	"renamed_from": "Creality Generic ASA @K1-all;Creality Generic ASA K1-all",
 	"from": "system",
-	"setting_id": "nq4sPDBNWLOnU5pD",
+	"setting_id": "GQVdb7ZBWA55Ld0m",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"12"
@@ -15,9 +16,7 @@
 		"20"
 	],
 	"compatible_printers": [
-		"Creality K1C 0.4 nozzle",
 		"Creality K1C 0.6 nozzle",
-		"Creality K1C 0.8 nozzle",
-		"Creality K1 SE 0.4 nozzle"
+		"Creality K1C 0.8 nozzle"
 	]
 }

resources/profiles/Creality/filament/Generic ASA @Creality K2-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ASA @K2-all",
-	"inherits": "Creality Generic ASA",
+	"name": "Generic ASA @Creality K2-all",
+	"inherits": "Generic ASA @Creality",
+	"renamed_from": "Creality Generic ASA @K2-all;Creality Generic ASA K2-all",
 	"from": "system",
-	"setting_id": "OAYGhucg52H8nPIF",
+	"setting_id": "XJKLmHYbW2ReKSKs",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"
@@ -22,15 +23,12 @@
 	],
 	"compatible_printers": [
 		"Creality K2 0.2 nozzle",
-		"Creality K2 0.4 nozzle",
 		"Creality K2 0.6 nozzle",
 		"Creality K2 0.8 nozzle",
 		"Creality K2 Plus 0.2 nozzle",
-		"Creality K2 Plus 0.4 nozzle",
 		"Creality K2 Plus 0.6 nozzle",
 		"Creality K2 Plus 0.8 nozzle",
 		"Creality K2 Pro 0.2 nozzle",
-		"Creality K2 Pro 0.4 nozzle",
 		"Creality K2 Pro 0.6 nozzle",
 		"Creality K2 Pro 0.8 nozzle"
 	]

resources/profiles/Creality/filament/Generic ASA @Creality.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic ASA",
+	"name": "Generic ASA @Creality",
 	"inherits": "fdm_filament_asa",
+	"renamed_from": "Creality Generic ASA",
 	"from": "system",
-	"setting_id": "jHgcISP1UXOPsGH0",
-	"filament_id": "OFpAaY6w",
+	"setting_id": "dCUxfG2JXDg56zTK",
+	"filament_id": "OFLPAxz3",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.926"

resources/profiles/Creality/filament/Generic ASA-CF @Creality Hi-all.json

@@ -0,0 +1,23 @@
+{
+	"type": "filament",
+	"name": "Generic ASA-CF @Creality Hi-all",
+	"inherits": "Generic ASA @Creality Hi-all",
+	"renamed_from": "Creality Generic ASA-CF @Hi-all;Creality Generic ASA-CF Hi-all",
+	"from": "system",
+	"setting_id": "MwKV8Lh4XzvMUVYA",
+	"filament_id": "OF53eLVD",
+	"instantiation": "true",
+	"filament_type": [
+		"ASA-CF"
+	],
+	"filament_max_volumetric_speed": [
+		"9"
+	],
+	"slow_down_layer_time": [
+		"5"
+	],
+	"compatible_printers": [
+		"Creality Hi 0.4 nozzle",
+		"Creality Hi 0.6 nozzle"
+	]
+}

resources/profiles/Creality/filament/Generic PA @Creality Ender-5Max-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PA @Ender-5Max-all",
+	"name": "Generic PA @Creality Ender-5Max-all",
 	"inherits": "fdm_filament_common",
+	"renamed_from": "Creality Generic PA @Ender-5Max-all;Creality Generic PA Ender-5Max-all",
 	"from": "system",
-	"setting_id": "8caHexyoeQW9p1NF",
-	"filament_id": "OFMqYusc",
+	"setting_id": "ChQOX6JlKujFwFcB",
+	"filament_id": "OFg8ndtj",
 	"instantiation": "true",
 	"activate_air_filtration": "0",
 	"activate_chamber_temp_control": "0",

resources/profiles/Creality/filament/Generic PA-CF @Creality Ender-3V3-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PA-CF @Ender-3V3-all",
-	"inherits": "Creality Generic PA-CF",
+	"name": "Generic PA-CF @Creality Ender-3V3-all",
+	"inherits": "Generic PA-CF @Creality",
+	"renamed_from": "Creality Generic PA-CF @Ender-3V3-all;Creality Generic PA-CF Ender-3V3-all",
 	"from": "system",
-	"setting_id": "PxYQg8A9aHBV0wKU",
+	"setting_id": "L9lg0gKfwuz9xcs4",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Creality Ender-3 V3 0.4 nozzle",

resources/profiles/Creality/filament/Generic PA-CF @Creality K1-all.json

@@ -1,15 +1,15 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PA-CF @K1-all",
-	"inherits": "Creality Generic PA-CF",
+	"name": "Generic PA-CF @Creality K1-all",
+	"inherits": "Generic PA-CF @Creality",
+	"renamed_from": "Creality Generic PA-CF @K1-all;Creality Generic PA-CF K1-all",
 	"from": "system",
-	"setting_id": "3j6MMw59d8UigcH7",
+	"setting_id": "BkM0CVxYrvFPAbpQ",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Creality K1 (0.4 nozzle)",
 		"Creality K1 (0.6 nozzle)",
 		"Creality K1 (0.8 nozzle)",
-		"Creality K1C 0.4 nozzle",
 		"Creality K1C 0.6 nozzle",
 		"Creality K1C 0.8 nozzle",
 		"Creality K1 SE 0.4 nozzle",

resources/profiles/Creality/filament/Generic PA-CF @Creality K2-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PA-CF @K2-all",
-	"inherits": "Creality Generic PA-CF",
+	"name": "Generic PA-CF @Creality K2-all",
+	"inherits": "Generic PA-CF @Creality",
+	"renamed_from": "Creality Generic PA-CF @K2-all;Creality Generic PA-CF K2-all",
 	"from": "system",
-	"setting_id": "08QXVyyDDpDPhOoJ",
+	"setting_id": "jCFh6dGbNQt7YHNB",
 	"instantiation": "true",
 	"nozzle_temperature_initial_layer": [
 		"280"
@@ -23,9 +24,6 @@
 		"Creality K2 0.6 nozzle",
 		"Creality K2 0.8 nozzle",
 		"Creality K2 Plus 0.2 nozzle",
-		"Creality K2 Plus 0.4 nozzle",
-		"Creality K2 Plus 0.6 nozzle",
-		"Creality K2 Plus 0.8 nozzle",
 		"Creality K2 Pro 0.2 nozzle",
 		"Creality K2 Pro 0.4 nozzle",
 		"Creality K2 Pro 0.6 nozzle",

resources/profiles/Creality/filament/Generic PA-CF @Creality.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PA-CF",
+	"name": "Generic PA-CF @Creality",
 	"inherits": "fdm_filament_pa",
+	"renamed_from": "Creality Generic PA-CF",
 	"from": "system",
-	"setting_id": "hBNsuwMzm7ZZn15D",
-	"filament_id": "OFUWRqwb",
+	"setting_id": "JDbda1VeHrPKR0NN",
+	"filament_id": "OFQLcbps",
 	"instantiation": "true",
 	"filament_type": [
 		"PA-CF"

resources/profiles/Creality/filament/Generic PC @Creality K1-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PC @K1-all",
-	"inherits": "Creality Generic PC",
+	"name": "Generic PC @Creality K1-all",
+	"inherits": "Generic PC @Creality",
+	"renamed_from": "Creality Generic PC @K1-all;Creality Generic PC K1-all",
 	"from": "system",
-	"setting_id": "NZ93pDkjFnCyAVZW",
+	"setting_id": "Jk9yNMEqu4M92edj",
 	"instantiation": "true",
 	"chamber_temperatures": [
 		"60"
@@ -12,7 +13,6 @@
 		"Creality K1 (0.4 nozzle)",
 		"Creality K1 (0.6 nozzle)",
 		"Creality K1 (0.8 nozzle)",
-		"Creality K1C 0.4 nozzle",
 		"Creality K1C 0.6 nozzle",
 		"Creality K1C 0.8 nozzle",
 		"Creality K1 SE 0.4 nozzle",

resources/profiles/Creality/filament/Generic PC @Creality.json

@@ -1,9 +1,9 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PC",
+	"name": "Generic PC @Creality",
 	"inherits": "fdm_filament_pc",
 	"from": "system",
-	"filament_id": "OFe8UJXH",
+	"filament_id": "OFLakOUI",
 	"instantiation": "false",
 	"filament_max_volumetric_speed": [
 		"16"

resources/profiles/Creality/filament/Generic PETG @Creality Ender-3V3-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PETG @Ender-3V3-all",
-	"inherits": "Creality Generic PETG",
+	"name": "Generic PETG @Creality Ender-3V3-all",
+	"inherits": "Generic PETG @Creality",
+	"renamed_from": "Creality Generic PETG @Ender-3V3-all;Creality Generic PETG Ender-3V3-all",
 	"from": "system",
-	"setting_id": "VsfDu1bl3N1EaXrw",
+	"setting_id": "sX2aMXNynDp6VKSR",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"9"

resources/profiles/Creality/filament/Generic PETG @Creality Ender-5Max-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PETG @Ender-5Max-all",
+	"name": "Generic PETG @Creality Ender-5Max-all",
 	"inherits": "fdm_filament_common",
+	"renamed_from": "Creality Generic PETG @Ender-5Max-all;Creality Generic PETG Ender-5Max-all",
 	"from": "system",
-	"setting_id": "vRVsTatkrE46rzRB",
-	"filament_id": "OF4Mf5Gz",
+	"setting_id": "TFS4Fi1PuE7WgnPr",
+	"filament_id": "OFYPdQJh",
 	"instantiation": "true",
 	"activate_air_filtration": "0",
 	"activate_chamber_temp_control": "0",

resources/profiles/Creality/filament/Generic PETG @Creality Hi-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PETG @Hi-all",
-	"inherits": "Creality Generic PETG",
+	"name": "Generic PETG @Creality Hi-all",
+	"inherits": "Generic PETG @Creality",
+	"renamed_from": "Creality Generic PETG @Hi-all;Creality Generic PETG Hi-all",
 	"from": "system",
-	"setting_id": "ZGI0yhD4lB10uUOd",
+	"setting_id": "QcMkrViYBKh4oISG",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"9"
@@ -45,7 +46,6 @@
 		"; filament start gcode\n{if (position[2] > first_layer_height) }\nM104 S[nozzle_temperature]\n{else}\nM104 S[first_layer_temperature]\n{endif}\n"
 	],
 	"compatible_printers": [
-		"Creality Hi 0.4 nozzle",
 		"Creality Hi 0.6 nozzle"
 	]
 }

resources/profiles/Creality/filament/Generic PETG @Creality K1-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PETG @K1-all",
-	"inherits": "Creality Generic PETG",
+	"name": "Generic PETG @Creality K1-all",
+	"inherits": "Generic PETG @Creality",
+	"renamed_from": "Creality Generic PETG @K1-all;Creality Generic PETG K1-all",
 	"from": "system",
-	"setting_id": "zk1Typ98hZMZLn68",
+	"setting_id": "YEB1keha4rhCSmq8",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"9"
@@ -48,9 +49,7 @@
 		"0"
 	],
 	"compatible_printers": [
-		"Creality K1C 0.4 nozzle",
 		"Creality K1C 0.6 nozzle",
-		"Creality K1C 0.8 nozzle",
-		"Creality K1 SE 0.4 nozzle"
+		"Creality K1C 0.8 nozzle"
 	]
 }

resources/profiles/Creality/filament/Generic PETG @Creality K2-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PETG @K2-all",
-	"inherits": "Creality Generic PETG",
+	"name": "Generic PETG @Creality K2-all",
+	"inherits": "Generic PETG @Creality",
+	"renamed_from": "Creality Generic PETG @K2-all;Creality Generic PETG K2-all",
 	"from": "system",
-	"setting_id": "FhtlimihjuAe2pbs",
+	"setting_id": "IrbPRxkyhiUXaPEu",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"
@@ -55,15 +56,10 @@
 	],
 	"compatible_printers": [
 		"Creality K2 0.2 nozzle",
-		"Creality K2 0.4 nozzle",
 		"Creality K2 0.6 nozzle",
 		"Creality K2 0.8 nozzle",
 		"Creality K2 Plus 0.2 nozzle",
-		"Creality K2 Plus 0.4 nozzle",
-		"Creality K2 Plus 0.6 nozzle",
-		"Creality K2 Plus 0.8 nozzle",
 		"Creality K2 Pro 0.2 nozzle",
-		"Creality K2 Pro 0.4 nozzle",
 		"Creality K2 Pro 0.6 nozzle",
 		"Creality K2 Pro 0.8 nozzle"
 	]

resources/profiles/Creality/filament/Generic PETG @Creality.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PETG",
+	"name": "Generic PETG @Creality",
 	"inherits": "fdm_filament_pet",
+	"renamed_from": "Creality Generic PETG",
 	"from": "system",
-	"setting_id": "ixhOwyMvBCpI8nQs",
-	"filament_id": "OF4Mf5Gz",
+	"setting_id": "B8lWG3jJQ4ar4j70",
+	"filament_id": "OFYPdQJh",
 	"instantiation": "true",
 	"reduce_fan_stop_start_freq": [
 		"1"

resources/profiles/Creality/filament/Generic PETG-CF @Creality Hi-all.json

@@ -0,0 +1,23 @@
+{
+	"type": "filament",
+	"name": "Generic PETG-CF @Creality Hi-all",
+	"inherits": "Generic PETG @Creality Hi-all",
+	"renamed_from": "Creality Generic PETG-CF @Hi-all;Creality Generic PETG-CF Hi-all",
+	"from": "system",
+	"setting_id": "dWEGZoSVFzj7e9m1",
+	"filament_id": "OFoYSJKi",
+	"instantiation": "true",
+	"filament_type": [
+		"PETG-CF"
+	],
+	"filament_max_volumetric_speed": [
+		"9"
+	],
+	"filament_flow_ratio": [
+		"0.95"
+	],
+	"compatible_printers": [
+		"Creality Hi 0.4 nozzle",
+		"Creality Hi 0.6 nozzle"
+	]
+}

resources/profiles/Creality/filament/Generic PLA @Creality Ender-3V3-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA @Ender-3V3-all",
-	"inherits": "Creality Generic PLA",
+	"name": "Generic PLA @Creality Ender-3V3-all",
+	"inherits": "Generic PLA @Creality",
+	"renamed_from": "Creality Generic PLA @Ender-3V3-all;Creality Generic PLA Ender-3V3-all",
 	"from": "system",
-	"setting_id": "d9awwT21ZLo1iXoh",
+	"setting_id": "uGq3aWYUI2sLJORU",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"

resources/profiles/Creality/filament/Generic PLA @Creality Ender-5Max-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA @Ender-5Max-all",
+	"name": "Generic PLA @Creality Ender-5Max-all",
 	"inherits": "fdm_filament_common",
+	"renamed_from": "Creality Generic PLA @Ender-5Max-all;Creality Generic PLA Ender-5Max-all",
 	"from": "system",
-	"setting_id": "zQiwnlxGlX4pFOHR",
-	"filament_id": "OFACSw9O",
+	"setting_id": "xGTd14Qwc0JbI6kg",
+	"filament_id": "OFDSrzZ8",
 	"instantiation": "true",
 	"activate_air_filtration": "0",
 	"activate_chamber_temp_control": "0",

resources/profiles/Creality/filament/Generic PLA @Creality K1-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA @K1-all",
-	"inherits": "Creality Generic PLA",
+	"name": "Generic PLA @Creality K1-all",
+	"inherits": "Generic PLA @Creality",
+	"renamed_from": "Creality Generic PLA @K1-all;Creality Generic PLA K1-all",
 	"from": "system",
-	"setting_id": "c5ArCv3qjuKjBwEQ",
+	"setting_id": "oO2HaneRPfqxNQsP",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"
@@ -39,9 +40,7 @@
 		"0"
 	],
 	"compatible_printers": [
-		"Creality K1C 0.4 nozzle",
 		"Creality K1C 0.6 nozzle",
-		"Creality K1C 0.8 nozzle",
-		"Creality K1 SE 0.4 nozzle"
+		"Creality K1C 0.8 nozzle"
 	]
 }

resources/profiles/Creality/filament/Generic PLA @Creality K2-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA @K2-all",
-	"inherits": "Creality Generic PLA",
+	"name": "Generic PLA @Creality K2-all",
+	"inherits": "Generic PLA @Creality",
+	"renamed_from": "Creality Generic PLA @K2-all;Creality Generic PLA K2-all",
 	"from": "system",
-	"setting_id": "bnqvzgmJYbLraBWC",
+	"setting_id": "EC0PPocMp0c4O0dK",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"
@@ -49,15 +50,10 @@
 	],
 	"compatible_printers": [
 		"Creality K2 0.2 nozzle",
-		"Creality K2 0.4 nozzle",
 		"Creality K2 0.6 nozzle",
 		"Creality K2 0.8 nozzle",
 		"Creality K2 Plus 0.2 nozzle",
-		"Creality K2 Plus 0.4 nozzle",
-		"Creality K2 Plus 0.6 nozzle",
-		"Creality K2 Plus 0.8 nozzle",
 		"Creality K2 Pro 0.2 nozzle",
-		"Creality K2 Pro 0.4 nozzle",
 		"Creality K2 Pro 0.6 nozzle",
 		"Creality K2 Pro 0.8 nozzle"
 	]

resources/profiles/Creality/filament/Generic PLA @Creality.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA",
+	"name": "Generic PLA @Creality",
 	"inherits": "fdm_filament_pla",
+	"renamed_from": "Creality Generic PLA",
 	"from": "system",
-	"setting_id": "rUYYpB3GkiNCVyfY",
-	"filament_id": "OFACSw9O",
+	"setting_id": "UNUCEjCpe1e4ICT9",
+	"filament_id": "OFDSrzZ8",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.98"

resources/profiles/Creality/filament/Generic PLA HF @Creality.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality HF Generic PLA",
+	"name": "Generic PLA HF @Creality",
 	"inherits": "fdm_filament_pla",
+	"renamed_from": "Creality HF Generic PLA",
 	"from": "system",
-	"setting_id": "p07b7w0HDxavGLdd",
-	"filament_id": "OFmhWhEf",
+	"setting_id": "YXqIFmq63jGbN8aZ",
+	"filament_id": "OFZr862X",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.98"

resources/profiles/Creality/filament/Generic PLA High Speed @Creality Ender-3V3-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA High Speed @Ender-3V3-all",
-	"inherits": "Creality Generic PLA @Ender-3V3-all",
+	"name": "Generic PLA High Speed @Creality Ender-3V3-all",
+	"inherits": "Generic PLA @Creality Ender-3V3-all",
+	"renamed_from": "Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA High Speed Ender-3V3-all",
 	"from": "system",
-	"setting_id": "4F3dZWvsniH9QHtr",
-	"filament_id": "OFrO2zyn",
+	"setting_id": "MOH1B7U4Ipv8jw0s",
+	"filament_id": "OFmpMwxS",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"23"

resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA High Speed @Hi-all",
+	"name": "Generic PLA High Speed @Creality Hi-all",
 	"inherits": "Creality Generic PLA @Hi-all",
+	"renamed_from": "Creality Generic PLA High Speed @Hi-all;Creality Generic PLA High Speed Hi-all",
 	"from": "system",
-	"setting_id": "KzaopZGQPw5OJFFD",
-	"filament_id": "OFrO2zyn",
+	"setting_id": "KJZ1ztg3jL2Cg4fi",
+	"filament_id": "OFmpMwxS",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"

resources/profiles/Creality/filament/Generic PLA High Speed @Creality K1-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA High Speed @K1-all",
-	"inherits": "Creality Generic PLA @K1-all",
+	"name": "Generic PLA High Speed @Creality K1-all",
+	"inherits": "Generic PLA @Creality K1-all",
+	"renamed_from": "Creality Generic PLA High Speed @K1-all;Creality Generic PLA High Speed K1-all",
 	"from": "system",
-	"setting_id": "ptxV78rC6wevH916",
-	"filament_id": "OFrO2zyn",
+	"setting_id": "5HgGIzGuma2z6vD8",
+	"filament_id": "OFmpMwxS",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"23"

resources/profiles/Creality/filament/Generic PLA High Speed @Creality K2-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA High Speed @K2-all",
-	"inherits": "Creality Generic PLA @K2-all",
+	"name": "Generic PLA High Speed @Creality K2-all",
+	"inherits": "Generic PLA @Creality K2-all",
+	"renamed_from": "Creality Generic PLA High Speed @K2-all;Creality Generic PLA High Speed K2-all",
 	"from": "system",
-	"setting_id": "ozHstwkc3N5LGWLV",
-	"filament_id": "OFrO2zyn",
+	"setting_id": "Lxp4EwuEZKFHZXWR",
+	"filament_id": "OFmpMwxS",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"23"

resources/profiles/Creality/filament/Generic PLA Matte @Creality Ender-3V3-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA Matte @Ender-3V3-all",
-	"inherits": "Creality Generic PLA @Ender-3V3-all",
+	"name": "Generic PLA Matte @Creality Ender-3V3-all",
+	"inherits": "Generic PLA @Creality Ender-3V3-all",
+	"renamed_from": "Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Matte Ender-3V3-all",
 	"from": "system",
-	"setting_id": "xF1B593frol5PWVw",
-	"filament_id": "OFpSYJLI",
+	"setting_id": "JlvUB8GxzpAOlgkz",
+	"filament_id": "OFmY0l6t",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"

resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA Matte @Hi-all",
+	"name": "Generic PLA Matte @Creality Hi-all",
 	"inherits": "Creality Generic PLA @Hi-all",
+	"renamed_from": "Creality Generic PLA Matte @Hi-all;Creality Generic PLA Matte Hi-all",
 	"from": "system",
-	"setting_id": "R7Jo7NhjsR1iU2Fd",
-	"filament_id": "OFpSYJLI",
+	"setting_id": "pFxJgjam0WAeSKqf",
+	"filament_id": "OFmY0l6t",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"

resources/profiles/Creality/filament/Generic PLA Matte @Creality K1-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA Matte @K1-all",
-	"inherits": "Creality Generic PLA @K1-all",
+	"name": "Generic PLA Matte @Creality K1-all",
+	"inherits": "Generic PLA @Creality K1-all",
+	"renamed_from": "Creality Generic PLA Matte @K1-all;Creality Generic PLA Matte K1-all",
 	"from": "system",
-	"setting_id": "3hreTG3DjcgmwZC2",
-	"filament_id": "OFpSYJLI",
+	"setting_id": "JJRpJQcHUhelwD02",
+	"filament_id": "OFmY0l6t",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"

resources/profiles/Creality/filament/Generic PLA Matte @Creality K2-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA Matte @K2-all",
-	"inherits": "Creality Generic PLA @K2-all",
+	"name": "Generic PLA Matte @Creality K2-all",
+	"inherits": "Generic PLA @Creality K2-all",
+	"renamed_from": "Creality Generic PLA Matte @K2-all;Creality Generic PLA Matte K2-all",
 	"from": "system",
-	"setting_id": "fxZf5E6IHWWq3dsu",
-	"filament_id": "OFpSYJLI",
+	"setting_id": "VVcXNl0Y6B0mLlrb",
+	"filament_id": "OFmY0l6t",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"

resources/profiles/Creality/filament/Generic PLA Silk @Creality Ender-3V3-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA Silk @Ender-3V3-all",
-	"inherits": "Creality Generic PLA @Ender-3V3-all",
+	"name": "Generic PLA Silk @Creality Ender-3V3-all",
+	"inherits": "Generic PLA @Creality Ender-3V3-all",
+	"renamed_from": "Creality Generic PLA Silk @Ender-3V3-all;Creality Generic PLA Silk Ender-3V3-all",
 	"from": "system",
-	"setting_id": "uPFnSMh7WoXmMAoy",
-	"filament_id": "OFp8gtPH",
+	"setting_id": "vPrmBiuBCC8843Jb",
+	"filament_id": "OFesA6rF",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"7.5"

resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA Silk @Hi-all",
+	"name": "Generic PLA Silk @Creality Hi-all",
 	"inherits": "Creality Generic PLA @Hi-all",
+	"renamed_from": "Creality Generic PLA Silk @Hi-all;Creality Generic PLA Silk Hi-all",
 	"from": "system",
-	"setting_id": "RPDVqZcn8EZizd1U",
-	"filament_id": "OFp8gtPH",
+	"setting_id": "k1ofgUXqhHGSPDPY",
+	"filament_id": "OFesA6rF",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.97"

resources/profiles/Creality/filament/Generic PLA Silk @Creality K1-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA Silk @K1-all",
-	"inherits": "Creality Generic PLA @K1-all",
+	"name": "Generic PLA Silk @Creality K1-all",
+	"inherits": "Generic PLA @Creality K1-all",
+	"renamed_from": "Creality Generic PLA Silk @K1-all;Creality Generic PLA Silk K1-all",
 	"from": "system",
-	"setting_id": "pxvc0ICvqc0M3wYV",
-	"filament_id": "OFp8gtPH",
+	"setting_id": "JcSq9nar8x5BjFss",
+	"filament_id": "OFesA6rF",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"7.5"

resources/profiles/Creality/filament/Generic PLA Silk @Creality K2-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA Silk @K2-all",
-	"inherits": "Creality Generic PLA @K2-all",
+	"name": "Generic PLA Silk @Creality K2-all",
+	"inherits": "Generic PLA @Creality K2-all",
+	"renamed_from": "Creality Generic PLA Silk @K2-all;Creality Generic PLA Silk K2-all",
 	"from": "system",
-	"setting_id": "qS0Mlt24iz1k4P7n",
-	"filament_id": "OFp8gtPH",
+	"setting_id": "fRyhLWAQiCOaAxKA",
+	"filament_id": "OFesA6rF",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"10"

resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA Wood @Hi-all",
+	"name": "Generic PLA Wood @Creality Hi-all",
 	"inherits": "Creality Generic PLA @Hi-all",
+	"renamed_from": "Creality Generic PLA Wood @Hi-all;Creality Generic PLA Wood Hi-all",
 	"from": "system",
-	"setting_id": "OEc7Bc7WG99tuO5D",
-	"filament_id": "OFNW4ZTC",
+	"setting_id": "PNqfF5ecYqqpobdh",
+	"filament_id": "OFIKZxPF",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.88"

resources/profiles/Creality/filament/Generic PLA-CF @Creality Hi-all.json

@@ -0,0 +1,16 @@
+{
+	"type": "filament",
+	"name": "Generic PLA-CF @Creality Hi-all",
+	"inherits": "Generic PLA-CF @Creality",
+	"renamed_from": "Creality Generic PLA-CF @Hi-all;Creality Generic PLA-CF Hi-all",
+	"from": "system",
+	"setting_id": "MH2pm9wTHLgX9fyq",
+	"instantiation": "true",
+	"filament_max_volumetric_speed": [
+		"18"
+	],
+	"compatible_printers": [
+		"Creality Hi 0.4 nozzle",
+		"Creality Hi 0.6 nozzle"
+	]
+}

resources/profiles/Creality/filament/Generic PLA-CF @Creality K1-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA-CF @K1-all",
-	"inherits": "Creality Generic PLA-CF",
+	"name": "Generic PLA-CF @Creality K1-all",
+	"inherits": "Generic PLA-CF @Creality",
+	"renamed_from": "Creality Generic PLA-CF @K1-all;Creality Generic PLA-CF K1-all",
 	"from": "system",
-	"setting_id": "zCnOLIfwhfZIDYLC",
+	"setting_id": "DoyvqW51z3o1vBSa",
 	"instantiation": "true",
 	"additional_cooling_fan_speed": [
 		"0"
@@ -12,10 +13,8 @@
 		"Creality K1 (0.4 nozzle)",
 		"Creality K1 (0.6 nozzle)",
 		"Creality K1 (0.8 nozzle)",
-		"Creality K1C 0.4 nozzle",
 		"Creality K1C 0.6 nozzle",
 		"Creality K1C 0.8 nozzle",
-		"Creality K1 SE 0.4 nozzle",
 		"Creality K1 Max (0.4 nozzle)",
 		"Creality K1 Max (0.6 nozzle)",
 		"Creality K1 Max (0.8 nozzle)"

resources/profiles/Creality/filament/Generic PLA-CF @Creality K2-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA-CF @K2-all",
-	"inherits": "Creality Generic PLA-CF",
+	"name": "Generic PLA-CF @Creality K2-all",
+	"inherits": "Generic PLA-CF @Creality",
+	"renamed_from": "Creality Generic PLA-CF @K2-all;Creality Generic PLA-CF K2-all",
 	"from": "system",
-	"setting_id": "wfZgLrH8dafxsNyZ",
+	"setting_id": "6KqkLBBYBA59h5TA",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"
@@ -16,15 +17,12 @@
 	],
 	"compatible_printers": [
 		"Creality K2 0.2 nozzle",
-		"Creality K2 0.4 nozzle",
 		"Creality K2 0.6 nozzle",
 		"Creality K2 0.8 nozzle",
 		"Creality K2 Plus 0.2 nozzle",
-		"Creality K2 Plus 0.4 nozzle",
 		"Creality K2 Plus 0.6 nozzle",
 		"Creality K2 Plus 0.8 nozzle",
 		"Creality K2 Pro 0.2 nozzle",
-		"Creality K2 Pro 0.4 nozzle",
 		"Creality K2 Pro 0.6 nozzle",
 		"Creality K2 Pro 0.8 nozzle"
 	]

resources/profiles/Creality/filament/Generic PLA-CF @Creality.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA-CF",
+	"name": "Generic PLA-CF @Creality",
 	"inherits": "fdm_filament_pla",
+	"renamed_from": "Creality Generic PLA-CF",
 	"from": "system",
-	"setting_id": "DCCWPQGMsvDOucwx",
-	"filament_id": "OFSDFYs4",
+	"setting_id": "Fn5Z3ccrrRYFkiwT",
+	"filament_id": "OFWbdGsC",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"

resources/profiles/Creality/filament/Generic Speed PLA @Creality HF.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality HF Generic Speed PLA",
+	"name": "Generic Speed PLA @Creality HF",
 	"inherits": "fdm_filament_pla",
+	"renamed_from": "Creality HF Generic Speed PLA",
 	"from": "system",
-	"setting_id": "Jp93uqYennsWVAKe",
-	"filament_id": "OFMIurFh",
+	"setting_id": "pklu1YSwmDOj6gRq",
+	"filament_id": "OFXmv5p0",
 	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.98"

resources/profiles/Creality/filament/Generic TPU @Creality Ender-3V3-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic TPU @Ender-3V3-all",
-	"inherits": "Creality Generic TPU",
+	"name": "Generic TPU @Creality Ender-3V3-all",
+	"inherits": "Generic TPU @Creality",
+	"renamed_from": "Creality Generic TPU @Ender-3V3-all;Creality Generic TPU Ender-3V3-all",
 	"from": "system",
-	"setting_id": "0fDkYNB91MiqbAS0",
+	"setting_id": "ZufJdJseoFNQC66B",
 	"instantiation": "true",
 	"hot_plate_temp": [
 		"30"

resources/profiles/Creality/filament/Generic TPU @Creality Ender-5Max-all.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic TPU @Ender-5Max-all",
+	"name": "Generic TPU @Creality Ender-5Max-all",
 	"inherits": "fdm_filament_common",
+	"renamed_from": "Creality Generic TPU @Ender-5Max-all;Creality Generic TPU Ender-5Max-all",
 	"from": "system",
-	"setting_id": "aaiFHjbveXabDAMr",
-	"filament_id": "OFhcrFw9",
+	"setting_id": "XqW2iYrRTVlXuCwD",
+	"filament_id": "OFgbpcy9",
 	"instantiation": "true",
 	"activate_air_filtration": "0",
 	"activate_chamber_temp_control": "0",

resources/profiles/Creality/filament/Generic TPU @Creality Hi-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic TPU @Hi-all",
-	"inherits": "Creality Generic TPU",
+	"name": "Generic TPU @Creality Hi-all",
+	"inherits": "Generic TPU @Creality",
+	"renamed_from": "Creality Generic TPU @Hi-all;Creality Generic TPU Hi-all",
 	"from": "system",
-	"setting_id": "aF2isnhJKc3hoq8r",
+	"setting_id": "P42mcGCETNdcZchS",
 	"instantiation": "true",
 	"hot_plate_temp": [
 		"30"

resources/profiles/Creality/filament/Generic TPU @Creality K1-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic TPU @K1-all",
-	"inherits": "Creality Generic TPU",
+	"name": "Generic TPU @Creality K1-all",
+	"inherits": "Generic TPU @Creality",
+	"renamed_from": "Creality Generic TPU @K1-all;Creality Generic TPU K1-all",
 	"from": "system",
-	"setting_id": "isJCGG1B672xyX4l",
+	"setting_id": "7zTgnS8bIEkkhqtB",
 	"instantiation": "true",
 	"hot_plate_temp": [
 		"30"
@@ -33,9 +34,7 @@
 		"0"
 	],
 	"compatible_printers": [
-		"Creality K1C 0.4 nozzle",
 		"Creality K1C 0.6 nozzle",
-		"Creality K1C 0.8 nozzle",
-		"Creality K1 SE 0.4 nozzle"
+		"Creality K1C 0.8 nozzle"
 	]
 }

resources/profiles/Creality/filament/Generic TPU @Creality K2-all.json

@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic TPU @K2-all",
-	"inherits": "Creality Generic TPU",
+	"name": "Generic TPU @Creality K2-all",
+	"inherits": "Generic TPU @Creality",
+	"renamed_from": "Creality Generic TPU @K2-all;Creality Generic TPU K2-all",
 	"from": "system",
-	"setting_id": "60PiyJbkRFDzr7b5",
+	"setting_id": "C9PAmCIDhCAthMuK",
 	"instantiation": "true",
 	"hot_plate_temp": [
 		"40"
@@ -37,15 +38,12 @@
 	],
 	"compatible_printers": [
 		"Creality K2 0.2 nozzle",
-		"Creality K2 0.4 nozzle",
 		"Creality K2 0.6 nozzle",
 		"Creality K2 0.8 nozzle",
 		"Creality K2 Plus 0.2 nozzle",
-		"Creality K2 Plus 0.4 nozzle",
 		"Creality K2 Plus 0.6 nozzle",
 		"Creality K2 Plus 0.8 nozzle",
 		"Creality K2 Pro 0.2 nozzle",
-		"Creality K2 Pro 0.4 nozzle",
 		"Creality K2 Pro 0.6 nozzle",
 		"Creality K2 Pro 0.8 nozzle"
 	]

resources/profiles/Creality/filament/Generic TPU @Creality.json

@@ -1,10 +1,11 @@
 {
 	"type": "filament",
-	"name": "Creality Generic TPU",
+	"name": "Generic TPU @Creality",
 	"inherits": "fdm_filament_tpu",
+	"renamed_from": "Creality Generic TPU",
 	"from": "system",
-	"setting_id": "mKCynAMC7cjY03c0",
-	"filament_id": "OFhcrFw9",
+	"setting_id": "eCzlxPg3piTZEui4",
+	"filament_id": "OFgbpcy9",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"3.2"

resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json

@@ -8,7 +8,7 @@
 	"printer_model": "Creality CR-10 Max",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"default_print_profile": "0.20mm Standard @Creality CR10Max",
 	"nozzle_diameter": [

resources/profiles/Creality/machine/Creality CR-10 Max.json

@@ -8,5 +8,5 @@
 	"bed_model": "creality_cr10max_buildplate_model.stl",
 	"bed_texture": "creality_cr10max_buildplate_texture.svg",
 	"hotend_model": "",
-	"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
+	"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
 }

resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json

@@ -116,7 +116,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
 	"machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Creality/machine/Creality CR-10 SE 0.4 nozzle.json

@@ -116,7 +116,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
 	"machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json

@@ -116,7 +116,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
 	"machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json

@@ -116,7 +116,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
 	"machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \nM84 X Y E ;Disable all steppers but Z",

resources/profiles/Creality/machine/Creality CR-10 SE.json

@@ -8,5 +8,5 @@
 	"bed_model": "creality_cr10se_buildplate_model.stl",
 	"bed_texture": "creality_cr10se_buildplate_texture.svg",
 	"hotend_model": "",
-	"default_materials": "Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PETG;Creality Generic TPU;Creality Generic ABS"
+	"default_materials": "Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PETG @Creality;Generic TPU @Creality;Generic ABS @Creality"
 }

resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json

@@ -106,7 +106,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M0",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG28 ; home all\nG1 Z2 F240\nG1 X2 Y10 F3000\nG1 Z0.28 F240\nG92 E0\nG1 Y190 E15 F1500 ; intro line\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E15 F1200 ; intro line\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600{endif} ; Move print head up\nG1 X5 Y170 F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600{endif} ; Move print head further up\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality CR-10 V2.json

@@ -8,5 +8,5 @@
 	"bed_model": "creality_cr10v2_buildplate_model.stl",
 	"bed_texture": "creality_cr10v2_buildplate_texture.svg",
 	"hotend_model": "",
-	"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
+	"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
 }

resources/profiles/Creality/machine/Creality CR-10 V3 0.4 nozzle.json

@@ -109,7 +109,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M0",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S{first_layer_temperature[0]} ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG1 Z0.28 F240\nG92 E0\nG1 X2 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600{endif} ; Move print head up\nG1 X5 Y170 F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600{endif} ; Move print head further up\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality CR-10 V3 0.6 nozzle.json

@@ -110,7 +110,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M0",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S{first_layer_temperature[0]} ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG1 Z0.28 F240\nG92 E0\nG1 X2 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600{endif} ; Move print head up\nG1 X5 Y170 F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600{endif} ; Move print head further up\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality CR-10 V3.json

@@ -8,5 +8,5 @@
 	"bed_model": "creality_cr10v3_buildplate_model.stl",
 	"bed_texture": "creality_cr10v3_buildplate_texture.svg",
 	"hotend_model": "",
-	"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
+	"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
 }

resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json

@@ -8,7 +8,7 @@
 	"printer_model": "Creality CR-6 Max",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"printer_variant": "0.2",
 	"default_print_profile": "0.16mm Optimal @Creality CR-6 0.2",

resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json

@@ -8,7 +8,7 @@
 	"printer_model": "Creality CR-6 Max",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"default_print_profile": "0.20mm Standard @Creality CR-6 0.4",
 	"nozzle_diameter": [

resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json

@@ -8,7 +8,7 @@
 	"printer_model": "Creality CR-6 Max",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"printer_variant": "0.6",
 	"default_print_profile": "0.20mm Standard @Creality CR-6 0.6",

resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json

@@ -8,7 +8,7 @@
 	"printer_model": "Creality CR-6 Max",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"printer_variant": "0.8",
 	"default_print_profile": "0.32mm Standard @Creality CR-6 0.8",

resources/profiles/Creality/machine/Creality CR-6 Max.json

@@ -8,5 +8,5 @@
 	"hotend_model": "",
 	"machine_tech": "FFF",
 	"model_id": "Creality_CR_6_Max",
-	"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
+	"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
 }

resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json

@@ -8,7 +8,7 @@
 	"printer_model": "Creality CR-6 SE",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"printer_variant": "0.2",
 	"default_print_profile": "0.16mm Optimal @Creality CR-6 0.2",

resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json

@@ -8,7 +8,7 @@
 	"printer_model": "Creality CR-6 SE",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"default_print_profile": "0.20mm Standard @Creality CR-6 0.4",
 	"nozzle_diameter": [

resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json

@@ -8,7 +8,7 @@
 	"printer_model": "Creality CR-6 SE",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"printer_variant": "0.6",
 	"default_print_profile": "0.20mm Standard @Creality CR-6 0.6",

resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json

@@ -8,7 +8,7 @@
 	"printer_model": "Creality CR-6 SE",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"printer_variant": "0.8",
 	"default_print_profile": "0.32mm Standard @Creality CR-6 0.8",

resources/profiles/Creality/machine/Creality CR-6 SE.json

@@ -8,5 +8,5 @@
 	"hotend_model": "",
 	"machine_tech": "FFF",
 	"model_id": "Creality_CR_6_SE",
-	"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
+	"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
 }

resources/profiles/Creality/machine/Creality CR-M4 0.4 nozzle.json

@@ -9,7 +9,7 @@
 	"gcode_flavor": "marlin",
 	"printer_structure": "i3",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"default_print_profile": "0.20mm Standard @Creality CR-M4",
 	"nozzle_diameter": [

resources/profiles/Creality/machine/Creality CR-M4.json

@@ -8,5 +8,5 @@
 	"bed_model": "creality_crm4_buildplate_model.stl",
 	"bed_texture": "creality_crm4_buildplate_texture.svg",
 	"hotend_model": "",
-	"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
+	"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
 }

resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json

@@ -112,7 +112,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 0.4 nozzle.json

@@ -112,7 +112,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json

@@ -112,7 +112,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json

@@ -112,7 +112,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json

@@ -112,7 +112,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 Pro 0.4 nozzle.json

@@ -112,7 +112,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json

@@ -112,7 +112,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json

@@ -112,7 +112,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 Pro.json

@@ -8,5 +8,5 @@
 	"bed_model": "creality_ender3v2_buildplate_model.stl",
 	"bed_texture": "creality_ender3v2_buildplate_texture.svg",
 	"hotend_model": "",
-	"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
+	"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
 }

resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json

@@ -106,7 +106,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json

@@ -110,7 +110,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling \nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.4 nozzle.json

@@ -110,7 +110,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json

@@ -110,7 +110,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json

@@ -111,7 +111,7 @@
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "M25",
 	"default_filament_profile": [
-		"Creality Generic PLA"
+		"Generic PLA @Creality"
 	],
 	"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
 	"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

resources/profiles/Creality/machine/Creality Ender-3 S1 Plus.json

@@ -8,5 +8,5 @@
 	"bed_model": "creality_ender3s1plus_buildplate_model.stl",
 	"bed_texture": "creality_ender3s1plus_buildplate_texture.svg",
 	"hotend_model": "",
-	"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
+	"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
 }