Prusa: move filament_ids off shared templates onto family roots

Phase 2 of the filament_id cleanup (31 collision groups, all one mechanism: material-class ids on shared fdm_filament_* templates collapsing HF/-CF/ Prusament lines onto one id, plus 3 overclaims). 18 new @base family roots (owner generic keeps the legacy id, 12 impostor families get deterministic mints), 72 config-neutral inherits repoints, 6 template filament_id keys removed (only where every id-less inheritor is covered by a new root; fdm_filament_asa/pc keep theirs for the frozen Prusament @XL riders), 3 compatible_printers trims on MINIIS printers covered by dedicated @MINIIS variants. Frozen name-shaped and _NN per-variant ids stay byte-identical. Verified: config-equivalence gate zero unexpected diffs; extra check exit 0; --check exit 0; validator -l 2 exit 0; extended -f -v Prusa exit 0 (was 31 groups / 1035 printer-level errors on the pre-apply copy).
2026-08-24 18:37:39 +00:00 · 2026-07-03 00:09:05 +08:00
parent 674344b3c1
commit 095fd9fba4
98 changed files with 340 additions and 125 deletions
--- a/resources/profiles/Prusa.json
+++ b/resources/profiles/Prusa.json
@@ -1448,6 +1448,10 @@
 			"name": "fdm_filament_tpu",
 			"sub_path": "filament/fdm_filament_tpu.json"
 		},
+		{
+			"name": "Prusa Generic ABS @base",
+			"sub_path": "filament/Prusa Generic ABS @base.json"
+		},
 		{
 			"name": "Prusa Generic ABS",
 			"sub_path": "filament/Prusa Generic ABS.json"
@@ -1504,6 +1508,10 @@
 			"name": "Prusa Generic ABS @XL 5T",
 			"sub_path": "filament/Prusa Generic ABS @XL 5T.json"
 		},
+		{
+			"name": "Prusa Generic ABS HF @base",
+			"sub_path": "filament/Prusa Generic ABS HF @base.json"
+		},
 		{
 			"name": "Prusa Generic ABS HF @MINIIS",
 			"sub_path": "filament/Prusa Generic ABS HF @MINIIS.json"
@@ -1576,6 +1584,10 @@
 			"name": "Prusa Generic ASA @MK4S",
 			"sub_path": "filament/Prusa Generic ASA @MK4S.json"
 		},
+		{
+			"name": "Prusa Generic ASA HF @base",
+			"sub_path": "filament/Prusa Generic ASA HF @base.json"
+		},
 		{
 			"name": "Prusa Generic ASA HF @MINIIS",
 			"sub_path": "filament/Prusa Generic ASA HF @MINIIS.json"
@@ -1624,6 +1636,10 @@
 			"name": "Prusa Generic TPU @CORE One",
 			"sub_path": "filament/Prusa Generic TPU @CORE One.json"
 		},
+		{
+			"name": "Prusa Generic PA @base",
+			"sub_path": "filament/Prusa Generic PA @base.json"
+		},
 		{
 			"name": "Prusa Generic PA",
 			"sub_path": "filament/Prusa Generic PA.json"
@@ -1660,6 +1676,10 @@
 			"name": "Prusa Generic PA @MK3.5 0.8",
 			"sub_path": "filament/Prusa Generic PA @MK3.5 0.8.json"
 		},
+		{
+			"name": "Prusa Generic PA-CF @base",
+			"sub_path": "filament/Prusa Generic PA-CF @base.json"
+		},
 		{
 			"name": "Prusa Generic PA-CF",
 			"sub_path": "filament/Prusa Generic PA-CF.json"
@@ -1744,6 +1764,10 @@
 			"name": "Prusa Generic PC @MK3.5 0.8",
 			"sub_path": "filament/Prusa Generic PC @MK3.5 0.8.json"
 		},
+		{
+			"name": "Prusa Generic PC HF @base",
+			"sub_path": "filament/Prusa Generic PC HF @base.json"
+		},
 		{
 			"name": "Prusa Generic PC HF @MINIIS",
 			"sub_path": "filament/Prusa Generic PC HF @MINIIS.json"
@@ -1792,6 +1816,10 @@
 			"name": "Prusament PC-CF @XL 5T",
 			"sub_path": "filament/Prusament PC-CF @XL 5T.json"
 		},
+		{
+			"name": "Prusa Generic PETG @base",
+			"sub_path": "filament/Prusa Generic PETG @base.json"
+		},
 		{
 			"name": "Prusa Generic PETG",
 			"sub_path": "filament/Prusa Generic PETG.json"
@@ -1848,6 +1876,10 @@
 			"name": "Prusa Generic PETG @XL 5T",
 			"sub_path": "filament/Prusa Generic PETG @XL 5T.json"
 		},
+		{
+			"name": "Prusa Generic PETG HF @base",
+			"sub_path": "filament/Prusa Generic PETG HF @base.json"
+		},
 		{
 			"name": "Prusa Generic PETG HF @MINIIS",
 			"sub_path": "filament/Prusa Generic PETG HF @MINIIS.json"
@@ -1876,6 +1908,10 @@
 			"name": "Prusament PETG @CORE One",
 			"sub_path": "filament/Prusament PETG @CORE One.json"
 		},
+		{
+			"name": "Prusament PETG @base",
+			"sub_path": "filament/Prusament PETG @base.json"
+		},
 		{
 			"name": "Prusament PETG @XL",
 			"sub_path": "filament/Prusament PETG @XL.json"
@@ -1884,6 +1920,10 @@
 			"name": "Prusament PETG @XL 5T",
 			"sub_path": "filament/Prusament PETG @XL 5T.json"
 		},
