Give generic filaments one name and one identity across every vendor

2026-09-09 18:27:00 +00:00 · 2026-09-01 16:24:33 +08:00
parent e1c28a5f7c
commit 6ec904074b
1585 changed files with 11776 additions and 11606 deletions
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi Q1 Pro",
 	"printer_variant": "0.2",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle"
+		"Generic PLA @Qidi Q1 Pro 0.2 nozzle"
 	],
 	"default_print_profile": "0.10mm Standard @Qidi Q1 Pro 0.2 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -82,6 +82,6 @@
 	"machine_start_gcode": "PRINT_START BED=[hot_plate_temp_initial_layer] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperature]\nM83\nM140 S[hot_plate_temp_initial_layer]\nM104 S[nozzle_temperature_initial_layer]\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\n",
 	"thumbnails_format": "PNG",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle"
+		"Generic PLA @Qidi Q1 Pro 0.4 nozzle"
 	]
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi Q1 Pro",
 	"printer_variant": "0.6",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle"
+		"Generic PLA @Qidi Q1 Pro 0.6 nozzle"
 	],
 	"default_print_profile": "0.30mm Standard @Qidi Q1 Pro 0.6 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi Q1 Pro",
 	"printer_variant": "0.8",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle"
+		"Generic PLA @Qidi Q1 Pro 0.8 nozzle"
 	],
 	"default_print_profile": "0.40mm Standard @Qidi Q1 Pro 0.8 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -8,5 +8,5 @@
 	"bed_model": "qidi_Q1Pro_buildplate_model.stl",
 	"bed_texture": "qidi_Q1Pro_buildplate_texture.svg",
 	"hotend_model": "qidi_xseries_gen3_hotend.stl",
-	"default_materials": "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle;QIDI ASA @Qidi Q1 Pro 0.4 nozzle;QIDI ASA @Qidi Q1 Pro 0.2 nozzle;QIDI ASA @Qidi Q1 Pro 0.6 nozzle;QIDI ASA @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle"
+	"default_materials": "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle;QIDI ASA @Qidi Q1 Pro 0.4 nozzle;QIDI ASA @Qidi Q1 Pro 0.2 nozzle;QIDI ASA @Qidi Q1 Pro 0.6 nozzle;QIDI ASA @Qidi Q1 Pro 0.8 nozzle;Generic PETG @Qidi Q1 Pro 0.4 nozzle;Generic PETG @Qidi Q1 Pro 0.2 nozzle;Generic PETG @Qidi Q1 Pro 0.6 nozzle;Generic PETG @Qidi Q1 Pro 0.8 nozzle;Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle;Generic PLA @Qidi Q1 Pro 0.4 nozzle;Generic PLA @Qidi Q1 Pro 0.2 nozzle;Generic PLA @Qidi Q1 Pro 0.6 nozzle;Generic PLA @Qidi Q1 Pro 0.8 nozzle"
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -98,7 +98,7 @@
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "M0",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"machine_start_gcode": "G28\nM140 S[hot_plate_temp_initial_layer]\nM190 S[hot_plate_temp_initial_layer]\nM109 S[nozzle_temperature_initial_layer]\nG92 E-19\nG0 Y5 Z0.3 F3600\nG1 X5 E0 F2400\n",
 	"machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n",
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -8,5 +8,5 @@
 	"bed_model": "qidi_xcfpro_buildplate_model.stl",
 	"bed_texture": "qidi_xcfpro_buildplate_texture.svg",
 	"hotend_model": "qidi_xseries_gen2_hotend.stl",
-	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PLA-CF;Qidi Generic PVA;Qidi Generic TPU 95A"
+	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Generic ASA @Qidi;Generic ABS @Qidi;Generic PA-CF @Qidi;Generic PA @Qidi;Generic PC @Qidi;Generic PETG-CF @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi;Generic PLA-CF @Qidi;Generic PVA @Qidi;Generic TPU 95A @Qidi"
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -98,7 +98,7 @@
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "M0",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"machine_start_gcode": "G28\nG92 E0\nG0 X300 Y5 Z50 F3600\nM190 S[bed_temperature_initial_layer_single]\nM109 S[first_layer_temperature]\nG92 E-19\n",
 	"machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n",
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Max 3",
 	"printer_variant": "0.2",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle"
+		"Generic PLA @Qidi X-Max 3 0.2 nozzle"
 	],
 	"default_print_profile": "0.10mm Standard @Qidi XMax3 0.2 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -46,6 +46,6 @@
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	]
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Max 3",
 	"printer_variant": "0.6",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"default_print_profile": "0.30mm Standard @Qidi XMax3 0.6 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Max 3",
 	"printer_variant": "0.8",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"default_print_profile": "0.40mm Standard @Qidi XMax3 0.8 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -8,5 +8,5 @@
 	"bed_model": "qidi_xmax3_buildplate_model.stl",
 	"bed_texture": "qidi_xmax3_buildplate_texture.svg",
 	"hotend_model": "qidi_xseries_gen3_hotend.stl",
-	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA"
+	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Generic ASA @Qidi;Generic ABS @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi"
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -8,5 +8,5 @@
 	"bed_model": "qidi_xmax_buildplate_model.stl",
 	"bed_texture": "qidi_xmax_buildplate_texture.svg",
 	"hotend_model": "qidi_xseries_gen2_hotend.stl",
