From 1a0f4016178813d426cd2f252e6b9f6b65e0c96d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 25 Oct 2024 15:08:51 +0200 Subject: [PATCH 1/2] remove legacy material linkage There are no PC, HIPS, TPU, PC, BVOH materials for makerbot series and the references used point to Generic 175 material GUIDs which is blocked for the makerbot/sketch series. --- cura/PrinterOutput/FormatMaps.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index 80eb8049a3..b22aad7441 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -35,16 +35,11 @@ class FormatMaps: "nylon12-cf": {"name": "Nylon 12 CF", "guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, "nylon-cf": {"name": "Nylon CF", "guid": "17abb865-ca73-4ccd-aeda-38e294c9c60b"}, "nylon": {"name": "Nylon", "guid": "9475b03d-fd19-48a2-b7b5-be1fb46abb02"}, - "pc": {"name": "PC", "guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"}, "petg": {"name": "PETG", "guid": "2d004bbd-d1bb-47f8-beac-b066702d5273"}, "pla": {"name": "PLA", "guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, "pva": {"name": "PVA", "guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, "wss1": {"name": "RapidRinse", "guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, "sr30": {"name": "SR-30", "guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, - "bvoh": {"name": "BVOH", "guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, - "cpe": {"name": "CPE", "guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, - "hips": {"name": "HIPS", "guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, - "tpu": {"name": "TPU 95A", "guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, "im-pla": {"name": "Tough", "guid": "96fca5d9-0371-4516-9e96-8e8182677f3c"} # /!\ When changing this list, make sure the changes are reported accordingly on Digital Factory } From 951dfb7cf687a15c8a493e6cb19325d7389742d8 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 28 Oct 2024 15:26:44 +0100 Subject: [PATCH 2/2] additional corrections UM nylon 175 doesn't exist in fdm_material im-pla GUID has been updated on fdm_material reference id for PETG is pet https://github.com/Ultimaker/fdm_materials/blob/ce6549e8820b95b0763212993a9a1ebf73fd287b/ultimaker_petg_175.xml.fdm_material#L10C9-L10C59 --- cura/PrinterOutput/FormatMaps.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index b22aad7441..3a03da71fd 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -34,13 +34,12 @@ class FormatMaps: "asa": {"name": "ASA", "guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, "nylon12-cf": {"name": "Nylon 12 CF", "guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, "nylon-cf": {"name": "Nylon CF", "guid": "17abb865-ca73-4ccd-aeda-38e294c9c60b"}, - "nylon": {"name": "Nylon", "guid": "9475b03d-fd19-48a2-b7b5-be1fb46abb02"}, - "petg": {"name": "PETG", "guid": "2d004bbd-d1bb-47f8-beac-b066702d5273"}, + "pet": {"name": "PETG", "guid": "2d004bbd-d1bb-47f8-beac-b066702d5273"}, "pla": {"name": "PLA", "guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, "pva": {"name": "PVA", "guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, "wss1": {"name": "RapidRinse", "guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, "sr30": {"name": "SR-30", "guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, - "im-pla": {"name": "Tough", "guid": "96fca5d9-0371-4516-9e96-8e8182677f3c"} + "im-pla": {"name": "Tough", "guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} # /!\ When changing this list, make sure the changes are reported accordingly on Digital Factory }