+		{
+			"name": "Prusa Generic PLA @base",
+			"sub_path": "filament/Prusa Generic PLA @base.json"
+		},
 		{
 			"name": "Prusa Generic PLA",
 			"sub_path": "filament/Prusa Generic PLA.json"
@@ -1940,6 +1980,10 @@
 			"name": "Prusa Generic PLA @XL 5T",
 			"sub_path": "filament/Prusa Generic PLA @XL 5T.json"
 		},
+		{
+			"name": "Prusa Generic PLA HF @base",
+			"sub_path": "filament/Prusa Generic PLA HF @base.json"
+		},
 		{
 			"name": "Prusa Generic PLA HF @MINIIS",
 			"sub_path": "filament/Prusa Generic PLA HF @MINIIS.json"
@@ -1968,6 +2012,10 @@
 			"name": "Prusa Generic PLA Silk @CORE One",
 			"sub_path": "filament/Prusa Generic PLA Silk @CORE One.json"
 		},
+		{
+			"name": "Prusa Generic PLA-CF @base",
+			"sub_path": "filament/Prusa Generic PLA-CF @base.json"
+		},
 		{
 			"name": "Prusa Generic PLA-CF",
 			"sub_path": "filament/Prusa Generic PLA-CF.json"
@@ -2008,6 +2056,10 @@
 			"name": "Prusament PLA @CORE One",
 			"sub_path": "filament/Prusament PLA @CORE One.json"
 		},
+		{
+			"name": "Prusament PLA @base",
+			"sub_path": "filament/Prusament PLA @base.json"
+		},
 		{
 			"name": "Prusament PLA @XL",
 			"sub_path": "filament/Prusament PLA @XL.json"
@@ -2020,6 +2072,10 @@
 			"name": "Prusament rPLA @CORE One",
 			"sub_path": "filament/Prusament rPLA @CORE One.json"
 		},
+		{
+			"name": "Prusament rPLA @base",
+			"sub_path": "filament/Prusament rPLA @base.json"
+		},
 		{
 			"name": "Prusament rPLA @XL",
 			"sub_path": "filament/Prusament rPLA @XL.json"
@@ -2028,6 +2084,10 @@
 			"name": "Prusament rPLA @XL 5T",
 			"sub_path": "filament/Prusament rPLA @XL 5T.json"
 		},
+		{
+			"name": "Prusa Generic PVA @base",
+			"sub_path": "filament/Prusa Generic PVA @base.json"
+		},
 		{
 			"name": "Prusa Generic PVA",
 			"sub_path": "filament/Prusa Generic PVA.json"
@@ -2064,6 +2124,10 @@
 			"name": "Prusa Generic PVA @MK3.5 0.8",
 			"sub_path": "filament/Prusa Generic PVA @MK3.5 0.8.json"
 		},
+		{
+			"name": "Prusa Generic PVA HF @base",
+			"sub_path": "filament/Prusa Generic PVA HF @base.json"
+		},
 		{
 			"name": "Prusa Generic PVA HF @MINIIS",
 			"sub_path": "filament/Prusa Generic PVA HF @MINIIS.json"
@@ -2100,6 +2164,10 @@
 			"name": "Prusament PVB @XL 5T",
 			"sub_path": "filament/Prusament PVB @XL 5T.json"
 		},
+		{
+			"name": "Prusa Generic TPU @base",
+			"sub_path": "filament/Prusa Generic TPU @base.json"
+		},
 		{
 			"name": "Prusa Generic TPU",
 			"sub_path": "filament/Prusa Generic TPU.json"
@@ -2120,6 +2188,10 @@
 			"name": "Prusa Generic TPU @MK4S",
 			"sub_path": "filament/Prusa Generic TPU @MK4S.json"
 		},