-	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PLA-CF;Qidi Generic PVA;Qidi Generic TPU 95A"
+	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Generic ASA @Qidi;Generic ABS @Qidi;Generic PA-CF @Qidi;Generic PA @Qidi;Generic PC @Qidi;Generic PETG-CF @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi;Generic PLA-CF @Qidi;Generic PVA @Qidi;Generic TPU 95A @Qidi"
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -98,7 +98,7 @@
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "M0",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"machine_start_gcode": "G28\nG92 E0\nG0 X270 Y5 Z50 F3600\nM190 S[bed_temperature_initial_layer_single]\nM109 S[first_layer_temperature]\nG92 E-16\n",
 	"machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n",
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Plus 3",
 	"printer_variant": "0.2",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle"
+		"Generic PLA @Qidi X-Plus 3 0.2 nozzle"
 	],
 	"default_print_profile": "0.10mm Standard @Qidi XPlus3 0.2 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -42,6 +42,6 @@
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	]
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Plus 3",
 	"printer_variant": "0.6",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"default_print_profile": "0.30mm Standard @Qidi XPlus3 0.6 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Plus 3",
 	"printer_variant": "0.8",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"default_print_profile": "0.40mm Standard @Qidi XPlus3 0.8 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -8,5 +8,5 @@
 	"bed_model": "qidi_xplus3_buildplate_model.stl",
 	"bed_texture": "qidi_xplus3_buildplate_texture.svg",
 	"hotend_model": "qidi_xseries_gen3_hotend.stl",
-	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA"
+	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Generic ASA @Qidi;Generic ABS @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi"
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Plus 4",
 	"printer_variant": "0.2",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle"
+		"Generic PLA @Qidi X-Plus 4 0.2 nozzle"
 	],
 	"default_print_profile": "0.10mm Standard @Qidi XPlus4 0.2 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -97,7 +97,7 @@
 	"machine_start_gcode": "PRINT_START BED=[bed_temperature_initial_layer_single] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperature] EXTRUDER=[initial_no_support_extruder]\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nM83\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperature]\nG4 P3000\nT[initial_tool]\nG0 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0] - 12, first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\nSET_PRINT_STATS_INFO CURRENT_LAYER=1",
 	"thumbnails_format": "PNG",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle"
+		"Generic PLA @Qidi X-Plus 4 0.4 nozzle"
 	],
 	"printer_agent": "qidi"
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Plus 4",
 	"printer_variant": "0.6",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle"
+		"Generic PLA @Qidi X-Plus 4 0.6 nozzle"
 	],
 	"default_print_profile": "0.30mm Standard @Qidi XPlus4 0.6 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Plus 4",
 	"printer_variant": "0.8",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle"
+		"Generic PLA @Qidi X-Plus 4 0.8 nozzle"
 	],
 	"default_print_profile": "0.40mm Standard @Qidi XPlus4 0.8 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -8,5 +8,5 @@
 	"bed_model": "qidi_xplus4_buildplate_model.stl",
 	"bed_texture": "qidi_xplus4_buildplate_texture.svg",
 	"hotend_model": "qidi_xseries_gen3_hotend.stl",
-	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PLA Rapido Matte;QIDI ASA;Qidi Generic PETG"
+	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PLA Rapido Matte;QIDI ASA;Generic PETG @Qidi"
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -8,5 +8,5 @@
 	"bed_model": "qidi_xplus_buildplate_model.stl",
 	"bed_texture": "qidi_xplus_buildplate_texture.svg",
 	"hotend_model": "qidi_xseries_gen2_hotend.stl",
-	"default_materials": "Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PLA-CF;Qidi Generic PVA;Qidi Generic TPU"
+	"default_materials": "Generic ASA @Qidi;Generic ABS @Qidi;Generic PA-CF @Qidi;Generic PA @Qidi;Generic PC @Qidi;Generic PETG-CF @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi;Generic PLA-CF @Qidi;Generic PVA @Qidi;Generic TPU @Qidi"
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Smart 3",
 	"printer_variant": "0.2",
 	"default_filament_profile": [
-		"Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle"
+		"Generic PLA @Qidi X-Smart 3 0.2 nozzle"
 	],
 	"default_print_profile": "0.10mm Standard @Qidi XSmart3 0.2 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -48,6 +48,6 @@
 	"change_filament_gcode": "",
 	"machine_pause_gcode": "PAUSE",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	]
 }
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Smart 3",
 	"printer_variant": "0.6",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"default_print_profile": "0.30mm Standard @Qidi XSmart3 0.6 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -11,7 +11,7 @@
 	"printer_model": "Qidi X-Smart 3",
 	"printer_variant": "0.8",
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"default_print_profile": "0.40mm Standard @Qidi XSmart3 0.8 nozzle",
 	"max_layer_height": [
--- a/resources/profiles/Qidi/machine/Qidi
+++ b/resources/profiles/Qidi/machine/Qidi
@@ -8,5 +8,5 @@
 	"bed_model": "qidi_xsmart3_buildplate_model.stl",
 	"bed_texture": "qidi_xsmart3_buildplate_texture.svg",
 	"hotend_model": "qidi_xseries_gen3_hotend.stl",
-	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA"
+	"default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Generic ASA @Qidi;Generic ABS @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi"
 }
--- a/resources/profiles/Qidi/machine/fdm_qidi_common.json
+++ b/resources/profiles/Qidi/machine/fdm_qidi_common.json
@@ -125,7 +125,7 @@
 		"1"
 	],
 	"default_filament_profile": [
-		"Qidi Generic PLA"
+		"Generic PLA @Qidi"
 	],
 	"default_print_profile": "0.20mm Standard @QIDI",
 	"bed_exclude_area": [