diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json
index 08a2d6a230..ecceff5a8a 100644
--- a/resources/profiles/Qidi.json
+++ b/resources/profiles/Qidi.json
@@ -1,6 +1,6 @@
 {
 	"name": "Qidi",
-	"version": "02.04.00.10",
+	"version": "02.04.00.11",
 	"force_update": "0",
 	"description": "Qidi configurations",
 	"machine_model_list": [
diff --git a/resources/profiles/Qidi/filament/X5/Bambu ABS @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Bambu ABS @X-Plus 5.json
index 1464576f61..0e0fdb08b0 100644
--- a/resources/profiles/Qidi/filament/X5/Bambu ABS @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/Bambu ABS @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFB99",
+	"filament_id": "OFhuaUQB",
 	"name": "Bambu ABS@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/Bambu PETG @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Bambu PETG @X-Plus 5.json
index 0a4d2ce22c..ef6ea57354 100644
--- a/resources/profiles/Qidi/filament/X5/Bambu PETG @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/Bambu PETG @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFG99",
+	"filament_id": "OFLYDngx",
 	"name": "Bambu PETG@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/Bambu PLA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Bambu PLA @X-Plus 5.json
index 7660c8174d..ad90cb8a81 100644
--- a/resources/profiles/Qidi/filament/X5/Bambu PLA @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/Bambu PLA @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFL99",
+	"filament_id": "OF1dpPrW",
 	"name": "Bambu PLA@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/Generic PLA+ @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Generic PLA+ @X-Plus 5.json
index e1d40b179f..72d7b6f9c6 100644
--- a/resources/profiles/Qidi/filament/X5/Generic PLA+ @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/Generic PLA+ @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFL99",
+	"filament_id": "OFEWYR89",
 	"name": "Generic PLA+@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @X-Plus 5.json
index 3f5987240c..323fcf3e90 100644
--- a/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/HATCHBOX ABS @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFB99",
+	"filament_id": "OFwLBAGf",
 	"name": "HATCHBOX ABS@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @X-Plus 5.json
index 5f794e561c..6f0495c45b 100644
--- a/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PETG @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFG99",
+	"filament_id": "OFIWMSGX",
 	"name": "HATCHBOX PETG@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @X-Plus 5.json
index 094e540793..7ee05c27f7 100644
--- a/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/HATCHBOX PLA @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFL99",
+	"filament_id": "OFeelsSM",
 	"name": "HATCHBOX PLA@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/Overture ABS @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Overture ABS @X-Plus 5.json
index ea12b78ead..82863e8d80 100644
--- a/resources/profiles/Qidi/filament/X5/Overture ABS @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/Overture ABS @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFB99",
+	"filament_id": "OFK8XHPn",
 	"name": "Overture ABS@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/Overture PLA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Overture PLA @X-Plus 5.json
index 571eb2bbeb..0dbb498feb 100644
--- a/resources/profiles/Qidi/filament/X5/Overture PLA @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/Overture PLA @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFL99",
+	"filament_id": "OFc3xdm9",
 	"name": "Overture PLA@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/PolyLite ABS @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/PolyLite ABS @X-Plus 5.json
index 48b6caa32b..1cf57f8ce3 100644
--- a/resources/profiles/Qidi/filament/X5/PolyLite ABS @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/PolyLite ABS @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFB99",
+	"filament_id": "OFOvv91M",
 	"name": "PolyLite ABS@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/PolyLite PLA @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/PolyLite PLA @X-Plus 5.json
index 5b37f7ae8a..4702c9ba1c 100644
--- a/resources/profiles/Qidi/filament/X5/PolyLite PLA @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/PolyLite PLA @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFL99",
+	"filament_id": "OF5CgdDq",
 	"name": "PolyLite PLA@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @X-Plus 5.json b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @X-Plus 5.json
index f3c54e81f1..233542bab1 100644
--- a/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @X-Plus 5.json	
+++ b/resources/profiles/Qidi/filament/X5/Polymaker PLA-HT @X-Plus 5.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFL99",
+	"filament_id": "OFfYHK5z",
 	"name": "Polymaker PLA-HT@X-Plus 5-Series",
 	"from": "system",
 	"instantiation": "false",
diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json
index 9a6fab7942..65b1d12a3a 100644
--- a/resources/profiles/Snapmaker.json
+++ b/resources/profiles/Snapmaker.json
@@ -1,6 +1,6 @@
 {
 	"name": "Snapmaker",
-	"version": "02.04.00.09",
+	"version": "02.04.00.10",
 	"force_update": "0",
 	"description": "Snapmaker configurations",
 	"machine_model_list": [
diff --git a/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json
index c706ba776d..0e743d7aee 100644
--- a/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json	
+++ b/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json	
@@ -4,6 +4,7 @@
 	"inherits": "Polymaker PLA @U1 base",
 	"from": "system",
 	"setting_id": "thXfSaUkOAKJ50ey",
+	"filament_id": "OF44ERDr",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Polymaker PLA @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker PLA @U1 base.json
index b27c48f720..ae420e8912 100644
--- a/resources/profiles/Snapmaker/filament/Polymaker PLA @U1 base.json	
+++ b/resources/profiles/Snapmaker/filament/Polymaker PLA @U1 base.json	
@@ -3,7 +3,7 @@
 	"name": "Polymaker PLA @U1 base",
 	"inherits": "fdm_filament_pla",
 	"from": "system",
-	"filament_id": "OGFL99",
+	"filament_id": "OFelDBgv",
 	"instantiation": "false",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
@@ -48,7 +48,7 @@
 		"nil"
 	],
 	"filament_vendor": [
-		"Generic"
+		"Polymaker"
 	],
 	"filament_scarf_seam_type": [
 		"none"
diff --git a/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json
index b6bd119022..990cc483f3 100644
--- a/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json	
+++ b/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json	
@@ -4,6 +4,7 @@
 	"inherits": "Polymaker PLA @U1 base",
 	"from": "system",
 	"setting_id": "h8vIYpXbxFtHPV6e",
+	"filament_id": "OFH57ibH",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json
index e5c2c7d7f6..1dad000fb2 100644
--- a/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json	
+++ b/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json	
@@ -4,6 +4,7 @@
 	"inherits": "Polymaker PLA @U1 base",
 	"from": "system",
 	"setting_id": "d6CC81Es2hp46bto",
+	"filament_id": "OFgdaBOt",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 base2.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 base2.json
index 0ad75759a1..4f934b93a3 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 base2.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 base2.json	
@@ -3,7 +3,7 @@
 	"name": "Snapmaker PETG HF @U1 base2",
 	"inherits": "fdm_filament_petg",
 	"from": "system",
-	"filament_id": "GFG96",
+	"filament_id": "OFL9aRjN",
 	"instantiation": "false",
 	"cool_plate_temp": [
 		"0"
@@ -177,7 +177,7 @@
 		"nil"
 	],
 	"filament_vendor": [
-		"Generic"
+		"Snapmaker"
 	],
 	"filament_prime_volume": [
 		"45"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 base.json
index eb18fb4838..6b51cd2535 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 base.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 base.json	
@@ -3,6 +3,6 @@
 	"name": "Snapmaker PETG Translucent @U1 base",
 	"inherits": "fdm_filament_petg",
 	"from": "system",
-	"filament_id": "PETG_TRANSLUCENT_001",
+	"filament_id": "OFW8lqnb",
 	"instantiation": "false"
 }
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1 base.json
index adf7624e1f..d6e7e209c6 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1 base.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1 base.json	
@@ -2,8 +2,11 @@
 	"type": "filament",
 	"name": "Snapmaker PLA Basic @U1 base",
 	"from": "system",
-	"filament_id": "1417031127011",
+	"filament_id": "OFhmxnYw",
 	"instantiation": "false",
+	"filament_vendor": [
+		"Snapmaker"
+	],
 	"filament_end_gcode": [
 		""
 	],
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json
index 990e67a79e..219e8075e5 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json	
@@ -4,6 +4,7 @@
 	"inherits": "Snapmaker PLA Basic @U1 base",
 	"from": "system",
 	"setting_id": "iybaFWrXKOsmXgMJ",
+	"filament_id": "OFOPU1xv",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 base.json
index ad3c1f4bbb..e69ca63254 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 base.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 base.json	
@@ -3,7 +3,7 @@
 	"name": "Snapmaker PLA Glow @U1 base",
 	"inherits": "fdm_filament_pla",
 	"from": "system",
-	"filament_id": "SPGLOW001",
+	"filament_id": "OFfD87Gy",
 	"instantiation": "false",
 	"filament_end_gcode": [
 		""
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base2.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base2.json
index 6c0dcf26fd..109dbc19e7 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base2.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base2.json	
@@ -2,8 +2,11 @@
 	"type": "filament",
 	"name": "Snapmaker PLA Matte @U1 base2",
 	"from": "system",
-	"filament_id": "141703112701",
+	"filament_id": "OFF9cgY5",
 	"instantiation": "false",
+	"filament_vendor": [
+		"Snapmaker"
+	],
 	"filament_end_gcode": [
 		""
 	],
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json
index 5eb860506c..e4fdb8016b 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "Snapmaker PLA Basic @U1 base",
 	"from": "system",
 	"setting_id": "Q5xH6oGGlbXr14Pa",
-	"filament_id": "11813638720",
+	"filament_id": "OFWgFOjn",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.2 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json
index 5df6ff5a3a..b144ce86dd 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "Snapmaker PLA Basic @U1 base",
 	"from": "system",
 	"setting_id": "2pieDQoz9PiDCnU1",
-	"filament_id": "11813638720",
+	"filament_id": "OFWgFOjn",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.6 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json
index 0758372ea0..aa92e97d18 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "Snapmaker PLA Basic @U1 base",
 	"from": "system",
 	"setting_id": "f3H0JFUnds0mkKCN",
-	"filament_id": "11813638720",
+	"filament_id": "OFWgFOjn",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.8 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json
index c68904ffd9..6b6030b919 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json	
@@ -4,7 +4,7 @@
 	"inherits": "Snapmaker PLA Basic @U1 base",
 	"from": "system",
 	"setting_id": "9PkHSwtXFM0zPWth",
-	"filament_id": "11813638720",
+	"filament_id": "OFWgFOjn",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base2.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base2.json
index 84889e3d9b..41876b04bb 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base2.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base2.json	
@@ -2,7 +2,7 @@
 	"type": "filament",
 	"name": "Snapmaker PLA SnapSpeed @U1 base2",
 	"from": "system",
-	"filament_id": "141703112701",
+	"filament_id": "OFwhLMs4",
 	"instantiation": "false",
 	"activate_air_filtration": [
 		"0"
@@ -195,7 +195,7 @@
 		"100"
 	],
 	"filament_vendor": [
-		"snapmaker"
+		"Snapmaker"
 	],
 	"filament_wipe": [
 		"nil"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 base.json
index 4f4842ae1d..1ed79183c9 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 base.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 base.json	
@@ -3,7 +3,7 @@
 	"name": "Snapmaker PLA Translucent @U1 base",
 	"inherits": "fdm_filament_pla",
 	"from": "system",
-	"filament_id": "SPTR001",
+	"filament_id": "OFLTYJW0",
 	"instantiation": "false",
 	"filament_end_gcode": [
 		""
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json
index 4768ac2783..283d5876b7 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_pla",
 	"from": "system",
 	"setting_id": "XvizDDHbds3bVrzi",
-	"filament_id": "GFL9922",
+	"filament_id": "OFdd8ZqJ",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json
index 43d306ebae..09555457d5 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_pla",
 	"from": "system",
 	"setting_id": "Kp77DCcitdmoyjqm",
-	"filament_id": "GFL9922",
+	"filament_id": "OFdd8ZqJ",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.6 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json
index da788a35fb..4a5a04a5ee 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_pla",
 	"from": "system",
 	"setting_id": "nBYnNiqwLo6nAsqi",
-	"filament_id": "GFL9922",
+	"filament_id": "OFdd8ZqJ",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.8 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json
index b986a7244a..44aeab2a48 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_pla",
 	"from": "system",
 	"setting_id": "2INwruC3ZVkBTdUT",
-	"filament_id": "GFL98111",
+	"filament_id": "OFf52D4e",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json
index dcb6392634..6f09ea5d6a 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_pla",
 	"from": "system",
 	"setting_id": "CKfdL85SvbOLzMuP",
-	"filament_id": "GFL98111",
+	"filament_id": "OFhQf8ou",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.6 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json
index 1e6e961497..564e59e1a9 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_pla",
 	"from": "system",
 	"setting_id": "fhhnfJm4dN9FXpWQ",
-	"filament_id": "GFL98111",
+	"filament_id": "OFhQf8ou",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.8 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json
index 6ae8a5b675..afb529e983 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_tpu",
 	"from": "system",
 	"setting_id": "uQCplebxmpBpzsnk",
-	"filament_id": "GFU99",
+	"filament_id": "OFY7jxcS",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"3.2"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json
index 45f0f7a0e9..8cf3452469 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_tpu",
 	"from": "system",
 	"setting_id": "w4Hpl2qNPmgNvaeM",
-	"filament_id": "GFU99",
+	"filament_id": "OFY7jxcS",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"3.5"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json
index e89397849b..8f6ba9663f 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_tpu",
 	"from": "system",
 	"setting_id": "T4MmgICRrSzvmCZ5",
-	"filament_id": "GFU99",
+	"filament_id": "OFY7jxcS",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"3.2"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json
index 1085c84e6f..b9619dcca5 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_tpu",
 	"from": "system",
 	"setting_id": "Q2svXpkEqg0dCdq3",
-	"filament_id": "GFU99",
+	"filament_id": "OFXSvqOX",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.6 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json
index bef4c7712f..4283ac2651 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_tpu",
 	"from": "system",
 	"setting_id": "RjsE08h3l37cAkAs",
-	"filament_id": "GFU99",
+	"filament_id": "OFXSvqOX",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.8 nozzle)"
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json
index 5e0696d906..816b78ceb8 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json	
@@ -4,7 +4,7 @@
 	"inherits": "fdm_filament_tpu",
 	"from": "system",
 	"setting_id": "KwcwmV2UmZUgCBoz",
-	"filament_id": "GFU99",
+	"filament_id": "OFXSvqOX",
 	"instantiation": "true",
 	"compatible_printers": [
 		"Snapmaker U1 (0.4 nozzle)"
diff --git a/resources/profiles/re3D.json b/resources/profiles/re3D.json
index 94cca3c2ef..9a00807c1a 100644
--- a/resources/profiles/re3D.json
+++ b/resources/profiles/re3D.json
@@ -1,7 +1,7 @@
 {
     "name":  "re3D",
     "url":  "",
-    "version":  "03.00.08",
+    "version":  "03.00.09",
     "force_update":  "0",
     "description":  "re3D configurations",
     "machine_model_list":  [
diff --git a/resources/profiles/re3D/filament/re3D PC.json b/resources/profiles/re3D/filament/re3D PC.json
index d06438c3bd..dbd43758de 100644
--- a/resources/profiles/re3D/filament/re3D PC.json	
+++ b/resources/profiles/re3D/filament/re3D PC.json	
@@ -4,7 +4,7 @@
 	"from": "system",
 	"instantiation": "true",
 	"inherits": "fdm_filament_pc",
-	"filament_id": "OFU3QXL7",
+	"filament_id": "OFwbsgWj",
 	"setting_id": "eSR00TZTotTvJs8l",
 	"filament_settings_id": [
 		"re3D PC"
diff --git a/resources/profiles/re3D/filament/re3D PETG.json b/resources/profiles/re3D/filament/re3D PETG.json
index 8337cbf61a..273ef5165b 100644
--- a/resources/profiles/re3D/filament/re3D PETG.json	
+++ b/resources/profiles/re3D/filament/re3D PETG.json	
@@ -4,7 +4,7 @@
 	"from": "system",
 	"instantiation": "true",
 	"inherits": "fdm_filament_pet",
-	"filament_id": "OF3F63OE",
+	"filament_id": "OFX0etlv",
 	"setting_id": "msXDK31R8KOvqNqK",
 	"filament_settings_id": [
 		"re3D PETG"
diff --git a/resources/profiles/re3D/filament/re3D PLA.json b/resources/profiles/re3D/filament/re3D PLA.json
index 5e8bf16a63..7637049e80 100644
--- a/resources/profiles/re3D/filament/re3D PLA.json	
+++ b/resources/profiles/re3D/filament/re3D PLA.json	
@@ -4,7 +4,7 @@
 	"from": "system",
 	"instantiation": "true",
 	"inherits": "fdm_filament_pla",
-	"filament_id": "OFRyOsZj",
+	"filament_id": "OFDdEaoL",
 	"setting_id": "nPpDwvFg7WQr7K3t",
 	"filament_settings_id": [
 		"re3D PLA"
diff --git a/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json b/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json
index 0ac0d012f5..ffe4277113 100644
--- a/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json	
+++ b/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFG01",
+	"filament_id": "OFmCOW2Y",
 	"setting_id": "WlELqPVnuL7DaTxs",
 	"name": "re3D rPETG @0.8 nozzle",
 	"from": "system",
diff --git a/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json b/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json
index 8cd090fc06..888880055f 100644
--- a/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json	
+++ b/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json	
@@ -1,6 +1,6 @@
 {
 	"type": "filament",
-	"filament_id": "GFG01",
+	"filament_id": "OFmCOW2Y",
 	"setting_id": "sHzO2S3mmE6Iqs2O",
 	"name": "re3D rPETG @1.75 nozzle",
 	"from": "system",
diff --git a/resources/profiles/re3D/filament/re3D rPETG.json b/resources/profiles/re3D/filament/re3D rPETG.json
index fe19f12539..85f359d828 100644
--- a/resources/profiles/re3D/filament/re3D rPETG.json	
+++ b/resources/profiles/re3D/filament/re3D rPETG.json	
@@ -5,7 +5,7 @@
 	"renamed_from": "re3D Greengate rPETG",
 	"instantiation": "true",
 	"inherits": "fdm_filament_pet",
-	"filament_id": "GFG01",
+	"filament_id": "OFD8loeT",
 	"setting_id": "6aESuJ2S2Kogd4Lq",
 	"filament_settings_id": [
 		"re3D rPETG"
diff --git a/resources/profiles/re3D/filament/re3D rPP.json b/resources/profiles/re3D/filament/re3D rPP.json
index 057e88413b..c4d2d776a9 100644
--- a/resources/profiles/re3D/filament/re3D rPP.json	
+++ b/resources/profiles/re3D/filament/re3D rPP.json	
@@ -4,7 +4,7 @@
 	"from": "system",
 	"instantiation": "true",
 	"inherits": "fdm_filament_pp",
-	"filament_id": "OFfHGM1D",
+	"filament_id": "OFm8rqoY",
 	"setting_id": "8PB62qm5Cd3SHLf4",
 	"filament_settings_id": [
 		"re3D rPP"
diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json
index fd99602923..241b4cbb9f 100644
--- a/resources/profiles/retired_filament_ids.json
+++ b/resources/profiles/retired_filament_ids.json
@@ -2328,6 +2328,12 @@
    ],
    "successor": "OFhQfUQY"
   },
+  "OFSTCno1": {
+   "claims": [
+    "re3D/re3D Greengate rPETG"
+   ],
+   "successor": "OFmCOW2Y"
+  },
   "OGFA00": {
    "claims": [
     "OrcaFilamentLibrary/Bambu PLA Basic"
diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json
index 4349592b25..c8ae5b34be 100644
--- a/scripts/filament_id_snapshot.json
+++ b/scripts/filament_id_snapshot.json
@@ -163,6 +163,33 @@
   "Artillery/Artillery TPU",
   "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle",
   "BBL/Generic SBS",
+  "BBL/addnorth ABS rABS",
+  "BBL/addnorth PA Adura",
+  "BBL/addnorth PA Adura FDA",
+  "BBL/addnorth PA-CF Adura X",
+  "BBL/addnorth PA6 Addlantis",
+  "BBL/addnorth PC BLend HT LCF",
+  "BBL/addnorth PETG Base",
+  "BBL/addnorth PETG ESD",
+  "BBL/addnorth PETG Economy",
+  "BBL/addnorth PETG Flame v0",
+  "BBL/addnorth PETG PRO Matte",
+  "BBL/addnorth PETG rPETG Matte",
+  "BBL/addnorth PETG-CF Rigid X",
+  "BBL/addnorth PLA E-PLA",
+  "BBL/addnorth PLA Economy",
+  "BBL/addnorth PLA HT-PLA PRO Matte",
+  "BBL/addnorth PLA Premium Silk",
+  "BBL/addnorth PLA Textura",
+  "BBL/addnorth PLA Wood",
+  "BBL/addnorth PLA X-PLA",
+  "BBL/addnorth PLA X-PLA High Speed",
+  "BBL/addnorth PLA rPLA RE-ADD",
+  "BBL/addnorth PLA-CF Carbon Fiber",
+  "BBL/addnorth PVDF Adamant S1",
+  "BBL/addnorth TPU EasyFlex",
+  "BBL/addnorth TPU Pro Matte 85A",
+  "BBL/addnorth TPU Pro Matte 95A",
   "Chuanying/Chuanying ABS @Chuanying X1 0.25 Nozzle",
   "Chuanying/Chuanying Generic HIPS",
   "Chuanying/Chuanying Generic PVA",
@@ -989,6 +1016,9 @@
   "Snapmaker/PolyTerra Dual PLA @0.2 nozzle",
   "Snapmaker/PolyTerra J1 PLA",
   "Snapmaker/PolyTerra J1 PLA @0.2 nozzle",
+  "Snapmaker/Polymaker General PLA Family @U1",
+  "Snapmaker/Polymaker Silk PLA Family @U1",
+  "Snapmaker/Polymaker Tough PLA Family @U1",
   "Snapmaker/Snapmaker ABS Benchy @U1",
   "Snapmaker/Snapmaker Dual ABS Benchy",
   "Snapmaker/Snapmaker Dual TPE",
@@ -997,7 +1027,12 @@
   "Snapmaker/Snapmaker J1 TPE",
   "Snapmaker/Snapmaker J1 TPU High-Flow",
   "Snapmaker/Snapmaker PET @Dual",
+  "Snapmaker/Snapmaker PLA Full Spectrum @U1 0.4 nozzle",
   "Snapmaker/Snapmaker PLA Matte @U1",
+  "Snapmaker/Snapmaker PLA Silk @U1",
+  "Snapmaker/Snapmaker PLA Silk @U1 0.2 nozzle",
+  "Snapmaker/Snapmaker PLA Silk @U1 0.6 nozzle",
+  "Snapmaker/Snapmaker PLA Silk @U1 0.8 nozzle",
   "Snapmaker/Snapmaker TPE",
   "Snapmaker/Snapmaker TPE @U1",
   "Snapmaker/Snapmaker TPU High-Flow @U1",
@@ -1216,6 +1251,9 @@
   "GFA18": [
    "BBL/Bambu PLA Lite"
   ],
+  "GFA19": [
+   "BBL/Bambu PLA Pure"
+  ],
   "GFA50": [
    "BBL/Bambu PLA-CF"
   ],
@@ -1574,6 +1612,87 @@
   "GFU99": [
    "BBL/Generic TPU"
   ],
+  "GF_ANAD": [
+   "BBL/addnorth PA Adura"
+  ],
+  "GF_ANAF": [
+   "BBL/addnorth PA Adura FDA"
+  ],
+  "GF_ANAX": [
+   "BBL/addnorth PA-CF Adura X"
+  ],
+  "GF_ANEF": [
+   "BBL/addnorth TPU EasyFlex"
+  ],
+  "GF_ANEG": [
+   "BBL/addnorth PETG ESD"
+  ],
+  "GF_ANEP": [
+   "BBL/addnorth PLA E-PLA"
+  ],
+  "GF_ANGE": [
+   "BBL/addnorth PETG Economy"
+  ],
+  "GF_ANHTP": [
+   "BBL/addnorth PLA HT-PLA PRO Matte"
+  ],
+  "GF_ANLA": [
+   "BBL/addnorth PA6 Addlantis"
+  ],
+  "GF_ANPBX": [
+   "BBL/addnorth PC BLend HT LCF"
+  ],
+  "GF_ANPCF": [
+   "BBL/addnorth PLA-CF Carbon Fiber"
+  ],
+  "GF_ANPE": [
+   "BBL/addnorth PETG Base"
+  ],
+  "GF_ANPF": [
+   "BBL/addnorth PETG Flame v0"
+  ],
+  "GF_ANPL": [
+   "BBL/addnorth PLA Economy"
+  ],
+  "GF_ANPLW": [
+   "BBL/addnorth PLA Wood"
+  ],
+  "GF_ANPM": [
+   "BBL/addnorth PETG PRO Matte"
+  ],
+  "GF_ANPS": [
+   "BBL/addnorth PLA Premium Silk"
+  ],
+  "GF_ANPV": [
+   "BBL/addnorth PVDF Adamant S1"
+  ],
+  "GF_ANRA": [
+   "BBL/addnorth ABS rABS"
+  ],
+  "GF_ANRM": [
+   "BBL/addnorth PETG rPETG Matte"
+  ],
+  "GF_ANRPL": [
+   "BBL/addnorth PLA rPLA RE-ADD"
+  ],
+  "GF_ANRX": [
+   "BBL/addnorth PETG-CF Rigid X"
+  ],
+  "GF_ANTA": [
+   "BBL/addnorth TPU Pro Matte 85A"
+  ],
+  "GF_ANTE": [
+   "BBL/addnorth PLA Textura"
+  ],
+  "GF_ANTM": [
+   "BBL/addnorth TPU Pro Matte 95A"
+  ],
+  "GF_ANXP": [
+   "BBL/addnorth PLA X-PLA"
+  ],
+  "GF_ANXPH": [
+   "BBL/addnorth PLA X-PLA High Speed"
+  ],
   "OF016CJw": [
    "Sovol/Sovol SV08 ABS"
   ],
@@ -1775,6 +1894,9 @@
   "OF43Raws": [
    "Snapmaker/PolyTerra J1 PLA"
   ],
+  "OF44ERDr": [
+   "Snapmaker/Polymaker General PLA Family"
+  ],
   "OF44VYzK": [
    "OrcaFilamentLibrary/FilAr PETG Azul Francia"
   ],
@@ -2256,6 +2378,9 @@
   "OFD6kN7F": [
    "OrcaArena/OrcaArena Generic PLA"
   ],
+  "OFD8loeT": [
+   "re3D/re3D rPETG"
+  ],
   "OFD9taow": [
    "FlyingBear/FlyingBear PLA Hyper"
   ],
@@ -2290,6 +2415,9 @@
    "Sovol/Generic PLA",
    "Z-Bolt/Generic PLA"
   ],
+  "OFDdEaoL": [
+   "re3D/re3D PLA"
+  ],
   "OFDe8uyM": [
    "OrcaFilamentLibrary/Valment PLA"
   ],
@@ -2486,6 +2614,9 @@
   "OFH2nN08": [
    "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850"
   ],
+  "OFH57ibH": [
+   "Snapmaker/Polymaker Silk PLA Family"
+  ],
   "OFH5UH6P": [
    "Flashforge/Flashforge ABS-GF"
   ],
@@ -2715,6 +2846,9 @@
   "OFKyCgaK": [
    "Anycubic/Anycubic Generic PLA"
   ],
+  "OFL9aRjN": [
+   "Snapmaker/Snapmaker PETG HF"
+  ],
   "OFLAXKqP": [
    "WonderMaker/WonderMaker TPU 95A"
   ],
@@ -2743,6 +2877,9 @@
    "OrcaFilamentLibrary/Generic ASA",
    "RH3D/Generic ASA"
   ],
+  "OFLTYJW0": [
+   "Snapmaker/Snapmaker PLA Translucent"
+  ],
   "OFLXvuMr": [
    "Elegoo/Elegoo Rapid PETG",
    "OrcaFilamentLibrary/Elegoo Rapid PETG"
@@ -2954,6 +3091,9 @@
   "OFOKYhi6": [
    "Prusa/Prusa Generic PETG HF"
   ],
+  "OFOPU1xv": [
+   "Snapmaker/Snapmaker PLA Full Spectrum"
+  ],
   "OFObG16Q": [
    "InfiMech/InfiMech PLA Basic"
   ],
@@ -3188,9 +3328,6 @@
   "OFSStjay": [
    "FLSun/FLSun S1 PLA Silk"
   ],
-  "OFSTCno1": [
-   "re3D/re3D Greengate rPETG"
-  ],
   "OFSa39yP": [
    "Snapmaker/Snapmaker J1 PLA"
   ],
@@ -3352,6 +3489,9 @@
   "OFW5FqkL": [
    "Qidi/QIDI PLA Rapido Silk"
   ],
+  "OFW8lqnb": [
+   "Snapmaker/Snapmaker PETG Translucent"
+  ],
   "OFW9uIkE": [
    "Tiertime/Tiertime Generic HIPS"
   ],
@@ -3409,6 +3549,9 @@
   "OFWzr7m0": [
    "Anycubic/Anycubic Generic PETG"
   ],
+  "OFX0etlv": [
+   "re3D/re3D PETG"
+  ],
   "OFX0ycRQ": [
    "OrcaFilamentLibrary/Fiberon PA12-CF"
   ],
@@ -3424,6 +3567,9 @@
   "OFXJ9iom": [
    "iQ/Grauts HPP4GF25 P1"
   ],
+  "OFXSvqOX": [
+   "Snapmaker/Snapmaker TPU 95A HF"
+  ],
   "OFXTPuqV": [
    "OrcaFilamentLibrary/Elas PETG Basic"
   ],
@@ -3473,6 +3619,9 @@
   "OFY3AB7j": [
    "Snapmaker/Snapmaker J1 PLA Matte"
   ],
+  "OFY7jxcS": [
+   "Snapmaker/Snapmaker TPU 90A"
+  ],
   "OFY9muEs": [
    "Anycubic/Generic ABS",
    "Creality/Generic ABS",
@@ -3738,6 +3887,9 @@
   "OFdb8YNz": [
    "OrcaFilamentLibrary/FilAr PLA Verde Manzana"
   ],
+  "OFdd8ZqJ": [
+   "Snapmaker/Snapmaker PLA Wood"
+  ],
   "OFdkWDiy": [
    "Cubicon/Cubicon PLAi21"
   ],
@@ -3822,6 +3974,9 @@
   "OFf0MkD5": [
    "Qidi/QIDI PETG Translucent"
   ],
+  "OFf52D4e": [
+   "Snapmaker/Snapmaker PLA-CF"
+  ],
   "OFf5awy4": [
    "OrcaFilamentLibrary/Eolas Prints PLA Matte"
   ],
@@ -3837,6 +3992,9 @@
   "OFfBpSRI": [
    "OrcaFilamentLibrary/Bambu ASA"
   ],
+  "OFfD87Gy": [
+   "Snapmaker/Snapmaker PLA Glow"
+  ],
   "OFfHGM1D": [
    "re3D/re3D rPP"
   ],
@@ -3846,6 +4004,9 @@
   "OFfSqS4R": [
    "Creality/ENDER FAST PLA"
   ],
+  "OFfYHK5z": [
+   "Qidi/Polymaker PLA-HT"
+  ],
   "OFfZ0lTS": [
    "Qidi/Qidi Generic PETG-CF"
   ],
@@ -3943,6 +4104,9 @@
   "OFgcryz4": [
    "Ratrig/RatRig BigNozzle ASA"
   ],
+  "OFgdaBOt": [
+   "Snapmaker/Polymaker Tough PLA Family"
+  ],
   "OFgeM7nD": [
    "Flashforge/Flashforge PA12-CF"
   ],
@@ -4030,6 +4194,9 @@
    "BBL/COEX PLA",
    "OrcaFilamentLibrary/COEX PLA"
   ],
+  "OFhmxnYw": [
+   "Snapmaker/Snapmaker PLA Basic"
+  ],
   "OFhuaUQB": [
    "OrcaFilamentLibrary/Bambu ABS",
    "Qidi/Bambu ABS"
@@ -4272,6 +4439,12 @@
   "OFm70lLt": [
    "CoLiDo/CoLiDo PLA"
   ],
+  "OFm8rqoY": [
+   "re3D/re3D rPP"
+  ],
+  "OFmCOW2Y": [
+   "re3D/re3D rPETG"
+  ],
   "OFmFwUWM": [
    "Prusa/Prusament ASA"
   ],
@@ -4849,6 +5022,9 @@
   "OFwaYjL6": [
    "OrcaFilamentLibrary/Fiberon PA6-GF"
   ],
+  "OFwbsgWj": [
+   "re3D/re3D PC"
+  ],
   "OFwhLMs4": [
    "Snapmaker/Snapmaker PLA SnapSpeed"
   ],
@@ -5496,20 +5672,146 @@
   ],
   "QD_3_1_8": [
    "Qidi/QIDI PLA Matte Basic"
+  ],
+  "QD_4_0_1": [
+   "Qidi/Generic PLA"
+  ],
+  "QD_4_0_11": [
+   "Qidi/Generic ABS"
+  ],
+  "QD_4_0_23": [
+   "Qidi/Generic PC"
+  ],
+  "QD_4_0_4": [
+   "Qidi/Generic PLA Silk"
+  ],
+  "QD_4_0_41": [
+   "Qidi/Generic PETG"
+  ],
+  "QD_4_0_50": [
+   "Qidi/Generic TPU 95A"
+  ],
+  "QD_4_1_1": [
+   "Qidi/QIDI PLA Rapido"
+  ],
+  "QD_4_1_11": [
+   "Qidi/QIDI ABS Rapido"
+  ],
+  "QD_4_1_12": [
+   "Qidi/QIDI ABS-GF"
+  ],
+  "QD_4_1_13": [
+   "Qidi/QIDI ABS Rapido Metal"
+  ],
+  "QD_4_1_14": [
+   "Qidi/QIDI ABS Odorless"
+  ],
+  "QD_4_1_15": [
+   "Qidi/QIDI TPU-GF"
+  ],
+  "QD_4_1_18": [
+   "Qidi/QIDI ASA"
+  ],
+  "QD_4_1_19": [
+   "Qidi/QIDI ASA-Aero"
+  ],
+  "QD_4_1_2": [
+   "Qidi/QIDI PLA Rapido Matte"
+  ],
+  "QD_4_1_20": [
+   "Qidi/QIDI ASA-CF"
+  ],
+  "QD_4_1_24": [
+   "Qidi/QIDI UltraPA"
+  ],
+  "QD_4_1_25": [
+   "Qidi/QIDI PA6-CF"
+  ],
+  "QD_4_1_26": [
+   "Qidi/QIDI UltraPA-CF25"
+  ],
+  "QD_4_1_27": [
+   "Qidi/QIDI PA12-CF"
+  ],
+  "QD_4_1_3": [
+   "Qidi/QIDI PLA Rapido Metal"
+  ],
+  "QD_4_1_30": [
+   "Qidi/QIDI PAHT-CF"
+  ],
+  "QD_4_1_31": [
+   "Qidi/QIDI PAHT-GF"
+  ],
+  "QD_4_1_32": [
+   "Qidi/QIDI Support For PAHT"
+  ],
+  "QD_4_1_33": [
+   "Qidi/QIDI Support For PET/PA"
+  ],
+  "QD_4_1_34": [
+   "Qidi/QIDI PC/ABS-FR"
+  ],
+  "QD_4_1_36": [
+   "Qidi/QIDI PEBA 95A"
+  ],
+  "QD_4_1_37": [
+   "Qidi/QIDI PET-CF"
+  ],
+  "QD_4_1_38": [
+   "Qidi/QIDI PET-GF"
+  ],
+  "QD_4_1_39": [
+   "Qidi/QIDI PETG Basic"
+  ],
+  "QD_4_1_4": [
+   "Qidi/QIDI PLA Silk"
+  ],
+  "QD_4_1_40": [
+   "Qidi/QIDI PETG Tough"
+  ],
+  "QD_4_1_41": [
+   "Qidi/QIDI PETG Rapido"
+  ],
+  "QD_4_1_42": [
+   "Qidi/QIDI PETG-CF"
+  ],
+  "QD_4_1_43": [
+   "Qidi/QIDI PETG-GF"
+  ],
+  "QD_4_1_44": [
+   "Qidi/QIDI PPS-CF"
+  ],
+  "QD_4_1_45": [
+   "Qidi/QIDI PETG Translucent"
+  ],
+  "QD_4_1_46": [
+   "Qidi/QIDI PPS-GF"
+  ],
+  "QD_4_1_49": [
+   "Qidi/QIDI TPU-Aero"
+  ],
+  "QD_4_1_5": [
+   "Qidi/QIDI PLA-CF"
+  ],
+  "QD_4_1_50": [
+   "Qidi/QIDI TPU 95A-HF"
+  ],
+  "QD_4_1_6": [
+   "Qidi/QIDI WOOD Rapido"
+  ],
+  "QD_4_1_7": [
+   "Qidi/QIDI PLA Basic"
+  ],
+  "QD_4_1_8": [
+   "Qidi/QIDI PLA Matte Basic"
   ]
  },
  "instantiated_with_id": [
-  "Afinia/Afinia ABS",
-  "Afinia/Afinia ABS+",
   "Afinia/Afinia ABS+@HS",
   "Afinia/Afinia ABS@HS",
-  "Afinia/Afinia PLA",
   "Afinia/Afinia PLA@HS",
-  "Afinia/Afinia TPU",
   "Afinia/Afinia TPU@HS",
-  "Afinia/Afinia Value ABS",
   "Afinia/Afinia Value ABS@HS",
-  "Afinia/Afinia Value PLA",
   "Afinia/Afinia Value PLA@HS",
   "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle",
   "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle",
@@ -5720,6 +6022,33 @@
   "Artillery/Artillery TPU @Artillery M1 Pro 0.6 nozzle",
   "Artillery/Artillery TPU @Artillery M1 Pro 0.8 nozzle",
   "BBL/Generic SBS",
+  "BBL/addnorth ABS rABS",
+  "BBL/addnorth PA Adura",
+  "BBL/addnorth PA Adura FDA",
+  "BBL/addnorth PA-CF Adura X",
+  "BBL/addnorth PA6 Addlantis",
+  "BBL/addnorth PC BLend HT LCF",
+  "BBL/addnorth PETG Base",
+  "BBL/addnorth PETG ESD",
+  "BBL/addnorth PETG Economy",
+  "BBL/addnorth PETG Flame v0",
+  "BBL/addnorth PETG PRO Matte",
+  "BBL/addnorth PETG rPETG Matte",
+  "BBL/addnorth PETG-CF Rigid X",
+  "BBL/addnorth PLA E-PLA",
+  "BBL/addnorth PLA Economy",
+  "BBL/addnorth PLA HT-PLA PRO Matte",
+  "BBL/addnorth PLA Premium Silk",
+  "BBL/addnorth PLA Textura",
+  "BBL/addnorth PLA Wood",
+  "BBL/addnorth PLA X-PLA",
+  "BBL/addnorth PLA X-PLA High Speed",
+  "BBL/addnorth PLA rPLA RE-ADD",
+  "BBL/addnorth PLA-CF Carbon Fiber",
+  "BBL/addnorth PVDF Adamant S1",
+  "BBL/addnorth TPU EasyFlex",
+  "BBL/addnorth TPU Pro Matte 85A",
+  "BBL/addnorth TPU Pro Matte 95A",
   "Blocks/Blocks Generic ABS",
   "Blocks/Blocks Generic ASA",
   "Blocks/Blocks Generic ASA-CF",
@@ -7881,6 +8210,9 @@
   "Snapmaker/PolyTerra Dual PLA @0.2 nozzle",
   "Snapmaker/PolyTerra J1 PLA",
   "Snapmaker/PolyTerra J1 PLA @0.2 nozzle",
+  "Snapmaker/Polymaker General PLA Family @U1",
+  "Snapmaker/Polymaker Silk PLA Family @U1",
+  "Snapmaker/Polymaker Tough PLA Family @U1",
   "Snapmaker/Snapmaker ABS Benchy @U1",
   "Snapmaker/Snapmaker Dual ABS Benchy",
   "Snapmaker/Snapmaker Dual TPE",
@@ -7889,9 +8221,26 @@
   "Snapmaker/Snapmaker J1 TPE",
   "Snapmaker/Snapmaker J1 TPU High-Flow",
   "Snapmaker/Snapmaker PET @Dual",
+  "Snapmaker/Snapmaker PLA Full Spectrum @U1 0.4 nozzle",
   "Snapmaker/Snapmaker PLA Matte @U1",
+  "Snapmaker/Snapmaker PLA Silk @U1",
+  "Snapmaker/Snapmaker PLA Silk @U1 0.2 nozzle",
+  "Snapmaker/Snapmaker PLA Silk @U1 0.6 nozzle",
+  "Snapmaker/Snapmaker PLA Silk @U1 0.8 nozzle",
+  "Snapmaker/Snapmaker PLA Wood @U1 0.4 nozzle",
+  "Snapmaker/Snapmaker PLA Wood @U1 0.6 nozzle",
+  "Snapmaker/Snapmaker PLA Wood @U1 0.8 nozzle",
+  "Snapmaker/Snapmaker PLA-CF @U1 0.4 nozzle",
+  "Snapmaker/Snapmaker PLA-CF @U1 0.6 nozzle",
+  "Snapmaker/Snapmaker PLA-CF @U1 0.8 nozzle",
   "Snapmaker/Snapmaker TPE",
   "Snapmaker/Snapmaker TPE @U1",
+  "Snapmaker/Snapmaker TPU 90A @U1",
+  "Snapmaker/Snapmaker TPU 90A @U1 0.6 nozzle",
+  "Snapmaker/Snapmaker TPU 90A @U1 0.8 nozzle",
+  "Snapmaker/Snapmaker TPU 95A HF @U1",
+  "Snapmaker/Snapmaker TPU 95A HF @U1 0.6 nozzle",
+  "Snapmaker/Snapmaker TPU 95A HF @U1 0.8 nozzle",
   "Snapmaker/Snapmaker TPU High-Flow @U1",
   "Sovol/Generic PLA Silk @Sovol SV08 MAX",
   "Sovol/Polymaker PETG @Sovol SV08 MAX",
@@ -8070,9 +8419,6 @@
   "iQ/Material4Print ABS Natur P1 @iQ TiQ8 0.4 Nozzle",
   "iQ/Polymaker PETG Polymax black P1 @iQ TiQ2 0.4 Nozzle",
   "iQ/VXL90 TiQ2 P2 @iQ TiQ2 0.4 Nozzle",
-  "re3D/re3D Greengate rPETG",
-  "re3D/re3D Greengate rPETG @0.8 nozzle",
-  "re3D/re3D Greengate rPETG @1.75 nozzle",
   "re3D/re3D PC",
   "re3D/re3D PC @0.4 nozzle",
   "re3D/re3D PC @0.8 nozzle",
@@ -8082,6 +8428,9 @@
   "re3D/re3D PLA",
   "re3D/re3D PLA @0.4 nozzle",
   "re3D/re3D PLA @0.8 nozzle",
+  "re3D/re3D rPETG",
+  "re3D/re3D rPETG @0.8 nozzle",
+  "re3D/re3D rPETG @1.75 nozzle",
   "re3D/re3D rPP",
   "re3D/re3D rPP @0.8 nozzle",
   "re3D/re3D rPP @1.75 nozzle"
@@ -8522,6 +8871,13 @@
     "PolyTerra J1 PLA"
    ]
   ],
+  "OF44ERDr": [
+   [
+    "Polymaker",
+    "PLA",
+    "Polymaker General PLA Family"
+   ]
+  ],
   "OF44VYzK": [
    [
     "FilAr",
@@ -9628,6 +9984,13 @@
     "OrcaArena Generic PLA"
    ]
   ],
+  "OFD8loeT": [
+   [
+    "re3D",
+    "PETG",
+    "re3D rPETG"
+   ]
+  ],
   "OFD9taow": [
    [
     "FlyingBear",
@@ -9684,6 +10047,13 @@
     "Generic PLA"
    ]
   ],
+  "OFDdEaoL": [
+   [
+    "re3D",
+    "PLA",
+    "re3D PLA"
+   ]
+  ],
   "OFDe8uyM": [
    [
     "Valment",
@@ -10132,6 +10502,13 @@
     "Eolas Prints PLA INGEO 850"
    ]
   ],
+  "OFH57ibH": [
+   [
+    "Polymaker",
+    "PLA",
+    "Polymaker Silk PLA Family"
+   ]
+  ],
   "OFH5UH6P": [
    [
     "Generic",
@@ -10657,6 +11034,13 @@
     "Anycubic Generic PLA"
    ]
   ],
+  "OFL9aRjN": [
+   [
+    "Snapmaker",
+    "PETG",
+    "Snapmaker PETG HF"
+   ]
+  ],
   "OFLAXKqP": [
    [
     "WonderMaker",
@@ -10713,6 +11097,13 @@
     "Generic ASA"
    ]
   ],
+  "OFLTYJW0": [
+   [
+    "Snapmaker",
+    "PLA",
+    "Snapmaker PLA Translucent"
+   ]
+  ],
   "OFLXvuMr": [
    [
     "Elegoo",
@@ -11175,6 +11566,13 @@
     "Prusa Generic PETG HF"
    ]
   ],
+  "OFOPU1xv": [
+   [
+    "Snapmaker",
+    "PLA",
+    "Snapmaker PLA Full Spectrum"
+   ]
+  ],
   "OFObG16Q": [
    [
     "InfiMech",
@@ -11693,13 +12091,6 @@
     "FLSun S1 PLA Silk"
    ]
   ],
-  "OFSTCno1": [
-   [
-    "GreenGate3D",
-    "PETG",
-    "re3D Greengate rPETG"
-   ]
-  ],
   "OFSa39yP": [
    [
     "Snapmaker",
@@ -12071,6 +12462,13 @@
     "QIDI PLA Rapido Silk"
    ]
   ],
+  "OFW8lqnb": [
+   [
+    "Snapmaker",
+    "PETG",
+    "Snapmaker PETG Translucent"
+   ]
+  ],
   "OFW9uIkE": [
    [
     "Generic",
@@ -12197,6 +12595,13 @@
     "Anycubic Generic PETG"
    ]
   ],
+  "OFX0etlv": [
+   [
+    "re3D",
+    "PETG",
+    "re3D PETG"
+   ]
+  ],
   "OFX0ycRQ": [
    [
     "Polymaker",
@@ -12232,6 +12637,13 @@
     "Grauts HPP4GF25 P1"
    ]
   ],
+  "OFXSvqOX": [
+   [
+    "Snapmaker",
+    "TPU",
+    "Snapmaker TPU 95A HF"
+   ]
+  ],
   "OFXTPuqV": [
    [
     "Elas",
@@ -12337,6 +12749,13 @@
     "Snapmaker J1 PLA Matte"
    ]
   ],
+  "OFY7jxcS": [
+   [
+    "Snapmaker",
+    "TPU",
+    "Snapmaker TPU 90A"
+   ]
+  ],
   "OFY9muEs": [
    [
     "Generic",
@@ -12904,6 +13323,13 @@
     "FilAr PLA Verde Manzana"
    ]
   ],
+  "OFdd8ZqJ": [
+   [
+    "Snapmaker",
+    "PLA",
+    "Snapmaker PLA Wood"
+   ]
+  ],
   "OFdkWDiy": [
    [
     "Cubicon",
@@ -13093,6 +13519,13 @@
     "QIDI PETG Translucent"
    ]
   ],
+  "OFf52D4e": [
+   [
+    "Snapmaker",
+    "PLA-CF",
+    "Snapmaker PLA-CF"
+   ]
+  ],
   "OFf5awy4": [
    [
     "Eolas Prints",
@@ -13128,6 +13561,13 @@
     "Bambu ASA"
    ]
   ],
+  "OFfD87Gy": [
+   [
+    "Snapmaker",
+    "PLA",
+    "Snapmaker PLA Glow"
+   ]
+  ],
   "OFfHGM1D": [
    [
     "re3D",
@@ -13149,6 +13589,13 @@
     "ENDER FAST PLA"
    ]
   ],
+  "OFfYHK5z": [
+   [
+    "Polymaker",
+    "PLA",
+    "Polymaker PLA-HT"
+   ]
+  ],
   "OFfZ0lTS": [
    [
     "Generic",
@@ -13345,6 +13792,13 @@
     "RatRig BigNozzle ASA"
    ]
   ],
+  "OFgdaBOt": [
+   [
+    "Polymaker",
+    "PLA",
+    "Polymaker Tough PLA Family"
+   ]
+  ],
   "OFgeM7nD": [
    [
     "Flashforge",
@@ -13534,6 +13988,13 @@
     "COEX PLA"
    ]
   ],
+  "OFhmxnYw": [
+   [
+    "Snapmaker",
+    "PLA",
+    "Snapmaker PLA Basic"
+   ]
+  ],
   "OFhuaUQB": [
    [
     "Bambu Lab",
@@ -14073,6 +14534,20 @@
     "CoLiDo PLA"
    ]
   ],
+  "OFm8rqoY": [
+   [
+    "re3D",
+    "PP",
+    "re3D rPP"
+   ]
+  ],
+  "OFmCOW2Y": [
+   [
+    "re3D",
+    "PETG",
+    "re3D rPETG"
+   ]
+  ],
   "OFmFwUWM": [
    [
     "Prusa Polymers",
@@ -15361,6 +15836,13 @@
     "Fiberon PA6-GF"
    ]
   ],
+  "OFwbsgWj": [
+   [
+    "re3D",
+    "PC",
+    "re3D PC"
+   ]
+  ],
   "OFwhLMs4": [
    [
     "Snapmaker",