+		{
+			"name": "Prusa Generic TPU HF @base",
+			"sub_path": "filament/Prusa Generic TPU HF @base.json"
+		},
 		{
 			"name": "Prusa Generic TPU HF @MINIIS",
 			"sub_path": "filament/Prusa Generic TPU HF @MINIIS.json"
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS @MINIIS 0.25",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS @base",
 	"from": "system",
 	"setting_id": "NdGEi7BdP59bqz53",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS @MINIIS 0.6",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS @base",
 	"from": "system",
 	"setting_id": "f8RXAaEZ13jSgN9u",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS @MINIIS 0.8",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS @base",
 	"from": "system",
 	"setting_id": "0QdQCdtcKqM9HhpD",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS @MINIIS",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS @base",
 	"from": "system",
 	"setting_id": "LmdcShjNmbZ8E5fo",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS @MK4",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS @base",
 	"from": "system",
 	"setting_id": "Yeqfgyq1l0b1tCaT",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS @XL 5T",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS @base",
 	"from": "system",
 	"setting_id": "BVYagI9PtDtO1Jhu",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS @XL",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS @base",
 	"from": "system",
 	"setting_id": "fN9NUlg8l5DWy4LN",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic ABS @base",
+	"inherits": "fdm_filament_abs",
+	"from": "system",
+	"filament_id": "GFB99",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS HF @MINIIS 0.6",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS HF @base",
 	"from": "system",
 	"setting_id": "86pFdkE3ly08xst7",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS HF @MINIIS 0.8",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS HF @base",
 	"from": "system",
 	"setting_id": "yn9imamHaXlFDsPr",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS HF @MINIIS",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS HF @base",
 	"from": "system",
 	"setting_id": "KFoCfgUW9k9Yglwj",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic ABS HF @base",
+	"inherits": "fdm_filament_abs",
+	"from": "system",
+	"filament_id": "OFCgpxn2",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ABS",
-	"inherits": "fdm_filament_abs",
+	"inherits": "Prusa Generic ABS @base",
 	"from": "system",
 	"setting_id": "pqQMpMgbSN3XvTdK",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ASA HF @MINIIS 0.6",
-	"inherits": "fdm_filament_asa",
+	"inherits": "Prusa Generic ASA HF @base",
 	"from": "system",
 	"setting_id": "uf2mhiPodkiOu8Ui",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ASA HF @MINIIS 0.8",
-	"inherits": "fdm_filament_asa",
+	"inherits": "Prusa Generic ASA HF @base",
 	"from": "system",
 	"setting_id": "GMfOVAhKgKoiGZH5",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic ASA HF @MINIIS",
-	"inherits": "fdm_filament_asa",
+	"inherits": "Prusa Generic ASA HF @base",
 	"from": "system",
 	"setting_id": "o8mGAPApXYWIvPhm",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic ASA HF @base",
+	"inherits": "fdm_filament_asa",
+	"from": "system",
+	"filament_id": "OFkeeluv",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA @MINIIS 0.25",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA @base",
 	"from": "system",
 	"setting_id": "tGSqS5YX8FXkVAKa",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA @MINIIS 0.6",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA @base",
 	"from": "system",
 	"setting_id": "u3ZeKEiAwme06ioU",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA @MINIIS 0.8",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA @base",
 	"from": "system",
 	"setting_id": "nE90oPuU8lRFVBCl",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA @MINIIS",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA @base",
 	"from": "system",
 	"setting_id": "hda5VGcBTJOFu6B0",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PA @base",
+	"inherits": "fdm_filament_pa",
+	"from": "system",
+	"filament_id": "GFN99",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA-CF @MINIIS 0.25",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA-CF @base",
 	"from": "system",
 	"setting_id": "R9H0mIGTEh4rxRag",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA-CF @MINIIS 0.6",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA-CF @base",
 	"from": "system",
 	"setting_id": "qy8b2cQmrhmxfUfm",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA-CF @MINIIS 0.8",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA-CF @base",
 	"from": "system",
 	"setting_id": "PNdZVpjyekMxgAWx",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA-CF @MINIIS",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA-CF @base",
 	"from": "system",
 	"setting_id": "B2SFfVrYjPnN9rw3",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PA-CF @base",
+	"inherits": "fdm_filament_pa",
+	"from": "system",
+	"filament_id": "OFXfgh61",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA-CF",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA-CF @base",
 	"from": "system",
 	"setting_id": "bptwthfCtglFSoMw",
 	"instantiation": "true",
@@ -29,10 +29,6 @@
 		"Prusa MK4 0.25 nozzle",
 		"Prusa MK4 0.4 nozzle",
 		"Prusa MK4 0.6 nozzle",
-		"Prusa MK4 0.8 nozzle",
-		"Prusa MINIIS 0.4 nozzle",
-		"Prusa MINIIS 0.25 nozzle",
-		"Prusa MINIIS 0.6 nozzle",
-		"Prusa MINIIS 0.8 nozzle"
+		"Prusa MK4 0.8 nozzle"
 	]
 }
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PA",
-	"inherits": "fdm_filament_pa",
+	"inherits": "Prusa Generic PA @base",
 	"from": "system",
 	"setting_id": "lWO6oNoV0wjzRVja",
 	"instantiation": "true",
@@ -26,10 +26,6 @@
 		"Prusa MK4 0.25 nozzle",
 		"Prusa MK4 0.4 nozzle",
 		"Prusa MK4 0.6 nozzle",
-		"Prusa MK4 0.8 nozzle",
-		"Prusa MINIIS 0.4 nozzle",
-		"Prusa MINIIS 0.25 nozzle",
-		"Prusa MINIIS 0.6 nozzle",
-		"Prusa MINIIS 0.8 nozzle"
+		"Prusa MK4 0.8 nozzle"
 	]
 }
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PC HF @MINIIS 0.6",
-	"inherits": "fdm_filament_pc",
+	"inherits": "Prusa Generic PC HF @base",
 	"from": "system",
 	"setting_id": "oj7iq8Bsz8lYyoG8",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PC HF @MINIIS 0.8",
-	"inherits": "fdm_filament_pc",
+	"inherits": "Prusa Generic PC HF @base",
 	"from": "system",
 	"setting_id": "SK8h5tE5di3YWaJp",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PC HF @MINIIS",
-	"inherits": "fdm_filament_pc",
+	"inherits": "Prusa Generic PC HF @base",
 	"from": "system",
 	"setting_id": "onMXXnQNjbSimzbW",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PC HF @base",
+	"inherits": "fdm_filament_pc",
+	"from": "system",
+	"filament_id": "OFQ9dI8j",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG @MINIIS 0.25",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG @base",
 	"from": "system",
 	"setting_id": "u4zA4rasW1vfwG1o",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG @MINIIS 0.6",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG @base",
 	"from": "system",
 	"setting_id": "QJQIAwmRSZW3hNI4",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG @MINIIS 0.8",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG @base",
 	"from": "system",
 	"setting_id": "nXFZVAKBc3hkxbRt",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG @MINIIS",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG @base",
 	"from": "system",
 	"setting_id": "nXB864FJ4Dbz5oXc",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG @MK4",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG @base",
 	"from": "system",
 	"setting_id": "Xk2dCGMzSaT73Gq5",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG @XL 5T",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG @base",
 	"from": "system",
 	"setting_id": "FbtB9og6yXm2ZktD",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG @XL",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG @base",
 	"from": "system",
 	"setting_id": "SQKcHBt6A4D8PwFZ",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PETG @base",
