diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 935de537be..4fa412325a 100644 --- 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" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json index 9cb0f8b001..ca834afe43 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json index e1d4f272ae..b4c5c636bf 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json index a867f7d6a6..7b847c26b0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json index c52dd45677..35bf33de08 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json index 3cbcf73b85..6b4f8d9fdf 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json index 3aef5fc5e9..38559e4b26 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json index 2abed48083..e40a10cbeb 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json new file mode 100644 index 0000000000..ffa4525a5a --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic ABS @base", + "inherits": "fdm_filament_abs", + "from": "system", + "filament_id": "GFB99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json index 287f5d03f9..f8959a77b2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json index 358d9a3c46..63c1207fd9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json index 1b72e67a4d..358aa57b6d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json new file mode 100644 index 0000000000..228807da84 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic ABS HF @base", + "inherits": "fdm_filament_abs", + "from": "system", + "filament_id": "OFCgpxn2", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS.json b/resources/profiles/Prusa/filament/Prusa Generic ABS.json index 0f77dd0216..9fef1f871c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json index 2f8cb00374..1dda0e52e2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json index 2a238156f7..b3d9bad889 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json index 9f97b95631..68ade52513 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json new file mode 100644 index 0000000000..000196a2a1 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic ASA HF @base", + "inherits": "fdm_filament_asa", + "from": "system", + "filament_id": "OFkeeluv", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json index 7fdf301829..a74492d2aa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json index ada7470a27..a28f3eedf0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json index f08a354372..cbf0faa16a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json index 1f62ce1a85..c8ff9bf5cb 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @base.json b/resources/profiles/Prusa/filament/Prusa Generic PA @base.json new file mode 100644 index 0000000000..42e8d47bbd --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PA @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "GFN99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json index c262a5fe97..cc78a91ff9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json index 61047938ef..9cca375d20 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json index e38f123038..930599ddf8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json index a41ec893e7..320eaaccd5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json new file mode 100644 index 0000000000..0b0059fa9a --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PA-CF @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "OFXfgh61", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json index 5144b143d6..ac15c94417 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json @@ -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" ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA.json b/resources/profiles/Prusa/filament/Prusa Generic PA.json index 9893d5a390..b50c329fab 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA.json @@ -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" ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json index bc82e730f2..e3d400892f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json index d864903081..5965ff9d5d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json index 96720cc606..b198ed3af4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json new file mode 100644 index 0000000000..ece79b1919 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PC HF @base", + "inherits": "fdm_filament_pc", + "from": "system", + "filament_id": "OFQ9dI8j", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json index b804e798b1..1254f1aede 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json index 8d4d00ea99..7e849e01af 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json index 81c4d41aaf..2a943198aa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json index 8803f3e7fd..49d8e83444 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json index b0e684dd68..f4d8216caa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json index 3a90f36035..4babb91e3f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json index 14cb0f610b..793b97e290 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json new file mode 100644 index 0000000000..7cc123d8fd --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PETG @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "GFT02", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json index 03675e06e7..da8b0f68e5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json index 86b9431c5f..c8eb08ef87 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json index 8df215da56..dcb87593dc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json new file mode 100644 index 0000000000..b9c02872b2 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PETG HF @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFphFSUJ", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG.json b/resources/profiles/Prusa/filament/Prusa Generic PETG.json index 6963412e1c..db17c39162 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json index 67a5bbca62..73ce7b1606 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json index 7bb32fd4d9..437eeeb6b8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json index 96016b318a..cd95805fb3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json index 2de81c0947..5f3c8f9bb4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json index 13a0df5f2b..22f8bb274c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json index 9264a2b0c1..2d149b8b7b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json index fd1ffa1425..3206f6f3c5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json new file mode 100644 index 0000000000..be5218517e --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFL99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json index 7ae24d6fe7..6b9f364da7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json index 10353f147e..b4a25d21a1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json index ea67606d37..243b69a393 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json new file mode 100644 index 0000000000..4cff82d6a5 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PLA HF @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFicxmSa", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json index 8b41f21ce1..1e95879fdf 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json index 642ec54a07..3736da09d7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json index 90be6a1703..83c781352d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json index 1be8101e9a..4cb69a99ec 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json new file mode 100644 index 0000000000..f45f0e0bf0 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PLA-CF @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFv8SRZh", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json index 8e24ebcd12..d156be1004 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json @@ -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" ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA.json b/resources/profiles/Prusa/filament/Prusa Generic PLA.json index ae5ca3e50c..a2f1521fec 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json index 7391c7c004..4357a8eb1f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json index fadbdc53b2..1a4d7c6aa5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json index 18e1965b76..7c3a77c52d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json index 9598a6f09b..f6eecea619 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json new file mode 100644 index 0000000000..dc77145268 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PVA @base", + "inherits": "fdm_filament_pva", + "from": "system", + "filament_id": "GFS99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json index 3bc8a6b7aa..bd810e4933 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json index b26ca248ad..a2557cd576 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json index cd7b4f7b7d..467f0822bd 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json new file mode 100644 index 0000000000..8d05e93111 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PVA HF @base", + "inherits": "fdm_filament_pva", + "from": "system", + "filament_id": "OFxLeRyT", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA.json b/resources/profiles/Prusa/filament/Prusa Generic PVA.json index 17476b1ce5..260dfb5d01 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json index 8acb55983c..6108984ad1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json index 01db48abbf..11753a6232 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json new file mode 100644 index 0000000000..a86c7a2b91 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic TPU @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "GFU99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json index 271c36e183..954e880fa6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json new file mode 100644 index 0000000000..0a41e94893 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic TPU HF @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "OFbK5wve", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU.json b/resources/profiles/Prusa/filament/Prusa Generic TPU.json index 58324d477d..5f1b953a7c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusament PETG @XL 5T.json b/resources/profiles/Prusa/filament/Prusament PETG @XL 5T.json index e127263ad7..e0db59fde9 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @XL 5T.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusament PETG @XL.json b/resources/profiles/Prusa/filament/Prusament PETG @XL.json index b552f9ed09..f26140a0eb 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @XL.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusament PETG @base.json b/resources/profiles/Prusa/filament/Prusament PETG @base.json new file mode 100644 index 0000000000..eee47346ca --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusament PETG @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFpHq9gJ", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @XL 5T.json b/resources/profiles/Prusa/filament/Prusament PLA @XL 5T.json index d74ad3f865..efda9cf4e3 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @XL 5T.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusament PLA @XL.json b/resources/profiles/Prusa/filament/Prusament PLA @XL.json index 60825e3109..9d02a67491 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @XL.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusament PLA @base.json b/resources/profiles/Prusa/filament/Prusament PLA @base.json new file mode 100644 index 0000000000..707640da25 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusament PLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFkoT6jl", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @XL 5T.json b/resources/profiles/Prusa/filament/Prusament rPLA @XL 5T.json index cb1d9258c9..8bfc482af6 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @XL 5T.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @XL.json b/resources/profiles/Prusa/filament/Prusament rPLA @XL.json index ab5867979b..9ed3d9af74 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @XL.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @XL.json @@ -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", diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @base.json b/resources/profiles/Prusa/filament/Prusament rPLA @base.json new file mode 100644 index 0000000000..bdacf0cc19 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusament rPLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFjFPhUC", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_abs.json b/resources/profiles/Prusa/filament/fdm_filament_abs.json index 50945a12e0..35c4d94e0e 100644 --- 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" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pa.json b/resources/profiles/Prusa/filament/fdm_filament_pa.json index 050df1ed25..8e2337a0bd 100644 --- 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" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pet.json b/resources/profiles/Prusa/filament/fdm_filament_pet.json index b7d8b3d957..9d20738d06 100644 --- 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" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pla.json b/resources/profiles/Prusa/filament/fdm_filament_pla.json index a00cd395a1..573c92fede 100644 --- 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" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pva.json b/resources/profiles/Prusa/filament/fdm_filament_pva.json index b6bf5b64a1..b25a8332cc 100644 --- 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" diff --git a/resources/profiles/Prusa/filament/fdm_filament_tpu.json b/resources/profiles/Prusa/filament/fdm_filament_tpu.json index cca57e64fa..dff9bf8f73 100644 --- 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" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 71b62c1814..6c96ddbad0 100644 --- 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" ],