+	"inherits": "fdm_filament_pet",
+	"from": "system",
+	"filament_id": "GFT02",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG HF @MINIIS 0.6",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG HF @base",
 	"from": "system",
 	"setting_id": "tt7C6k90F51Q17NL",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG HF @MINIIS 0.8",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG HF @base",
 	"from": "system",
 	"setting_id": "hivI3u5bpGKEJuPR",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG HF @MINIIS",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG HF @base",
 	"from": "system",
 	"setting_id": "SHIhEzb8wJonmulf",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PETG HF @base",
+	"inherits": "fdm_filament_pet",
+	"from": "system",
+	"filament_id": "OFphFSUJ",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PETG",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusa Generic PETG @base",
 	"from": "system",
 	"setting_id": "b55Rd5kKGP1A3BM2",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA @MINIIS 0.25",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA @base",
 	"from": "system",
 	"setting_id": "GOomDjqbF1CGAy8O",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA @MINIIS 0.6",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA @base",
 	"from": "system",
 	"setting_id": "rKRRhdLk0Heg3slz",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA @MINIIS 0.8",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA @base",
 	"from": "system",
 	"setting_id": "XC2NBSQXjiKIXnTi",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA @MINIIS",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA @base",
 	"from": "system",
 	"setting_id": "GUG6Ug0cZt0gs2Z2",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA @MK4",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA @base",
 	"from": "system",
 	"setting_id": "1aLBPgVpr7XZmmX6",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA @XL 5T",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA @base",
 	"from": "system",
 	"setting_id": "orBUSq1sDBeMGMON",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA @XL",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA @base",
 	"from": "system",
 	"setting_id": "tGG7egsphB0I1i6Z",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PLA @base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"filament_id": "GFL99",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA HF @MINIIS 0.6",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA HF @base",
 	"from": "system",
 	"setting_id": "A6tgkt5mCN7hFzoU",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA HF @MINIIS 0.8",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA HF @base",
 	"from": "system",
 	"setting_id": "3MSF1ZEw3D7bVhEI",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA HF @MINIIS",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA HF @base",
 	"from": "system",
 	"setting_id": "eVuV41lUXe9SEmeh",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PLA HF @base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"filament_id": "OFicxmSa",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA-CF @MINIIS 0.25",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA-CF @base",
 	"from": "system",
 	"setting_id": "Sv0IcpOJBk95F94d",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA-CF @MINIIS 0.6",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA-CF @base",
 	"from": "system",
 	"setting_id": "tKAu2YX7WADQuJqv",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA-CF @MINIIS 0.8",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA-CF @base",
 	"from": "system",
 	"setting_id": "dHVVnfZSJ6xEgzdQ",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA-CF @MINIIS",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA-CF @base",
 	"from": "system",
 	"setting_id": "VESr5xWPvPIlhyKh",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PLA-CF @base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"filament_id": "OFv8SRZh",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA-CF",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA-CF @base",
 	"from": "system",
 	"setting_id": "NqmFeHNZtfNefmvd",
 	"instantiation": "true",
@@ -32,10 +32,6 @@
 		"Prusa MK4 0.25 nozzle",
 		"Prusa MK4 0.4 nozzle",
 		"Prusa MK4 0.6 nozzle",
-		"Prusa MK4 0.8 nozzle",
-		"Prusa MINIIS 0.4 nozzle",
-		"Prusa MINIIS 0.25 nozzle",
-		"Prusa MINIIS 0.6 nozzle",
-		"Prusa MINIIS 0.8 nozzle"
+		"Prusa MK4 0.8 nozzle"
 	]
 }
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PLA",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusa Generic PLA @base",
 	"from": "system",
 	"setting_id": "pKHhR3Hx6AUoyIO3",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PVA @MINIIS 0.25",
-	"inherits": "fdm_filament_pva",
+	"inherits": "Prusa Generic PVA @base",
 	"from": "system",
 	"setting_id": "B0Dmo1DvtrwBwM7U",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PVA @MINIIS 0.6",
-	"inherits": "fdm_filament_pva",
+	"inherits": "Prusa Generic PVA @base",
 	"from": "system",
 	"setting_id": "yGTFSZeo1sUdCpeO",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PVA @MINIIS 0.8",
-	"inherits": "fdm_filament_pva",
+	"inherits": "Prusa Generic PVA @base",
 	"from": "system",
 	"setting_id": "ISdXFzAcVUj3ZIfQ",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PVA @MINIIS",
-	"inherits": "fdm_filament_pva",
+	"inherits": "Prusa Generic PVA @base",
 	"from": "system",
 	"setting_id": "rhZNRY8BNI1TskG2",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PVA @base",
+	"inherits": "fdm_filament_pva",
+	"from": "system",
+	"filament_id": "GFS99",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PVA HF @MINIIS 0.6",
-	"inherits": "fdm_filament_pva",
+	"inherits": "Prusa Generic PVA HF @base",
 	"from": "system",
 	"setting_id": "4C7OAcG8LVPSTJsh",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PVA HF @MINIIS 0.8",
-	"inherits": "fdm_filament_pva",
+	"inherits": "Prusa Generic PVA HF @base",
 	"from": "system",
 	"setting_id": "xj6xYUYJ0tAnfgao",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PVA HF @MINIIS",
-	"inherits": "fdm_filament_pva",
+	"inherits": "Prusa Generic PVA HF @base",
 	"from": "system",
 	"setting_id": "9MNzR7N4A1k64jne",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic PVA HF @base",
+	"inherits": "fdm_filament_pva",
+	"from": "system",
+	"filament_id": "OFxLeRyT",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic PVA",
-	"inherits": "fdm_filament_pva",
+	"inherits": "Prusa Generic PVA @base",
 	"from": "system",
 	"setting_id": "yLrgUDS7cr4AkOed",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic TPU @MINIIS",
-	"inherits": "fdm_filament_tpu",
+	"inherits": "Prusa Generic TPU @base",
 	"from": "system",
 	"setting_id": "TUqkAb8i9HpFdiCy",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic TPU @MK4",
-	"inherits": "fdm_filament_tpu",
+	"inherits": "Prusa Generic TPU @base",
 	"from": "system",
 	"setting_id": "9KjaEcwnQA8CsnVy",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic TPU @base",
+	"inherits": "fdm_filament_tpu",
+	"from": "system",
+	"filament_id": "GFU99",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic TPU HF @MINIIS",
-	"inherits": "fdm_filament_tpu",
+	"inherits": "Prusa Generic TPU HF @base",
 	"from": "system",
 	"setting_id": "a9fmPCI24EJoJ5OH",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusa Generic TPU HF @base",
+	"inherits": "fdm_filament_tpu",
+	"from": "system",
+	"filament_id": "OFbK5wve",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusa
+++ b/resources/profiles/Prusa/filament/Prusa
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusa Generic TPU",
-	"inherits": "fdm_filament_tpu",
+	"inherits": "Prusa Generic TPU @base",
 	"from": "system",
 	"setting_id": "l9s40Rloq4urv3Y0",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusament
+++ b/resources/profiles/Prusa/filament/Prusament
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusament PETG @XL 5T",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusament PETG @base",
 	"from": "system",
 	"setting_id": "USigpRWuzpdkT6ZW",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusament
+++ b/resources/profiles/Prusa/filament/Prusament
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusament PETG @XL",
-	"inherits": "fdm_filament_pet",
+	"inherits": "Prusament PETG @base",
 	"from": "system",
 	"setting_id": "vPPD8EkKFy5j8pg5",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusament
+++ b/resources/profiles/Prusa/filament/Prusament
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusament PETG @base",
+	"inherits": "fdm_filament_pet",
+	"from": "system",
+	"filament_id": "OFpHq9gJ",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusament
+++ b/resources/profiles/Prusa/filament/Prusament
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusament PLA @XL 5T",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusament PLA @base",
 	"from": "system",
 	"setting_id": "3xyT73BMaAvbb1Ej",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusament
+++ b/resources/profiles/Prusa/filament/Prusament
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusament PLA @XL",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusament PLA @base",
 	"from": "system",
 	"setting_id": "PlHq1KqHrreo5W8m",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusament
+++ b/resources/profiles/Prusa/filament/Prusament
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusament PLA @base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"filament_id": "OFkoT6jl",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/Prusament
+++ b/resources/profiles/Prusa/filament/Prusament
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusament rPLA @XL 5T",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusament rPLA @base",
 	"from": "system",
 	"setting_id": "yAiHzmW4pa8deage",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusament
+++ b/resources/profiles/Prusa/filament/Prusament
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Prusament rPLA @XL",
-	"inherits": "fdm_filament_pla",
+	"inherits": "Prusament rPLA @base",
 	"from": "system",
 	"setting_id": "j2BSXHFa7D3Gze7C",
 	"instantiation": "true",
--- a/resources/profiles/Prusa/filament/Prusament
+++ b/resources/profiles/Prusa/filament/Prusament
@@ -0,0 +1,8 @@
+{
+	"type": "filament",
+	"name": "Prusament rPLA @base",
+	"inherits": "fdm_filament_pla",
+	"from": "system",
+	"filament_id": "OFjFPhUC",
+	"instantiation": "false"
+}
--- a/resources/profiles/Prusa/filament/fdm_filament_abs.json
+++ b/resources/profiles/Prusa/filament/fdm_filament_abs.json
@@ -3,7 +3,6 @@
 	"name": "fdm_filament_abs",
 	"inherits": "fdm_filament_common",
 	"from": "system",
-	"filament_id": "GFB99",
 	"instantiation": "false",
 	"cool_plate_temp": [
 		"105"
--- a/resources/profiles/Prusa/filament/fdm_filament_pa.json
+++ b/resources/profiles/Prusa/filament/fdm_filament_pa.json
@@ -3,7 +3,6 @@
 	"name": "fdm_filament_pa",
 	"inherits": "fdm_filament_common",
 	"from": "system",
-	"filament_id": "GFN99",
 	"instantiation": "false",
 	"cool_plate_temp": [
 		"0"
--- a/resources/profiles/Prusa/filament/fdm_filament_pet.json
+++ b/resources/profiles/Prusa/filament/fdm_filament_pet.json
@@ -3,7 +3,6 @@
 	"name": "fdm_filament_pet",
 	"inherits": "fdm_filament_common",
 	"from": "system",
-	"filament_id": "GFT02",
 	"instantiation": "false",
 	"cool_plate_temp": [
 		"60"
--- a/resources/profiles/Prusa/filament/fdm_filament_pla.json
+++ b/resources/profiles/Prusa/filament/fdm_filament_pla.json
@@ -3,7 +3,6 @@
 	"name": "fdm_filament_pla",
 	"inherits": "fdm_filament_common",
 	"from": "system",
-	"filament_id": "GFL99",
 	"instantiation": "false",
 	"fan_cooling_layer_time": [
 		"100"
--- a/resources/profiles/Prusa/filament/fdm_filament_pva.json
+++ b/resources/profiles/Prusa/filament/fdm_filament_pva.json
@@ -3,7 +3,6 @@
 	"name": "fdm_filament_pva",
 	"inherits": "fdm_filament_common",
 	"from": "system",
-	"filament_id": "GFS99",
 	"instantiation": "false",
 	"cool_plate_temp": [
 		"35"
--- a/resources/profiles/Prusa/filament/fdm_filament_tpu.json
+++ b/resources/profiles/Prusa/filament/fdm_filament_tpu.json
@@ -3,7 +3,6 @@
 	"name": "fdm_filament_tpu",
 	"inherits": "fdm_filament_common",
 	"from": "system",
-	"filament_id": "GFU99",
 	"instantiation": "false",
 	"cool_plate_temp": [
 		"30"
--- a/scripts/filament_id_snapshot.json
+++ b/scripts/filament_id_snapshot.json
@@ -1447,27 +1447,18 @@
  "Peopoly/Peopoly Generic PLA",
  "Peopoly/Peopoly Lancer PLA-C",
  "Phrozen/Phrozen PLA @Phrozen Arco 0.4 nozzle",
-  "Prusa/Prusa Generic ABS @CORE One",
  "Prusa/Prusa Generic ABS @CORE One 0.6",
  "Prusa/Prusa Generic ABS @CORE One 0.8",
  "Prusa/Prusa Generic ABS @CORE One HF 0.4",
  "Prusa/Prusa Generic ABS @CORE One HF 0.5",
  "Prusa/Prusa Generic ABS @CORE One HF 0.6",
  "Prusa/Prusa Generic ABS @CORE One HF 0.8",
-  "Prusa/Prusa Generic ABS @MK3.5",
-  "Prusa/Prusa Generic ABS @MK3.5 0.25",
-  "Prusa/Prusa Generic ABS @MK3.5 0.6",
-  "Prusa/Prusa Generic ABS @MK3.5 0.8",
-  "Prusa/Prusa Generic ABS @MK4S",
  "Prusa/Prusa Generic ABS @MK4S 0.6",
  "Prusa/Prusa Generic ABS @MK4S 0.8",
  "Prusa/Prusa Generic ABS @MK4S HF0.4",
  "Prusa/Prusa Generic ABS @MK4S HF0.5",
  "Prusa/Prusa Generic ABS @MK4S HF0.6",
  "Prusa/Prusa Generic ABS @MK4S HF0.8",
-  "Prusa/Prusa Generic ABS HF @MK3.5",
-  "Prusa/Prusa Generic ABS HF @MK3.5 0.6",
-  "Prusa/Prusa Generic ABS HF @MK3.5 0.8",
  "Prusa/Prusa Generic ASA @CORE One",
  "Prusa/Prusa Generic ASA @CORE One 0.6",
  "Prusa/Prusa Generic ASA @CORE One 0.8",
@@ -1489,14 +1480,17 @@
  "Prusa/Prusa Generic ASA HF @MK3.5",
  "Prusa/Prusa Generic ASA HF @MK3.5 0.6",
  "Prusa/Prusa Generic ASA HF @MK3.5 0.8",
+  "Prusa/Prusa Generic ASA HF @base",
  "Prusa/Prusa Generic PA @MK3.5",
  "Prusa/Prusa Generic PA @MK3.5 0.25",
  "Prusa/Prusa Generic PA @MK3.5 0.6",
  "Prusa/Prusa Generic PA @MK3.5 0.8",
+  "Prusa/Prusa Generic PA @base",
  "Prusa/Prusa Generic PA-CF @MK3.5",
  "Prusa/Prusa Generic PA-CF @MK3.5 0.25",
  "Prusa/Prusa Generic PA-CF @MK3.5 0.6",
  "Prusa/Prusa Generic PA-CF @MK3.5 0.8",
+  "Prusa/Prusa Generic PA-CF @base",
  "Prusa/Prusa Generic PC @MK3.5",
  "Prusa/Prusa Generic PC @MK3.5 0.25",
  "Prusa/Prusa Generic PC @MK3.5 0.6",
@@ -1504,6 +1498,7 @@
  "Prusa/Prusa Generic PC HF @MK3.5",
  "Prusa/Prusa Generic PC HF @MK3.5 0.6",
  "Prusa/Prusa Generic PC HF @MK3.5 0.8",
+  "Prusa/Prusa Generic PC HF @base",
  "Prusa/Prusa Generic PETG @CORE One",
  "Prusa/Prusa Generic PETG @CORE One 0.6",
  "Prusa/Prusa Generic PETG @CORE One 0.8",
@@ -1522,9 +1517,11 @@
  "Prusa/Prusa Generic PETG @MK4S HF0.5",
  "Prusa/Prusa Generic PETG @MK4S HF0.6",
  "Prusa/Prusa Generic PETG @MK4S HF0.8",
+  "Prusa/Prusa Generic PETG @base",
  "Prusa/Prusa Generic PETG HF @MK3.5",
  "Prusa/Prusa Generic PETG HF @MK3.5 0.6",
  "Prusa/Prusa Generic PETG HF @MK3.5 0.8",
+  "Prusa/Prusa Generic PETG HF @base",
  "Prusa/Prusa Generic PLA @CORE One",
  "Prusa/Prusa Generic PLA @CORE One 0.6",
  "Prusa/Prusa Generic PLA @CORE One 0.8",
@@ -1543,9 +1540,11 @@
  "Prusa/Prusa Generic PLA @MK4S HF0.5",
  "Prusa/Prusa Generic PLA @MK4S HF0.6",
  "Prusa/Prusa Generic PLA @MK4S HF0.8",
+  "Prusa/Prusa Generic PLA @base",
  "Prusa/Prusa Generic PLA HF @MK3.5",
  "Prusa/Prusa Generic PLA HF @MK3.5 0.6",
  "Prusa/Prusa Generic PLA HF @MK3.5 0.8",
+  "Prusa/Prusa Generic PLA HF @base",
  "Prusa/Prusa Generic PLA Silk @CORE One",
  "Prusa/Prusa Generic PLA Silk @CORE One 0.6",
  "Prusa/Prusa Generic PLA Silk @CORE One 0.8",
@@ -1556,21 +1555,12 @@
  "Prusa/Prusa Generic PLA-CF @MK3.5 0.25",
  "Prusa/Prusa Generic PLA-CF @MK3.5 0.6",
  "Prusa/Prusa Generic PLA-CF @MK3.5 0.8",
-  "Prusa/Prusa Generic PVA @MK3.5",
-  "Prusa/Prusa Generic PVA @MK3.5 0.25",
-  "Prusa/Prusa Generic PVA @MK3.5 0.6",
-  "Prusa/Prusa Generic PVA @MK3.5 0.8",
-  "Prusa/Prusa Generic PVA HF @MK3.5",
-  "Prusa/Prusa Generic PVA HF @MK3.5 0.6",
-  "Prusa/Prusa Generic PVA HF @MK3.5 0.8",
+  "Prusa/Prusa Generic PLA-CF @base",
  "Prusa/Prusa Generic TPU @CORE One",
  "Prusa/Prusa Generic TPU @CORE One 0.6",
  "Prusa/Prusa Generic TPU @CORE One 0.8",
-  "Prusa/Prusa Generic TPU @MK3.5",
-  "Prusa/Prusa Generic TPU @MK4S",
  "Prusa/Prusa Generic TPU @MK4S 0.6",
  "Prusa/Prusa Generic TPU @MK4S 0.8",
-  "Prusa/Prusa Generic TPU HF @MK3.5",
  "Prusa/Prusament ASA @CORE One",
  "Prusa/Prusament ASA @CORE One 0.6",
  "Prusa/Prusament ASA @CORE One 0.8",
@@ -1598,6 +1588,7 @@
  "Prusa/Prusament PETG @CORE One HF 0.5",
  "Prusa/Prusament PETG @CORE One HF 0.6",
  "Prusa/Prusament PETG @CORE One HF 0.8",
+  "Prusa/Prusament PETG @base",
  "Prusa/Prusament PLA @CORE One",
  "Prusa/Prusament PLA @CORE One 0.6",
  "Prusa/Prusament PLA @CORE One 0.8",
@@ -1605,12 +1596,14 @@
  "Prusa/Prusament PLA @CORE One HF 0.5",
  "Prusa/Prusament PLA @CORE One HF 0.6",
  "Prusa/Prusament PLA @CORE One HF 0.8",
+  "Prusa/Prusament PLA @base",
  "Prusa/Prusament PVB @CORE One",
  "Prusa/Prusament PVB @CORE One 0.6",
  "Prusa/Prusament PVB @CORE One 0.8",
  "Prusa/Prusament rPLA @CORE One",
  "Prusa/Prusament rPLA @CORE One 0.6",
  "Prusa/Prusament rPLA @CORE One 0.8",
+  "Prusa/Prusament rPLA @base",
  "Qidi/Bambu PETG",
  "Qidi/Bambu PLA",
  "Qidi/HATCHBOX PETG @Qidi",
@@ -3182,7 +3175,6 @@
   "FLSun/FLSun T1 ASA",
   "OrcaArena/OrcaArena Generic ASA",
   "Prusa/Prusa Generic ASA",
-   "Prusa/Prusa Generic ASA HF",
   "Prusa/Prusament ASA",
   "Ratrig/RatRig BigNozzle ASA",
   "Ratrig/RatRig Generic ASA",
@@ -3244,7 +3236,6 @@
   "Lulzbot/Lulzbot 2.85mm ABS",
   "OrcaArena/OrcaArena Generic ABS",
   "Prusa/Prusa Generic ABS",
-   "Prusa/Prusa Generic ABS HF",
   "Qidi/Qidi Generic ABS",
   "Ratrig/RatRig BigNozzle ABS",
   "Ratrig/RatRig Generic ABS",
@@ -3314,7 +3305,6 @@
   "InfiMech/Other PC",
   "OrcaArena/OrcaArena Generic PC",
   "Prusa/Prusa Generic PC",
-   "Prusa/Prusa Generic PC HF",
   "Prusa/Prusament PC Blend",
   "Qidi/Qidi Generic PC",
   "Ratrig/RatRig BigNozzle PCTG",
@@ -3802,10 +3792,6 @@
   "Peopoly/Peopoly Lancer PLA-C",
   "Phrozen/Phrozen PLA",
   "Prusa/Prusa Generic PLA",
-   "Prusa/Prusa Generic PLA HF",
-   "Prusa/Prusa Generic PLA-CF",
-   "Prusa/Prusament PLA",
-   "Prusa/Prusament rPLA",
   "Qidi/Qidi Generic PLA",
   "Ratrig/RatRig BigNozzle PLA",
   "Ratrig/RatRig BigNozzle TPU",
@@ -3965,7 +3951,6 @@
   "FLSun/FLSun Generic PA",
   "OrcaArena/OrcaArena Generic PA",
   "Prusa/Prusa Generic PA",
-   "Prusa/Prusa Generic PA-CF",
   "Qidi/Qidi Generic PA",
   "Ratrig/RatRig Generic PA",
   "SecKit/SecKit Generic PA",
@@ -4273,7 +4258,6 @@
   "FLSun/FLSun Generic PVA",
   "OrcaArena/OrcaArena Generic PVA",
   "Prusa/Prusa Generic PVA",
-   "Prusa/Prusa Generic PVA HF",
   "Qidi/Qidi Generic PVA",
   "Ratrig/RatRig Generic PVA",
   "SecKit/SecKit Generic PVA",
@@ -4400,9 +4384,7 @@
  ],
  "GFT02": [
   "BBL/Bambu PPS-CF",
-   "Prusa/Prusa Generic PETG",
-   "Prusa/Prusa Generic PETG HF",
-   "Prusa/Prusament PETG"
+   "Prusa/Prusa Generic PETG"
  ],
  "GFT97": [
   "BBL/Generic PPS",
@@ -4475,7 +4457,6 @@
   "OrcaArena/OrcaArena Generic TPU",
   "Prusa/Prusa Generic FLEX",
   "Prusa/Prusa Generic TPU",
-   "Prusa/Prusa Generic TPU HF",
   "Qidi/Qidi Generic TPU",
   "Ratrig/RatRig Generic TPU",
   "SecKit/SecKit Generic TPU",
@@ -4834,6 +4815,9 @@
  "OFCJaXZS": [
   "Flashforge/Flashforge PPS"
  ],
+  "OFCgpxn2": [
+   "Prusa/Prusa Generic ABS HF"
+  ],
  "OFD5e0sH": [
   "OrcaFilamentLibrary/Elegoo Rapid PLA+"
  ],
@@ -4957,6 +4941,9 @@
  "OFPwi9X0": [
   "Qidi/HATCHBOX ABS"
  ],
+  "OFQ9dI8j": [
+   "Prusa/Prusa Generic PC HF"
+  ],
  "OFQCAYAt": [
   "Flashforge/Flashforge PPA-CF"
  ],
@@ -5035,6 +5022,9 @@
  "OFXcfTEb": [
   "Qidi/Tinmorry PETG-ECO"
  ],
+  "OFXfgh61": [
+   "Prusa/Prusa Generic PA-CF"
+  ],
  "OFXkwkn6": [
   "Qidi/QIDI PA-Ultra"
  ],
@@ -5077,6 +5067,9 @@
  "OFaKIoH2": [
   "Elegoo/Elegoo PLA Sparkle"
  ],
+  "OFbK5wve": [
+   "Prusa/Prusa Generic TPU HF"
+  ],
  "OFbS9rjH": [
   "Qidi/QIDI PETG Rapido"
  ],
@@ -5143,12 +5136,18 @@
  "OFiJYDPC": [
   "Qidi/HATCHBOX PLA"
  ],
+  "OFicxmSa": [
+   "Prusa/Prusa Generic PLA HF"
+  ],
  "OFidJLn8": [
   "Qidi/PolyLite ABS"
  ],
  "OFiyGNbI": [
   "Elegoo/Elegoo PETG-CF"
  ],
+  "OFjFPhUC": [
+   "Prusa/Prusament rPLA"
+  ],
  "OFjepy6j": [
   "Flashforge/FusRock Generic S-PAHT"
  ],
@@ -5164,12 +5163,18 @@
  "OFkaDtKx": [
   "Flashforge/Flashforge PA66-CF"
  ],
+  "OFkeeluv": [
+   "Prusa/Prusa Generic ASA HF"
+  ],
  "OFkfK62J": [
   "Elegoo/Elegoo PLA Silk"
  ],
  "OFklg4aM": [
   "Elegoo/Elegoo PLA PRO"
  ],
+  "OFkoT6jl": [
+   "Prusa/Prusament PLA"
+  ],
  "OFlNKZLP": [
   "Flashforge/Flashforge PLA  Metal"
  ],
@@ -5218,6 +5223,12 @@
  "OFp8lkYD": [
   "Flashforge/Flashforge PPA-GF"
  ],
+  "OFpHq9gJ": [
+   "Prusa/Prusament PETG"
+  ],
+  "OFphFSUJ": [
+   "Prusa/Prusa Generic PETG HF"
+  ],
  "OFpwg2Qh": [
   "OrcaFilamentLibrary/Elegoo ASA-CF"
  ],
@@ -5287,6 +5298,9 @@
  "OFv2NHLC": [
   "Qidi/QIDI ABS-GF25"
  ],
+  "OFv8SRZh": [
+   "Prusa/Prusa Generic PLA-CF"
+  ],
  "OFvN3117": [
   "Qidi/QIDI PLA Matte Basic"
  ],
@@ -5308,6 +5322,9 @@
  "OFwyqcGn": [
   "Elegoo/Elegoo PLA Matte"
  ],
+  "OFxLeRyT": [
+   "Prusa/Prusa Generic PVA HF"
+  ],
  "OFxjFYxE": [
   "Elegoo/Elegoo PETG HF"
  ],