From 7462de08cba27df3f7032c23276ba7cb6abb445e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 21 Aug 2024 08:30:52 +0200 Subject: [PATCH 01/58] Add settings for scarf seam CURA-12081 --- resources/definitions/fdmprinter.def.json | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 571d501212..05c74a4909 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1436,6 +1436,31 @@ "enabled": "z_seam_type == 'back'", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true + }, + "scarf_joint_seam_length": + { + "label": "Scarf seam length", + "description": "When greater than 0, a scarf joint will be created on the Z seam to make it less visible.", + "type": "float", + "default_value": 0, + "minimum_value": "0", + "unit": "mm", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "scarf_joint_seam_start_height_ratio": + { + "label": "Scarf seam start height", + "description": "This is the ratio over the total layer height where the scarf joint seam will start.", + "type": "float", + "default_value": 0, + "minimum_value": 0, + "maximum_value": 100.0, + "unit": "%", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true } } }, From 758ff916555e18ad68ed3508648ffdd5c6a06a7a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 22 Aug 2024 09:24:51 +0200 Subject: [PATCH 02/58] Add setting for scarf seam split definition CURA-12081 --- resources/definitions/fdmprinter.def.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 05c74a4909..b2bccc424e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1461,6 +1461,19 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_extruder": true, "settable_per_mesh": true + }, + "scarf_split_distance": + { + "label": "Scarf seam split distance", + "description": "This is the maximum length of an extrusion path when splitting a longer path to apply the scarf seam. A smaller distance will create a more precise but also more verbose G-Code.", + "type": "float", + "default_value": 1.0, + "minimum_value": 0.1, + "maximum_value": 100.0, + "unit": "mm", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true } } }, From d92a9b4861051838967c7c5b2c744c4f2307b825 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 23 Aug 2024 13:58:56 +0200 Subject: [PATCH 03/58] Add setting for seam acceleration/deceleration CURA-12080 --- resources/definitions/fdmprinter.def.json | 73 ++++++++++++++++++++++- 1 file changed, 70 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index b2bccc424e..a6c4ab02d9 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1439,7 +1439,7 @@ }, "scarf_joint_seam_length": { - "label": "Scarf seam length", + "label": "Scarf Seam Length", "description": "When greater than 0, a scarf joint will be created on the Z seam to make it less visible.", "type": "float", "default_value": 0, @@ -1451,7 +1451,7 @@ }, "scarf_joint_seam_start_height_ratio": { - "label": "Scarf seam start height", + "label": "Scarf Seam Start Height", "description": "This is the ratio over the total layer height where the scarf joint seam will start.", "type": "float", "default_value": 0, @@ -1464,7 +1464,7 @@ }, "scarf_split_distance": { - "label": "Scarf seam split distance", + "label": "Scarf Seam Split Distance", "description": "This is the maximum length of an extrusion path when splitting a longer path to apply the scarf seam. A smaller distance will create a more precise but also more verbose G-Code.", "type": "float", "default_value": 1.0, @@ -1474,6 +1474,73 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_extruder": true, "settable_per_mesh": true + }, + "wall_0_start_speed_ratio": + { + "label": "Outer Wall Start Speed Ratio", + "description": "This is the ratio of the top speed to start with when printing an outer wall.", + "type": "float", + "default_value": 100.0, + "minimum_value": 0.0, + "maximum_value": 100.0, + "unit": "%", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "wall_0_acceleration": + { + "label": "Outer Wall Acceleration", + "description": "This is the acceleration with which to reach the top speed when printing an outer wall.", + "enabled": "wall_0_start_speed_ratio < 100.0", + "type": "float", + "default_value": 20.0, + "minimum_value": 1.0, + "maximum_value": 1000.0, + "unit": "mm/s\u00b2", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "wall_0_end_speed_ratio": + { + "label": "Outer Wall End Speed Ratio", + "description": "This is the ratio of the top speed to end with when printing an outer wall.", + "type": "float", + "default_value": 100.0, + "minimum_value": 0.0, + "maximum_value": 100.0, + "unit": "%", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "wall_0_deceleration": + { + "label": "Outer Wall Deceleration", + "description": "This is the deceleration with which to end printing an outer wall.", + "enabled": "wall_0_end_speed_ratio < 100.0", + "type": "float", + "default_value": 20.0, + "minimum_value": 1.0, + "maximum_value": 1000.0, + "unit": "mm/s\u00b2", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "wall_0_speed_split_distance": + { + "label": "Outer Wall Speed Split Distance", + "description": "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code.", + "type": "float", + "default_value": 1.0, + "minimum_value": 0.1, + "maximum_value": 100.0, + "unit": "mm", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true } } }, From f9c0f68a76e49c98c686713efab3d0d50a3d80ae Mon Sep 17 00:00:00 2001 From: Solar138 <46548002+solar138@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:29:59 -0700 Subject: [PATCH 04/58] Typo fix in fdmprinter.def.json.pot --- resources/i18n/fdmprinter.def.json.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index 8a09cf9129..3f9c306e70 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/resources/i18n/fdmprinter.def.json.pot @@ -857,7 +857,7 @@ msgid "Wall Ordering" msgstr "" msgctxt "inset_direction description" -msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last." +msgid "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total inner walls, the 'center last line' is always printed last." msgstr "" msgctxt "inset_direction option inside_out" From 35ccd63e29756332233331246305242cd410d2d2 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 26 Sep 2024 15:35:56 -0400 Subject: [PATCH 05/58] Method printers: Adding new materials (Tough PLA, PETG, NylonCF, ABS) and updated profiles for 5.9 PP-511 --- .../definitions/ultimaker_method.def.json | 24 +- .../ultimaker_method_base.def.json | 237 +++++++++++++----- .../definitions/ultimaker_methodx.def.json | 20 +- .../definitions/ultimaker_methodxl.def.json | 54 +++- ..._method_1a_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...d_1a_um-tough-pla-175_0.2mm_solid.inst.cfg | 23 ++ ...od_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg | 22 ++ ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 8 +- ..._method_1c_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...d_1c_um-tough-pla-175_0.2mm_solid.inst.cfg | 23 ++ ..._labs_um-nylon-cf-175_0.2mm_solid.inst.cfg | 22 ++ ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 8 +- ...ethod_labs_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...labs_um-tough-pla-175_0.2mm_solid.inst.cfg | 23 ++ ...methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...x_1a_um-tough-pla-175_0.2mm_solid.inst.cfg | 23 ++ ...methodx_1c_um-abs-175_0.2mm_solid.inst.cfg | 23 ++ ...thodx_1c_um-abscf-175_0.2mm_solid.inst.cfg | 8 +- ...ethodx_1c_um-absr-175_0.2mm_solid.inst.cfg | 8 +- ...methodx_1c_um-asa-175_0.2mm_solid.inst.cfg | 8 +- ...dx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg | 22 ++ ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 8 +- ...methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...x_1c_um-tough-pla-175_0.2mm_solid.inst.cfg | 23 ++ ...ethodx_1xa_um-abs-175_0.2mm_solid.inst.cfg | 23 ++ ...thodx_1xa_um-absr-175_0.2mm_solid.inst.cfg | 8 +- ...ethodx_1xa_um-asa-175_0.2mm_solid.inst.cfg | 8 +- ...thodx_labs_um-abs-175_0.2mm_solid.inst.cfg | 23 ++ ...odx_labs_um-abscf-175_0.2mm_solid.inst.cfg | 8 +- ...hodx_labs_um-absr-175_0.2mm_solid.inst.cfg | 8 +- ...thodx_labs_um-asa-175_0.2mm_solid.inst.cfg | 8 +- ..._labs_um-nylon-cf-175_0.2mm_solid.inst.cfg | 22 ++ ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 8 +- ...thodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...labs_um-tough-pla-175_0.2mm_solid.inst.cfg | 23 ++ ...ethodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...l_1a_um-tough-pla-175_0.2mm_solid.inst.cfg | 24 ++ ...ethodxl_1c_um-abs-175_0.2mm_solid.inst.cfg | 22 ++ ...hodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg | 8 +- ...thodxl_1c_um-absr-175_0.2mm_solid.inst.cfg | 8 +- ...ethodxl_1c_um-asa-175_0.2mm_solid.inst.cfg | 8 +- ...xl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg | 22 ++ ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 8 +- ...ethodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...l_1c_um-tough-pla-175_0.2mm_solid.inst.cfg | 24 ++ ...thodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg | 22 ++ ...hodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg | 8 +- ...thodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg | 8 +- ...hodxl_labs_um-abs-175_0.2mm_solid.inst.cfg | 22 ++ ...dxl_labs_um-abscf-175_0.2mm_solid.inst.cfg | 8 +- ...odxl_labs_um-absr-175_0.2mm_solid.inst.cfg | 8 +- ...hodxl_labs_um-asa-175_0.2mm_solid.inst.cfg | 8 +- ..._labs_um-nylon-cf-175_0.2mm_solid.inst.cfg | 22 ++ ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 8 +- ...hodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...labs_um-tough-pla-175_0.2mm_solid.inst.cfg | 24 ++ .../um_method_1a_um-petg-175_0.2mm.inst.cfg | 69 +++++ .../um_method_1a_um-pla-175_0.2mm.inst.cfg | 3 - ..._method_1a_um-tough-pla-175_0.2mm.inst.cfg | 84 +++++++ ...m_method_1c_um-nylon-cf-175_0.2mm.inst.cfg | 60 +++++ ...method_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 10 +- .../um_method_1c_um-petg-175_0.2mm.inst.cfg | 69 +++++ .../um_method_1c_um-pla-175_0.2mm.inst.cfg | 3 - ..._method_1c_um-tough-pla-175_0.2mm.inst.cfg | 84 +++++++ .../um_method_2a_um-pva-175_0.2mm.inst.cfg | 13 +- .../um_method_global_Fast_Quality.inst.cfg | 15 ++ ...method_labs_um-nylon-cf-175_0.2mm.inst.cfg | 60 +++++ ...thod_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 10 +- .../um_method_labs_um-petg-175_0.2mm.inst.cfg | 69 +++++ .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 3 - ...ethod_labs_um-tough-pla-175_0.2mm.inst.cfg | 84 +++++++ .../um_methodx_1a_um-petg-175_0.2mm.inst.cfg | 69 +++++ .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 3 - ...methodx_1a_um-tough-pla-175_0.2mm.inst.cfg | 84 +++++++ .../um_methodx_1c_um-abs-175_0.2mm.inst.cfg | 63 +++++ .../um_methodx_1c_um-abscf-175_0.2mm.inst.cfg | 13 +- .../um_methodx_1c_um-absr-175_0.2mm.inst.cfg | 21 +- .../um_methodx_1c_um-asa-175_0.2mm.inst.cfg | 13 +- ..._methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg | 60 +++++ ...ethodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 10 +- .../um_methodx_1c_um-petg-175_0.2mm.inst.cfg | 69 +++++ .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 3 - ...methodx_1c_um-tough-pla-175_0.2mm.inst.cfg | 84 +++++++ .../um_methodx_1xa_um-abs-175_0.2mm.inst.cfg | 63 +++++ .../um_methodx_1xa_um-absr-175_0.2mm.inst.cfg | 21 +- .../um_methodx_1xa_um-asa-175_0.2mm.inst.cfg | 13 +- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 13 +- ...thodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg | 6 +- .../um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg | 26 +- .../um_methodx_global_Fast_Quality.inst.cfg | 15 ++ .../um_methodx_labs_um-abs-175_0.2mm.inst.cfg | 63 +++++ ...m_methodx_labs_um-abscf-175_0.2mm.inst.cfg | 13 +- ...um_methodx_labs_um-absr-175_0.2mm.inst.cfg | 21 +- .../um_methodx_labs_um-asa-175_0.2mm.inst.cfg | 13 +- ...ethodx_labs_um-nylon-cf-175_0.2mm.inst.cfg | 60 +++++ ...hodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 10 +- ...um_methodx_labs_um-petg-175_0.2mm.inst.cfg | 69 +++++ .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 3 - ...thodx_labs_um-tough-pla-175_0.2mm.inst.cfg | 84 +++++++ .../um_methodxl_1a_um-petg-175_0.2mm.inst.cfg | 67 +++++ .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 3 - ...ethodxl_1a_um-tough-pla-175_0.2mm.inst.cfg | 82 ++++++ .../um_methodxl_1c_um-abs-175_0.2mm.inst.cfg | 63 +++++ ...um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg | 13 +- .../um_methodxl_1c_um-absr-175_0.2mm.inst.cfg | 21 +- .../um_methodxl_1c_um-asa-175_0.2mm.inst.cfg | 13 +- ...methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg | 60 +++++ ...thodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 10 +- .../um_methodxl_1c_um-petg-175_0.2mm.inst.cfg | 67 +++++ .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 3 - ...ethodxl_1c_um-tough-pla-175_0.2mm.inst.cfg | 82 ++++++ .../um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg | 63 +++++ ...um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg | 21 +- .../um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg | 13 +- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 13 +- ...hodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg | 6 +- ...um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg | 26 +- .../um_methodxl_global_Fast_Quality.inst.cfg | 15 ++ ...um_methodxl_labs_um-abs-175_0.2mm.inst.cfg | 63 +++++ ..._methodxl_labs_um-abscf-175_0.2mm.inst.cfg | 13 +- ...m_methodxl_labs_um-absr-175_0.2mm.inst.cfg | 21 +- ...um_methodxl_labs_um-asa-175_0.2mm.inst.cfg | 13 +- ...thodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg | 60 +++++ ...odxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 10 +- ...m_methodxl_labs_um-petg-175_0.2mm.inst.cfg | 67 +++++ ...um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 3 - ...hodxl_labs_um-tough-pla-175_0.2mm.inst.cfg | 82 ++++++ 127 files changed, 3286 insertions(+), 368 deletions(-) create mode 100644 resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_global_Fast_Quality.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_global_Fast_Quality.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_global_Fast_Quality.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 93a6b23f7b..2f4e372e28 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -23,19 +23,7 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_asa_175", - "generic_abs_175", - "generic_bvoh_175", - "generic_petg_175", - "generic_pla_175", - "generic_tough_pla_175", - "generic_pva_175", - "generic_cffpa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_hips_175", - "generic_pc_175", - "generic_tpu_175", + "generic_", "goofoo_", "ideagen3D_", "imade3d_", @@ -53,23 +41,22 @@ "ultimaker_absr_175", "ultimaker_abscf_175", "ultimaker_bvoh_175", - "ultimaker_petg_175", "ultimaker_cffpa_175", "ultimaker_cpe_175", - "ultimaker_nylon_175", "ultimaker_hips_175", "ultimaker_pc_175", "ultimaker_tpu_175", - "ultimaker_tough_pla_175", "ultimaker_rapidrinse_175", "ultimaker_sr30", + "ultimaker_metallic_pla_175", "verbatim_", "Vertex_", "volumic_", "xyzprinting_", "zyyx_pro_", "octofiber_", - "fiberlogy_" + "fiberlogy_", + "ultimaker_metallic_pla_175" ], "has_machine_materials": true, "has_machine_quality": true, @@ -98,7 +85,6 @@ "overrides": { "build_volume_temperature": { "maximum_value": "67" }, - "machine_depth": { "default_value": 236.48 }, "machine_disallowed_areas": { "default_value": [ @@ -128,9 +114,7 @@ ] ] }, - "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method" }, - "machine_width": { "default_value": 283.3 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } } diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 23e61410d9..7a91506b5b 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -9,42 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", "platform": "ultimaker_method_platform.stl", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], + "exclude_materials": [], "has_machine_materials": true, "has_machine_quality": true, "has_materials": true, @@ -170,8 +135,13 @@ "enabled": false, "value": "acceleration_print" }, - "adhesion_extruder_nr": { "value": 0 }, + "adhesion_extruder_nr": + { + "enabled": false, + "value": "min(extruderValues('extruder_nr'))" + }, "adhesion_type": { "value": "'raft'" }, + "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed": { "value": "cool_fan_speed_max" }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, @@ -195,14 +165,38 @@ { "force_depends_on_settings": [ "support_extruder_nr" ] }, + "cool_fan_full_at_height": { "value": "1 if resolveOrValue('adhesion_type') == 'raft' else layer_height + layer_height_0" }, + "cool_fan_full_layer": { "value": "1 if resolveOrValue('adhesion_type') == 'raft' else 3" }, "default_material_bed_temperature": { "resolve": "min(extruderValues('default_material_bed_temperature'))" }, "extruder_prime_pos_abs": { "default_value": true }, "gradual_support_infill_steps": { "value": 0 }, + "group_outer_walls": { "value": false }, + "infill_angles": + { + "value": [ + 45, + 45, + 45, + 45, + 45, + 135, + 135, + 135, + 135, + 135 + ] + }, "infill_before_walls": { "value": false }, "infill_material_flow": { "value": "material_flow" }, "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'grid' if infill_sparse_density < 80 else 'lines'" }, + "infill_pattern": { "value": "'zigzag'" }, "infill_wipe_dist": { "value": 0 }, + "initial_layer_line_width_factor": + { + "maximum_value": 350, + "maximum_value_warning": 320, + "value": "100 if resolveOrValue('adhesion_type') == 'raft' else 200" + }, "inset_direction": { "value": "'inside_out'" }, "jerk_enabled": { @@ -309,22 +303,66 @@ "enabled": false, "value": "jerk_print" }, + "layer_height_0": { "value": "layer_height if resolveOrValue('adhesion_type') == 'raft' else layer_height * 1.25" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, + "machine_depth": { "default_value": 236.48 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -95.205], + [-141.65, -95.205] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 95.205], + [-141.65, 95.205] + ], + [ + [-141.65, -118.11], + [-76.149, -118.11], + [-76.149, 118.37], + [-141.65, 118.37] + ], + [ + [76.149, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [76.149, 118.37] + ] + ], + "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" + }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_heated_bed": { "default_value": false }, "machine_heated_build_volume": { "default_value": true }, + "machine_height": { "default_value": 196.749 }, "machine_min_cool_heat_time_window": { "value": 15 }, "machine_name": { "default_value": "UltiMaker Method" }, "machine_nozzle_cool_down_speed": { "value": 0.8 }, "machine_nozzle_heat_up_speed": { "value": 3.5 }, "machine_scale_fan_speed_zero_to_one": { "value": true }, "machine_start_gcode": { "default_value": "G0 Z20" }, + "machine_width": { "default_value": 283.3 }, "material_bed_temperature": { "enabled": "machine_heated_bed" }, + "material_final_print_temperature": + { + "maximum_value": "material_print_temperature", + "minimum_value": "material_standby_temperature" + }, "material_flow": { "value": 100 }, - "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_initial_print_temperature": + { + "maximum_value": "material_print_temperature", + "minimum_value": "material_standby_temperature", + "value": "material_print_temperature-5" + }, "material_print_temperature": { "force_depends_on_settings": [ "support_extruder_nr" ] @@ -339,17 +377,35 @@ "prime_tower_base_curve_magnitude": { "value": 2 }, "prime_tower_base_height": { "value": 6 }, "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": false }, + "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, "prime_tower_flow": { "value": "material_flow" }, - "prime_tower_line_width": { "value": 1 }, + "prime_tower_line_width": + { + "maximum_value": 2, + "maximum_value_warning": 1.5, + "value": 1 + }, + "prime_tower_mode": + { + "resolve": "'normal'", + "value": "'normal'" + }, "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, "prime_tower_wipe_enabled": { "value": true }, "print_sequence": { "enabled": false }, + "raft_acceleration": { "enabled": false }, "raft_airgap": { "force_depends_on_settings": [ "support_extruder_nr" ] }, + "raft_base_acceleration": { "enabled": false }, + "raft_base_extruder_nr": + { + "enabled": false, + "value": "min(extruderValues('extruder_nr'))" + }, "raft_base_fan_speed": { "value": 0 }, + "raft_base_jerk": { "enabled": false }, "raft_base_line_spacing": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ], @@ -358,9 +414,11 @@ "raft_base_line_width": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ], + "maximum_value": 2.5, + "maximum_value_warning": 1.8, "value": 1.4 }, - "raft_base_speed": { "value": 10 }, + "raft_base_speed": { "value": "raft_speed" }, "raft_base_thickness": { "force_depends_on_settings": [ @@ -369,24 +427,24 @@ ], "value": 0.8 }, - "raft_base_wall_count": - { - "force_depends_on_settings": [ "support_extruder_nr" ], - "value": "raft_wall_count" - }, - "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, + "raft_base_wall_count": { "value": "raft_wall_count" }, + "raft_interface_acceleration": { "enabled": false }, + "raft_interface_extruder_nr": { "value": "max(extruderValues('extruder_nr'))" }, "raft_interface_fan_speed": { "value": 0 }, "raft_interface_infill_overlap": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ] }, + "raft_interface_infill_overlap_mm": { "maximum_value_warning": "2 * machine_nozzle_size" }, + "raft_interface_jerk": { "enabled": false }, "raft_interface_layers": { "value": 2 }, "raft_interface_line_spacing": { "force_depends_on_settings": [ "raft_base_thickness", "raft_interface_extruder_nr" - ] + ], + "minimum_value_warning": "raft_interface_line_width * 0.8" }, "raft_interface_line_width": { @@ -396,7 +454,11 @@ ], "value": 0.7 }, - "raft_interface_speed": { "value": 90 }, + "raft_interface_speed": + { + "force_depends_on_settings": [ "support_extruder_nr" ], + "value": "raft_speed * 5" + }, "raft_interface_thickness": { "value": 0.3 }, "raft_interface_wall_count": { "value": "raft_wall_count" }, "raft_interface_z_offset": @@ -406,14 +468,18 @@ "raft_interface_extruder_nr" ] }, + "raft_jerk": { "enabled": false }, "raft_margin": { "value": 1.2 }, "raft_smoothing": { "value": 9.5 }, - "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, + "raft_speed": { "value": 10 }, + "raft_surface_acceleration": { "enabled": false }, + "raft_surface_extruder_nr": { "value": "max(extruderValues('extruder_nr'))" }, "raft_surface_fan_speed": { "value": 0 }, "raft_surface_flow": { "force_depends_on_settings": [ "support_extruder_nr" ] }, + "raft_surface_jerk": { "enabled": false }, "raft_surface_speed": { "force_depends_on_settings": [ "support_extruder_nr" ] @@ -430,25 +496,52 @@ "raft_wall_count": { "value": 2 }, "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, - "retraction_combing": { "value": "'off'" }, + "retraction_combing": + { + "enabled": false, + "value": "'off'" + }, "retraction_combing_max_distance": { "value": "speed_travel / 10" }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 0 }, "retraction_hop": { "value": 0.4 }, "retraction_hop_enabled": { "value": true }, "retraction_hop_only_when_collides": { "value": false }, - "retraction_min_travel": { "value": "0.6" }, + "retraction_min_travel": + { + "minimum_value_warning": "line_width * 1.25", + "value": 0.6 + }, "retraction_prime_speed": { "value": "retraction_speed" }, "retraction_speed": { "value": 5 }, - "roofing_layer_count": { "value": 2 }, + "roofing_angles": + { + "value": [45, 135] + }, + "roofing_layer_count": + { + "maximum_value_warning": 10, + "minimum_value": 0, + "minimum_value_warning": 1, + "value": 2 + }, "roofing_material_flow": { "value": "material_flow" }, "roofing_monotonic": { "value": true }, + "skin_angles": + { + "value": [0, 90] + }, "skin_material_flow": { "value": "material_flow" }, "skin_material_flow_layer_0": { "value": "material_flow" }, "skin_monotonic": { "value": true }, "skin_outline_count": { "value": 0 }, "skin_overlap": { "value": 0 }, "skin_preshrink": { "value": 0 }, + "skirt_brim_extruder_nr": + { + "enabled": false, + "value": "min(extruderValues('extruder_nr'))" + }, "skirt_brim_material_flow": { "value": "material_flow" }, "skirt_brim_minimal_length": { "value": 500 }, "small_skin_width": { "value": 4 }, @@ -465,34 +558,58 @@ "speed_wall_x": { "value": "speed_wall" }, "support_angle": { "value": 40 }, "support_bottom_height": { "value": "2*support_infill_sparse_thickness" }, + "support_bottom_line_width": + { + "maximum_value": 3, + "maximum_value_warning": 1.8 + }, "support_bottom_material_flow": { "value": "material_flow" }, - "support_bottom_wall_count": { "value": "0" }, + "support_bottom_wall_count": + { + "maximum_value": 8, + "maximum_value_warning": 6, + "value": 0 + }, "support_brim_enable": { "value": false }, "support_conical_min_width": { "value": 10 }, "support_enable": { "value": true }, "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, "support_fan_enable": { "value": "True" }, + "support_infill_angles": + { + "value": [ + 45 + ] + }, "support_infill_rate": { "value": 20.0 }, "support_infill_sparse_thickness": { "value": "layer_height" }, "support_interface_enable": { "value": true }, "support_interface_height": { "value": "4*support_infill_sparse_thickness" }, "support_interface_material_flow": { "value": "material_flow" }, "support_interface_offset": { "value": "1" }, - "support_interface_pattern": { "value": "'lines'" }, + "support_interface_pattern": { "value": "'zigzag' if support_wall_count > 1 else 'lines'" }, "support_interface_wall_count": { "value": "1" }, + "support_join_distance": { "value": "4.5 if support_wall_count > 1 else 2" }, "support_material_flow": { "value": "material_flow" }, - "support_offset": { "value": "1.8" }, - "support_pattern": { "value": "'lines'" }, + "support_offset": { "value": "2.4 if support_wall_count > 1 else 1.8" }, + "support_pattern": { "value": "'zigzag' if support_wall_count > 1 else 'lines'" }, "support_roof_height": { "value": "4*layer_height" }, "support_roof_material_flow": { "value": "material_flow" }, "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_use_towers": { "value": "False" }, + "support_use_towers": { "value": false }, "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" }, "support_xy_distance": { "value": 0.2 }, "support_xy_distance_overhang": { "value": "support_xy_distance" }, "switch_extruder_retraction_amount": { "value": 0.5 }, "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, - "top_bottom_thickness": { "value": "5*layer_height" }, + "top_bottom_pattern": { "value": "'zigzag'" }, + "top_bottom_pattern_0": { "value": "'zigzag'" }, + "top_bottom_thickness": + { + "minimum_value_warning": 0.3, + "value": "4*layer_height" + }, + "top_thickness": { "value": "top_bottom_thickness * 1.5" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "travel_avoid_other_parts": { "value": false }, "wall_0_inset": { "value": 0 }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 07efe3ef80..a5298473ed 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -23,7 +23,18 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_", + "generic_asa_175", + "generic_abs_175", + "generic_bvoh_175", + "generic_petg_175", + "generic_pla_175", + "generic_tough_pla_175", + "generic_pva_175", + "generic_cffpa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_hips_175", + "generic_tpu_175", "goofoo_", "ideagen3D_", "imade3d_", @@ -36,14 +47,14 @@ "polywood_pla", "redd_", "tizyx_", - "ultimaker_tough_pla_175", "verbatim_", "Vertex_", "volumic_", "xyzprinting_", "zyyx_pro_", "octofiber_", - "fiberlogy_" + "fiberlogy_", + "ultimaker_metallic_pla_175" ], "has_machine_materials": true, "has_machine_quality": true, @@ -72,7 +83,6 @@ "overrides": { "build_volume_temperature": { "maximum_value": "107" }, - "machine_depth": { "default_value": 236.48 }, "machine_disallowed_areas": { "default_value": [ @@ -102,9 +112,7 @@ ] ] }, - "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method X" }, - "machine_width": { "default_value": 283.3 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } } diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 993a99a36c..f5c9ba9958 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -9,6 +9,42 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", "platform": "ultimaker_method_xl_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_", + "ultimaker_metallic_pla_175" + ], "has_machine_materials": true, "has_machine_quality": true, "has_materials": true, @@ -56,14 +92,26 @@ [205, 160], [154.5, 160] ] - ] + ], + "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" }, "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 320 }, + "machine_height": { "default_value": 319.9 }, "machine_name": { "default_value": "UltiMaker Method XL" }, "machine_width": { "default_value": 410 }, "prime_tower_position_x": { "value": "(305 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (305 / 2)" }, "prime_tower_position_y": { "value": "305 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (305 / 2)" }, - "speed_travel": { "value": 500 } + "speed_travel": + { + "maximum_value": 500, + "maximum_value_warning": 450, + "value": 400 + }, + "speed_travel_layer_0": + { + "maximum_value": 500, + "maximum_value_warning": 450, + "value": 250 + } } } \ No newline at end of file diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index fdfbe77c33..927399a836 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -12,6 +12,12 @@ type = intent variant = 1A [values] +bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 -infill_sparse_density = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..410e483e60 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1A + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 47 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..71c6d9d329 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 231cf74ea3..2477908a4f 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1C [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index 87cc96fb5a..a708bfdb10 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -12,6 +12,12 @@ type = intent variant = 1C [values] +bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 -infill_sparse_density = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..b361ff9c78 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 47 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..5ab5c06f0c --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 4a05977a4e..09fdabc249 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = LABS [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 6c9d832805..d2414acb3c 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -12,6 +12,12 @@ type = intent variant = LABS [values] +bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 -infill_sparse_density = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..31a9353962 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 47 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 2087c38cba..2dd9cc562b 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -12,6 +12,12 @@ type = intent variant = 1A [values] +bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 -infill_sparse_density = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..72573610e5 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1A + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 47 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..5fbebd5d37 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm_solid.inst.cfg index 697aa8842e..c9ff26a4a0 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1C [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_solid.inst.cfg index 8826f7e7d4..60a8f90e70 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1C [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg index 66464f600e..f4a43a5238 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1C [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..8b55a887da --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 021e1de2e1..ecf2072190 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1C [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index 330811df73..24aea3e0a0 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -12,6 +12,12 @@ type = intent variant = 1C [values] +bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 -infill_sparse_density = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..8453738f7c --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 47 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..eff1e7a3bb --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1XA + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_solid.inst.cfg index c426a99499..a421a36dfd 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1XA [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg index c9f5024258..dd12e9b01c 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1XA [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..34a0fdae0f --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg index 3d8106d85e..bf20b9bdbe 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = LABS [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg index ec07c4b98a..5b1181e830 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = LABS [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg index 6dbbce3d78..3917512f39 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = LABS [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..a367fe6d32 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 224e85f1af..1a283b953b 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = LABS [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 2a672307bb..71dbd92252 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -12,6 +12,12 @@ type = intent variant = LABS [values] +bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 -infill_sparse_density = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..74ee19dd10 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 47 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index 52b091486e..ab423e9cfa 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -12,7 +12,13 @@ type = intent variant = 1A [values] +bottom_thickness = =top_bottom_thickness build_volume_temperature = 45 -infill_sparse_density = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag material_bed_temperature = 45 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..415b889cdb --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1A + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 45 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +material_bed_temperature = 45 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..605f8cbb22 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg index 5714a796b3..45de0cd183 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1C [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_solid.inst.cfg index 603a19fa4f..628d4fe825 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1C [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg index 6e5f8557c5..448734f104 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1C [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..158e4a303b --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 0440ceb055..955d83ad4e 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1C [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index ce45abad85..f451b6600a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -12,7 +12,13 @@ type = intent variant = 1C [values] +bottom_thickness = =top_bottom_thickness build_volume_temperature = 45 -infill_sparse_density = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag material_bed_temperature = 45 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..eade52916a --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1C + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 45 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +material_bed_temperature = 45 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..8cd819b25a --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = intent +variant = 1XA + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg index 470f5547c1..170a209ff4 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1XA [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg index 4d8abac231..afd24eddf0 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = 1XA [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..2a34c6cb9d --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg index 21e54ab083..5872a8ebbf 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = LABS [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg index f1058ebdeb..a50f90c261 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = LABS [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg index 984fa20ae1..9e8c6198af 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = LABS [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..c6757b9150 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 4fa2252da3..1dfd005673 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,5 +12,11 @@ type = intent variant = LABS [values] -infill_sparse_density = 100 +bottom_thickness = =top_bottom_thickness +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index d5ea2ac7f0..28e7a2b8e3 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -12,7 +12,13 @@ type = intent variant = LABS [values] +bottom_thickness = =top_bottom_thickness build_volume_temperature = 45 -infill_sparse_density = 100 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag material_bed_temperature = 45 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..105776dd35 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = intent +variant = LABS + +[values] +bottom_thickness = =top_bottom_thickness +build_volume_temperature = 45 +infill_angles = [45,135] +infill_material_flow = 97 +infill_sparse_density = 99 +infill_sparse_pattern = zigzag +material_bed_temperature = 45 +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..5ef9cfe781 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg @@ -0,0 +1,69 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_petg_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1A +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_speed = 5 +initial_layer_line_width_factor = 150 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.2 +raft_base_infill_overlap = 10 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_infill_overlap = 35 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 +raft_speed = 15 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 40 +raft_surface_wall_count = 2 +skin_overlap = 10 +speed_layer_0 = 15 +speed_print = 60 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 40 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_line_width = =line_width +support_supported_skin_fan_speed = =cool_fan_speed if support_wall_count > 0 else cool_fan_speed_max +support_top_distance = =support_z_distance +support_xy_distance = 0.3 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.2 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 8d66532574..50b47bbf00 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -12,15 +12,12 @@ variant = 1A weight = -2 [values] -bottom_layers = 4 cool_fan_enabled = True -cool_fan_full_layer = 4 cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 -infill_sparse_density = 15 material_final_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..205b273eda --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1A +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.22 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_interface_z_offset = -0.1 +raft_margin = 3 +raft_speed = 15 +raft_surface_flow = 103 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +raft_surface_z_offset = -0.1 +seam_overhang_angle = 35 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 200 +skirt_gap = 2.0 +skirt_height = 1 +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =support_z_distance +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 75 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 0.8 +support_interface_pattern = zigzag +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow * 0.9 +support_offset = 1 +support_pattern = zigzag +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.32 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..05f9ea7503 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm.inst.cfg @@ -0,0 +1,60 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed_max = 65 +cool_min_layer_time = 3.5 +cool_min_speed = 7 +cool_min_temperature = =default_material_print_temperature-5 +initial_layer_line_width_factor = 120 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.18 +raft_base_infill_overlap = 5 +raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1 +raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_speed = =raft_speed * 7 +raft_interface_z_offset = -0.08 +raft_surface_flow = 105 +raft_surface_infill_overlap = 35 +raft_surface_line_spacing = 0.42 +raft_surface_speed = =raft_speed * 7 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.08 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = 12.0 +support_line_width = =line_width * 0.75 +support_material_flow = 90 +support_roof_density = 85 +support_xy_distance = 0.3 +support_z_distance = =layer_height + diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 6037ef01b1..38384f404c 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -23,12 +23,12 @@ raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 -speed_prime_tower = 30.0 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 55 -speed_topbottom = 55 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..0f5986e4de --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg @@ -0,0 +1,69 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_petg_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_speed = 5 +initial_layer_line_width_factor = 150 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.2 +raft_base_infill_overlap = 10 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_infill_overlap = 35 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 +raft_speed = 15 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 40 +raft_surface_wall_count = 2 +skin_overlap = 10 +speed_layer_0 = 15 +speed_print = 60 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 40 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_line_width = =line_width +support_supported_skin_fan_speed = =cool_fan_speed if support_wall_count > 0 else cool_fan_speed_max +support_top_distance = =support_z_distance +support_xy_distance = 0.3 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.2 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index 0914456ebc..e05d1c9123 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -12,15 +12,12 @@ variant = 1C weight = -2 [values] -bottom_layers = 4 cool_fan_enabled = True -cool_fan_full_layer = 4 cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 -infill_sparse_density = 15 material_final_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 diff --git a/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..c411ef0cb5 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.22 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_interface_z_offset = -0.1 +raft_margin = 3 +raft_speed = 15 +raft_surface_flow = 103 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +raft_surface_z_offset = -0.1 +seam_overhang_angle = 35 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 200 +skirt_gap = 2.0 +skirt_height = 1 +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =support_z_distance +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 75 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 0.8 +support_interface_pattern = zigzag +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow * 0.9 +support_offset = 1 +support_pattern = zigzag +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.32 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 99457a0867..f086d91692 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -26,22 +26,22 @@ raft_interface_infill_overlap = 50 raft_interface_layers = 1 raft_interface_line_spacing = =1.08 if raft_base_thickness == 0.5 else 0.9 raft_interface_line_width = =1.2 if raft_base_thickness == 0.5 else 1 -raft_interface_speed = 15 +raft_interface_speed = =speed_print * 3/10 raft_interface_z_offset = =-0.1 if raft_base_thickness == 0.5 else -0.05 raft_surface_flow = 110 raft_surface_infill_overlap = 50 raft_surface_line_spacing = 0.44 -raft_surface_speed = 20 +raft_surface_speed = =speed_print * 2/5 raft_surface_thickness = 0.27 raft_surface_z_offset = -0.075 retraction_min_travel = 5 retraction_speed = 1.75 -speed_layer_0 = 10 -speed_prime_tower = 10 +speed_layer_0 = =speed_print * 1/5 +speed_prime_tower = =speed_print * 1/5 speed_print = 50 speed_roofing = =speed_print speed_support = =speed_print -speed_support_bottom = 10 +speed_support_bottom = =speed_print * 1/5 speed_support_interface = =speed_print speed_topbottom = =speed_print speed_wall_0 = =speed_print @@ -59,11 +59,10 @@ support_infill_rate = 12 support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 1.8 -support_pattern = grid +support_pattern = zigzag support_roof_density = 95 support_roof_height = =layer_height*8 support_roof_line_width = 0.4 -support_use_towers = True switch_extruder_extra_prime_amount = 1 switch_extruder_retraction_amount = 2.5 switch_extruder_retraction_speeds = 3 diff --git a/resources/quality/ultimaker_method/um_method_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Fast_Quality.inst.cfg new file mode 100644 index 0000000000..5d3abc6ce7 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_global_Fast_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_method +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 23 +type = quality +weight = -2 + +[values] +layer_height = 0.1524 + diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..29562e0796 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm.inst.cfg @@ -0,0 +1,60 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed_max = 65 +cool_min_layer_time = 3.5 +cool_min_speed = 7 +cool_min_temperature = =default_material_print_temperature-5 +initial_layer_line_width_factor = 120 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.18 +raft_base_infill_overlap = 5 +raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1 +raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_speed = =raft_speed * 7 +raft_interface_z_offset = -0.08 +raft_surface_flow = 105 +raft_surface_infill_overlap = 35 +raft_surface_line_spacing = 0.42 +raft_surface_speed = =raft_speed * 7 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.08 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = 12.0 +support_line_width = =line_width * 0.75 +support_material_flow = 90 +support_roof_density = 85 +support_xy_distance = 0.3 +support_z_distance = =layer_height + diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 26ad40893d..a8aff67472 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -23,12 +23,12 @@ raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 -speed_prime_tower = 30.0 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 55 -speed_topbottom = 55 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..420461b125 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg @@ -0,0 +1,69 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_petg_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_speed = 5 +initial_layer_line_width_factor = 150 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.2 +raft_base_infill_overlap = 10 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_infill_overlap = 35 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 +raft_speed = 15 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 40 +raft_surface_wall_count = 2 +skin_overlap = 10 +speed_layer_0 = 15 +speed_print = 60 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 40 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_line_width = =line_width +support_supported_skin_fan_speed = =cool_fan_speed if support_wall_count > 0 else cool_fan_speed_max +support_top_distance = =support_z_distance +support_xy_distance = 0.3 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.2 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 8e29548abf..6fedd00868 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -12,15 +12,12 @@ variant = LABS weight = -2 [values] -bottom_layers = 4 cool_fan_enabled = True -cool_fan_full_layer = 4 cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 -infill_sparse_density = 15 material_final_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..46742b7589 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.22 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_interface_z_offset = -0.1 +raft_margin = 3 +raft_speed = 15 +raft_surface_flow = 103 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +raft_surface_z_offset = -0.1 +seam_overhang_angle = 35 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 200 +skirt_gap = 2.0 +skirt_height = 1 +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =support_z_distance +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 75 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 0.8 +support_interface_pattern = zigzag +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow * 0.9 +support_offset = 1 +support_pattern = zigzag +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.32 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..e61deada8a --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg @@ -0,0 +1,69 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_petg_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1A +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_speed = 5 +initial_layer_line_width_factor = 150 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.2 +raft_base_infill_overlap = 10 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_infill_overlap = 35 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 +raft_speed = 15 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 40 +raft_surface_wall_count = 2 +skin_overlap = 10 +speed_layer_0 = 15 +speed_print = 60 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 40 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_line_width = =line_width +support_supported_skin_fan_speed = =cool_fan_speed if support_wall_count > 0 else cool_fan_speed_max +support_top_distance = =support_z_distance +support_xy_distance = 0.3 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.2 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index 0954cd9362..d7ec35c684 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -12,15 +12,12 @@ variant = 1A weight = -2 [values] -bottom_layers = 4 cool_fan_enabled = True -cool_fan_full_layer = 4 cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 -infill_sparse_density = 15 material_final_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..73af8bcbf2 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1A +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.22 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_interface_z_offset = -0.1 +raft_margin = 3 +raft_speed = 15 +raft_surface_flow = 103 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +raft_surface_z_offset = -0.1 +seam_overhang_angle = 35 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 200 +skirt_gap = 2.0 +skirt_height = 1 +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =support_z_distance +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 75 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 0.8 +support_interface_pattern = zigzag +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow * 0.9 +support_offset = 1 +support_pattern = zigzag +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.32 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..e9170db215 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg @@ -0,0 +1,63 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = =extruder_nr == support_extruder_nr +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +material_final_print_temperature = 235 +material_initial_print_temperature = 235 +material_print_temperature_layer_0 = 250 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_surface_speed = 90 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 +speed_wall_x = =speed_wall +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_line_width = 0.3 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg index f88e970e86..a8a1e6131a 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -28,14 +27,14 @@ raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 raft_surface_z_offset = =-0.075 if extruder_nr == support_extruder_nr else 0 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = =speed_print * 11/24 speed_support = =speed_print -speed_topbottom = 85 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_topbottom = =speed_print * 17/24 +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 52 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg index 9b3f5994a4..382e65b9c2 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 75 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -26,18 +25,17 @@ material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature-5 if extruder_nr == support_extruder_nr else default_material_print_temperature raft_airgap = =0.16 if extruder_nr == support_extruder_nr else 0 raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 -raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_speed = =speed_print * 3/4 if extruder_nr == support_extruder_nr else 50 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 65 -speed_support = 100 -speed_support_interface = 75 -speed_topbottom = 55 -speed_travel = 250.0 -speed_wall = 25 -speed_wall_0 = 20 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height @@ -48,7 +46,6 @@ support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,1 support_infill_rate = 15.0 support_interface_density = 85 support_interface_enable = True -support_interface_pattern = lines support_line_width = 0.3 support_material_flow = 85 support_roof_density = 85 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg index de573c160b..c1d613b997 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 85.0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -29,14 +28,14 @@ retraction_amount = 0.5 retraction_min_travel = 3.2 skin_overlap = 10 small_skin_width = 3.6 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 65 +speed_roofing = =speed_print * 13/24 speed_support = =speed_print * 5/6 -speed_support_interface = 75 -speed_topbottom = 55 -speed_wall = 25 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 speed_wall_0 = =speed_print * 1/6 speed_wall_x = =speed_wall support_angle = 50 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..c629a1a1fc --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg @@ -0,0 +1,60 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed_max = 65 +cool_min_layer_time = 3.5 +cool_min_speed = 7 +cool_min_temperature = =default_material_print_temperature-5 +initial_layer_line_width_factor = 120 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.18 +raft_base_infill_overlap = 5 +raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1 +raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_speed = =raft_speed * 7 +raft_interface_z_offset = -0.08 +raft_surface_flow = 105 +raft_surface_infill_overlap = 35 +raft_surface_line_spacing = 0.42 +raft_surface_speed = =raft_speed * 7 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.08 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = 12.0 +support_line_width = =line_width * 0.75 +support_material_flow = 90 +support_roof_density = 85 +support_xy_distance = 0.3 +support_z_distance = =layer_height + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 038dee5842..f56688dbbf 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -23,12 +23,12 @@ raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 -speed_prime_tower = 30.0 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 55 -speed_topbottom = 55 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..a16d223f2c --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg @@ -0,0 +1,69 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_petg_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_speed = 5 +initial_layer_line_width_factor = 150 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.2 +raft_base_infill_overlap = 10 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_infill_overlap = 35 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 +raft_speed = 15 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 40 +raft_surface_wall_count = 2 +skin_overlap = 10 +speed_layer_0 = 15 +speed_print = 60 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 40 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_line_width = =line_width +support_supported_skin_fan_speed = =cool_fan_speed if support_wall_count > 0 else cool_fan_speed_max +support_top_distance = =support_z_distance +support_xy_distance = 0.3 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.2 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index cd94a847a3..1f034e1ef7 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -12,15 +12,12 @@ variant = 1C weight = -2 [values] -bottom_layers = 4 cool_fan_enabled = True -cool_fan_full_layer = 4 cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 -infill_sparse_density = 15 material_final_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..deee76d6c6 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.22 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_interface_z_offset = -0.1 +raft_margin = 3 +raft_speed = 15 +raft_surface_flow = 103 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +raft_surface_z_offset = -0.1 +seam_overhang_angle = 35 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 200 +skirt_gap = 2.0 +skirt_height = 1 +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =support_z_distance +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 75 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 0.8 +support_interface_pattern = zigzag +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow * 0.9 +support_offset = 1 +support_pattern = zigzag +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.32 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..8481ee5a7a --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg @@ -0,0 +1,63 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1XA +weight = -2 + +[values] +cool_fan_enabled = =extruder_nr == support_extruder_nr +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +material_final_print_temperature = 235 +material_initial_print_temperature = 235 +material_print_temperature_layer_0 = 250 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_surface_speed = 90 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 +speed_wall_x = =speed_wall +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_line_width = 0.3 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg index bd0bc29c93..a4478dd3f8 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 75 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -26,18 +25,17 @@ material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature-5 if extruder_nr == support_extruder_nr else default_material_print_temperature raft_airgap = =0.16 if extruder_nr == support_extruder_nr else 0 raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 -raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_speed = =speed_print * 3/4 if extruder_nr == support_extruder_nr else 50 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 65 -speed_support = 100 -speed_support_interface = 75 -speed_topbottom = 55 -speed_travel = 250.0 -speed_wall = 25 -speed_wall_0 = 20 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height @@ -48,7 +46,6 @@ support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,1 support_infill_rate = 15.0 support_interface_density = 85 support_interface_enable = True -support_interface_pattern = lines support_line_width = 0.3 support_material_flow = 85 support_roof_density = 85 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg index 426294338c..b281f4c107 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 85.0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -29,14 +28,14 @@ retraction_amount = 0.5 retraction_min_travel = 3.2 skin_overlap = 10 small_skin_width = 3.6 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 65 +speed_roofing = =speed_print * 13/24 speed_support = =speed_print * 5/6 -speed_support_interface = 75 -speed_topbottom = 55 -speed_wall = 25 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 speed_wall_0 = =speed_print * 1/6 speed_wall_x = =speed_wall support_angle = 50 diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 9c2e0c66ed..c3a608dfe0 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -26,22 +26,22 @@ raft_interface_infill_overlap = 50 raft_interface_layers = 1 raft_interface_line_spacing = =1.08 if raft_base_thickness == 0.5 else 0.9 raft_interface_line_width = =1.2 if raft_base_thickness == 0.5 else 1 -raft_interface_speed = 15 +raft_interface_speed = =speed_print * 3/10 raft_interface_z_offset = =-0.1 if raft_base_thickness == 0.5 else -0.05 raft_surface_flow = 110 raft_surface_infill_overlap = 50 raft_surface_line_spacing = 0.44 -raft_surface_speed = 20 +raft_surface_speed = =speed_print * 2/5 raft_surface_thickness = 0.27 raft_surface_z_offset = -0.075 retraction_min_travel = 5 retraction_speed = 1.75 -speed_layer_0 = 10 -speed_prime_tower = 10 +speed_layer_0 = =speed_print * 1/5 +speed_prime_tower = =speed_print * 1/5 speed_print = 50 speed_roofing = =speed_print speed_support = =speed_print -speed_support_bottom = 10 +speed_support_bottom = =speed_print * 1/5 speed_support_interface = =speed_print speed_topbottom = =speed_print speed_wall_0 = =speed_print @@ -59,11 +59,10 @@ support_infill_rate = 12 support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 1.8 -support_pattern = grid +support_pattern = zigzag support_roof_density = 95 support_roof_height = =layer_height*8 support_roof_line_width = 0.4 -support_use_towers = True switch_extruder_extra_prime_amount = 1 switch_extruder_retraction_amount = 2.5 switch_extruder_retraction_speeds = 3 diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg index 4185387c5a..de37635939 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -16,6 +16,10 @@ brim_replaces_support = False cool_fan_enabled = False cool_min_temperature = =material_print_temperature raft_airgap = 0.0 +raft_interface_flow = 110 +raft_interface_infill_overlap = 25 +raft_interface_speed = 90 +raft_interface_z_offset = -0.1 retract_at_layer_change = True retraction_min_travel = 5 speed_prime_tower = 25.0 @@ -34,9 +38,7 @@ support_conical_min_width = 20 support_fan_enable = False support_interface_offset = 0 support_interface_wall_count = 2 -support_offset = 1.8 support_roof_height = =5*layer_height support_roof_line_width = 0.25 -support_use_towers = True support_xy_distance_overhang = 0.15 diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg index 44f221726d..ca0ca7de6c 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg @@ -16,21 +16,25 @@ brim_replaces_support = False cool_fan_enabled = False cool_min_temperature = =material_print_temperature raft_airgap = 0.0 +raft_interface_flow = 110 +raft_interface_infill_overlap = 25 raft_interface_line_width = 0.7 -raft_interface_speed = 70 -raft_surface_speed = 90 +raft_interface_speed = =speed_print * 5/9 +raft_interface_z_offset = -0.1 +raft_surface_speed = =speed_print retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 5 -speed_prime_tower = 25.0 -speed_print = 50 -speed_roofing = =speed_print +speed_prime_tower = =speed_print * 1/3 +speed_print = 90 +speed_roofing = =speed_print * 5/9 speed_support = =speed_print -speed_support_bottom = =speed_print * 3/5 -speed_support_interface = =speed_print -speed_topbottom = =speed_print -speed_wall_0 = =speed_print -speed_wall_x = =speed_wall_0 +speed_support_bottom = =speed_print * 1/3 +speed_support_interface = =speed_print * 5/9 +speed_topbottom = =speed_print * 5/9 +speed_wall = =speed_print * 5/9 +speed_wall_0 = =speed_wall * 4/5 +speed_wall_x = =speed_wall support_bottom_wall_count = 5 support_conical_angle = 20 support_conical_enabled = True @@ -38,7 +42,5 @@ support_conical_min_width = 20 support_fan_enable = False support_interface_offset = 0 support_interface_wall_count = 2 -support_offset = 0.8 support_roof_height = =5*layer_height -support_use_towers = True diff --git a/resources/quality/ultimaker_methodx/um_methodx_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_global_Fast_Quality.inst.cfg new file mode 100644 index 0000000000..22becb55c9 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_global_Fast_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_methodx +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 23 +type = quality +weight = -2 + +[values] +layer_height = 0.1524 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..36db7aed8d --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg @@ -0,0 +1,63 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = =extruder_nr == support_extruder_nr +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +material_final_print_temperature = 235 +material_initial_print_temperature = 235 +material_print_temperature_layer_0 = 250 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 +raft_surface_speed = 90 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 +speed_wall_x = =speed_wall +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_line_width = 0.3 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg index 6e2b803865..c6ad6f86da 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -28,14 +27,14 @@ raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 raft_surface_z_offset = =-0.075 if extruder_nr == support_extruder_nr else 0 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = =speed_print * 11/24 speed_support = =speed_print -speed_topbottom = 85 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_topbottom = =speed_print * 17/24 +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 52 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg index af00dbfeb3..e5862914f6 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 75 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -26,18 +25,17 @@ material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature-5 if extruder_nr == support_extruder_nr else default_material_print_temperature raft_airgap = =0.16 if extruder_nr == support_extruder_nr else 0 raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8 -raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_speed = =speed_print * 3/4 if extruder_nr == support_extruder_nr else 50 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 65 -speed_support = 100 -speed_support_interface = 75 -speed_topbottom = 55 -speed_travel = 250.0 -speed_wall = 25 -speed_wall_0 = 20 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height @@ -48,7 +46,6 @@ support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,1 support_infill_rate = 15.0 support_interface_density = 85 support_interface_enable = True -support_interface_pattern = lines support_line_width = 0.3 support_material_flow = 85 support_roof_density = 85 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg index 4db0b6b7ec..720e0c81b0 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 85.0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -29,14 +28,14 @@ retraction_amount = 0.5 retraction_min_travel = 3.2 skin_overlap = 10 small_skin_width = 3.6 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 65 +speed_roofing = =speed_print * 13/24 speed_support = =speed_print * 5/6 -speed_support_interface = 75 -speed_topbottom = 55 -speed_wall = 25 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 speed_wall_0 = =speed_print * 1/6 speed_wall_x = =speed_wall support_angle = 50 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..99dceedb0a --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm.inst.cfg @@ -0,0 +1,60 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed_max = 65 +cool_min_layer_time = 3.5 +cool_min_speed = 7 +cool_min_temperature = =default_material_print_temperature-5 +initial_layer_line_width_factor = 120 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.18 +raft_base_infill_overlap = 5 +raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1 +raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_speed = =raft_speed * 7 +raft_interface_z_offset = -0.08 +raft_surface_flow = 105 +raft_surface_infill_overlap = 35 +raft_surface_line_spacing = 0.42 +raft_surface_speed = =raft_speed * 7 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.08 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = 12.0 +support_line_width = =line_width * 0.75 +support_material_flow = 90 +support_roof_density = 85 +support_xy_distance = 0.3 +support_z_distance = =layer_height + diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 00b5775c9b..32281bdff4 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -23,12 +23,12 @@ raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 -speed_prime_tower = 30.0 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 55 -speed_topbottom = 55 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..f92032bdd9 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg @@ -0,0 +1,69 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_petg_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_speed = 5 +initial_layer_line_width_factor = 150 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.2 +raft_base_infill_overlap = 10 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_infill_overlap = 35 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 +raft_speed = 15 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 40 +raft_surface_wall_count = 2 +skin_overlap = 10 +speed_layer_0 = 15 +speed_print = 60 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 40 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_line_width = =line_width +support_supported_skin_fan_speed = =cool_fan_speed if support_wall_count > 0 else cool_fan_speed_max +support_top_distance = =support_z_distance +support_xy_distance = 0.3 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.2 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index d4e56ee166..c40f7a5e1d 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -12,15 +12,12 @@ variant = LABS weight = -2 [values] -bottom_layers = 4 cool_fan_enabled = True -cool_fan_full_layer = 4 cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 -infill_sparse_density = 15 material_final_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..05aecd0542 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.22 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_interface_z_offset = -0.1 +raft_margin = 3 +raft_speed = 15 +raft_surface_flow = 103 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +raft_surface_z_offset = -0.1 +seam_overhang_angle = 35 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 200 +skirt_gap = 2.0 +skirt_height = 1 +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =support_z_distance +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 75 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 0.8 +support_interface_pattern = zigzag +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow * 0.9 +support_offset = 1 +support_pattern = zigzag +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.32 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..8b4f91cd67 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg @@ -0,0 +1,67 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_petg_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1A +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_speed = 5 +initial_layer_line_width_factor = 150 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.2 +raft_base_infill_overlap = 10 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_infill_overlap = 35 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 40 +raft_speed = 15 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 40 +raft_surface_wall_count = 2 +skin_overlap = 10 +speed_layer_0 = 15 +speed_print = 60 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 40 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_line_width = =line_width +support_supported_skin_fan_speed = =cool_fan_speed if support_wall_count > 0 else cool_fan_speed_max +support_top_distance = =support_z_distance +support_xy_distance = 0.3 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.2 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index d4c3f1fad2..1c788d0ecb 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -12,15 +12,12 @@ variant = 1A weight = -2 [values] -bottom_layers = 4 cool_fan_enabled = True -cool_fan_full_layer = 4 cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 -infill_sparse_density = 15 material_final_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..fa8a3ea69c --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,82 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1A +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.22 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_z_offset = -0.1 +raft_margin = 3 +raft_speed = 15 +raft_surface_flow = 103 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +raft_surface_z_offset = -0.1 +seam_overhang_angle = 35 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 200 +skirt_gap = 2.0 +skirt_height = 1 +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =support_z_distance +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 75 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 0.8 +support_interface_pattern = zigzag +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow * 0.9 +support_offset = 1 +support_pattern = zigzag +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.32 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..f95261eaf7 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg @@ -0,0 +1,63 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = =extruder_nr == support_extruder_nr +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +material_final_print_temperature = 235 +material_initial_print_temperature = 235 +material_print_temperature_layer_0 = 250 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_speed = 10 +raft_surface_speed = 90 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_travel_layer_0 = 250 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 +speed_wall_x = =speed_wall +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_line_width = 0.3 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg index cafdccde66..e97cdb7126 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg @@ -14,7 +14,6 @@ weight = -2 [values] build_volume_temperature = 85 cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -30,14 +29,14 @@ raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 raft_surface_z_offset = =-0.075 if extruder_nr == support_extruder_nr else 0 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = =speed_print * 11/24 speed_support = =speed_print -speed_topbottom = 85 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_topbottom = =speed_print * 17/24 +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 52 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg index 8917031687..87771d65e8 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 75 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -25,18 +24,17 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature-5 if extruder_nr == support_extruder_nr else default_material_print_temperature raft_airgap = =0.18 if extruder_nr == support_extruder_nr else 0 -raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_speed = =speed_print * 3/4 if extruder_nr == support_extruder_nr else 50 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 65 -speed_support = 100 -speed_support_interface = 75 -speed_topbottom = 55 -speed_travel = 250.0 -speed_wall = 25 -speed_wall_0 = 20 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height @@ -47,7 +45,6 @@ support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,1 support_infill_rate = 15.0 support_interface_density = 85 support_interface_enable = True -support_interface_pattern = lines support_line_width = 0.3 support_material_flow = 85 support_roof_density = 85 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg index 9a1f0e2aa6..009880301a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 85.0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -28,15 +27,15 @@ retraction_amount = 0.5 retraction_min_travel = 3.2 skin_overlap = 10 small_skin_width = 3.6 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 65 +speed_roofing = =speed_print * 13/24 speed_support = =speed_print * 5/6 -speed_support_interface = 75 -speed_topbottom = 55 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 speed_travel_layer_0 = 250 -speed_wall = 25 +speed_wall = =speed_print * 5/24 speed_wall_0 = =speed_print * 1/6 speed_wall_x = =speed_wall support_angle = 50 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..eb081e421e --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg @@ -0,0 +1,60 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed_max = 65 +cool_min_layer_time = 3.5 +cool_min_speed = 7 +cool_min_temperature = =default_material_print_temperature-5 +initial_layer_line_width_factor = 120 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.18 +raft_base_infill_overlap = 5 +raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1 +raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_speed = =raft_speed * 7 +raft_interface_z_offset = -0.08 +raft_surface_flow = 105 +raft_surface_infill_overlap = 35 +raft_surface_line_spacing = 0.42 +raft_surface_speed = =raft_speed * 7 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.08 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = 12.0 +support_line_width = =line_width * 0.75 +support_material_flow = 90 +support_roof_density = 85 +support_xy_distance = 0.3 +support_z_distance = =layer_height + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg index e930693690..e5ff11f04a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -23,12 +23,12 @@ raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 -speed_prime_tower = 30.0 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 55 -speed_topbottom = 55 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..a6f2f15159 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg @@ -0,0 +1,67 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_petg_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_speed = 5 +initial_layer_line_width_factor = 150 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.2 +raft_base_infill_overlap = 10 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_infill_overlap = 35 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 40 +raft_speed = 15 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 40 +raft_surface_wall_count = 2 +skin_overlap = 10 +speed_layer_0 = 15 +speed_print = 60 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 40 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_line_width = =line_width +support_supported_skin_fan_speed = =cool_fan_speed if support_wall_count > 0 else cool_fan_speed_max +support_top_distance = =support_z_distance +support_xy_distance = 0.3 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.2 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index 5e2b40209c..afe4286ff2 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -12,15 +12,12 @@ variant = 1C weight = -2 [values] -bottom_layers = 4 cool_fan_enabled = True -cool_fan_full_layer = 4 cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 -infill_sparse_density = 15 material_final_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..a8183e2e87 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,82 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.22 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_z_offset = -0.1 +raft_margin = 3 +raft_speed = 15 +raft_surface_flow = 103 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +raft_surface_z_offset = -0.1 +seam_overhang_angle = 35 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 200 +skirt_gap = 2.0 +skirt_height = 1 +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =support_z_distance +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 75 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 0.8 +support_interface_pattern = zigzag +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow * 0.9 +support_offset = 1 +support_pattern = zigzag +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.32 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..ff53e2ec22 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg @@ -0,0 +1,63 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 1XA +weight = -2 + +[values] +cool_fan_enabled = =extruder_nr == support_extruder_nr +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +material_final_print_temperature = 235 +material_initial_print_temperature = 235 +material_print_temperature_layer_0 = 250 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_speed = 10 +raft_surface_speed = 90 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_travel_layer_0 = 250 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 +speed_wall_x = =speed_wall +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_line_width = 0.3 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg index e002c7fa64..483a2d2435 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 75 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -25,18 +24,17 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature-5 if extruder_nr == support_extruder_nr else default_material_print_temperature raft_airgap = =0.18 if extruder_nr == support_extruder_nr else 0 -raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_speed = =speed_print * 3/4 if extruder_nr == support_extruder_nr else 50 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 65 -speed_support = 100 -speed_support_interface = 75 -speed_topbottom = 55 -speed_travel = 250.0 -speed_wall = 25 -speed_wall_0 = 20 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height @@ -47,7 +45,6 @@ support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,1 support_infill_rate = 15.0 support_interface_density = 85 support_interface_enable = True -support_interface_pattern = lines support_line_width = 0.3 support_material_flow = 85 support_roof_density = 85 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg index bfb99a0484..34fabcf355 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 85.0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -28,15 +27,15 @@ retraction_amount = 0.5 retraction_min_travel = 3.2 skin_overlap = 10 small_skin_width = 3.6 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 65 +speed_roofing = =speed_print * 13/24 speed_support = =speed_print * 5/6 -speed_support_interface = 75 -speed_topbottom = 55 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 speed_travel_layer_0 = 250 -speed_wall = 25 +speed_wall = =speed_print * 5/24 speed_wall_0 = =speed_print * 1/6 speed_wall_x = =speed_wall support_angle = 50 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 9534302ee2..d110489341 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -26,22 +26,22 @@ raft_interface_infill_overlap = 50 raft_interface_layers = 1 raft_interface_line_spacing = =1.08 if raft_base_thickness == 0.5 else 0.9 raft_interface_line_width = =1.2 if raft_base_thickness == 0.5 else 1 -raft_interface_speed = 15 +raft_interface_speed = =speed_print * 3/10 raft_interface_z_offset = =-0.1 if raft_base_thickness == 0.5 else -0.05 raft_surface_flow = 110 raft_surface_infill_overlap = 50 raft_surface_line_spacing = 0.44 -raft_surface_speed = 20 +raft_surface_speed = =speed_print * 2/5 raft_surface_thickness = 0.27 raft_surface_z_offset = -0.075 retraction_min_travel = 5 retraction_speed = 1.75 -speed_layer_0 = 10 -speed_prime_tower = 10 +speed_layer_0 = =speed_print * 1/5 +speed_prime_tower = =speed_print * 1/5 speed_print = 50 speed_roofing = =speed_print speed_support = =speed_print -speed_support_bottom = 10 +speed_support_bottom = =speed_print * 1/5 speed_support_interface = =speed_print speed_topbottom = =speed_print speed_wall_0 = =speed_print @@ -59,11 +59,10 @@ support_infill_rate = 12 support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 1.8 -support_pattern = grid +support_pattern = zigzag support_roof_density = 95 support_roof_height = =layer_height*8 support_roof_line_width = 0.4 -support_use_towers = True switch_extruder_extra_prime_amount = 1 switch_extruder_retraction_amount = 2.5 switch_extruder_retraction_speeds = 3 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg index 50ba0208f7..dbb3d2b108 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -16,6 +16,10 @@ brim_replaces_support = False cool_fan_enabled = False cool_min_temperature = =material_print_temperature raft_airgap = 0.0 +raft_interface_flow = 110 +raft_interface_infill_overlap = 25 +raft_interface_speed = 90 +raft_interface_z_offset = -0.1 retract_at_layer_change = True retraction_min_travel = 5 speed_prime_tower = 25.0 @@ -34,9 +38,7 @@ support_conical_min_width = 20 support_fan_enable = False support_interface_offset = 0 support_interface_wall_count = 2 -support_offset = 1.8 support_roof_height = =5*layer_height support_roof_line_width = 0.25 -support_use_towers = True support_xy_distance_overhang = 0.15 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg index d4e0c0dd1a..51277840cb 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg @@ -16,21 +16,25 @@ brim_replaces_support = False cool_fan_enabled = False cool_min_temperature = =material_print_temperature raft_airgap = 0.0 +raft_interface_flow = 110 +raft_interface_infill_overlap = 25 raft_interface_line_width = 0.7 -raft_interface_speed = 70 -raft_surface_speed = 90 +raft_interface_speed = =speed_print * 5/9 +raft_interface_z_offset = -0.1 +raft_surface_speed = =speed_print retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 5 -speed_prime_tower = 25.0 -speed_print = 50 -speed_roofing = =speed_print +speed_prime_tower = =speed_print * 1/3 +speed_print = 90 +speed_roofing = =speed_print * 5/9 speed_support = =speed_print -speed_support_bottom = =speed_print * 3/5 -speed_support_interface = =speed_print -speed_topbottom = =speed_print -speed_wall_0 = =speed_print -speed_wall_x = =speed_wall_0 +speed_support_bottom = =speed_print * 1/3 +speed_support_interface = =speed_print * 5/9 +speed_topbottom = =speed_print * 5/9 +speed_wall = =speed_print * 5/9 +speed_wall_0 = =speed_wall * 4/5 +speed_wall_x = =speed_wall support_bottom_wall_count = 5 support_conical_angle = 20 support_conical_enabled = True @@ -38,7 +42,5 @@ support_conical_min_width = 20 support_fan_enable = False support_interface_offset = 0 support_interface_wall_count = 2 -support_offset = 0.8 support_roof_height = =5*layer_height -support_use_towers = True diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_global_Fast_Quality.inst.cfg new file mode 100644 index 0000000000..9b598c2c05 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_global_Fast_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_methodxl +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 23 +type = quality +weight = -2 + +[values] +layer_height = 0.15 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..6f0ac5328e --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg @@ -0,0 +1,63 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_abs_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = =extruder_nr == support_extruder_nr +cool_fan_speed = 85.0 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5) +material_final_print_temperature = 235 +material_initial_print_temperature = 235 +material_print_temperature_layer_0 = 250 +raft_airgap = =0.15 if extruder_nr == support_extruder_nr else 0 +raft_base_speed = 10 +raft_surface_speed = 90 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_travel_layer_0 = 250 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 +speed_wall_x = =speed_wall +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 15.0 +support_line_width = 0.3 +support_material_flow = =0.85*material_flow +support_roof_density = 85 +support_supported_skin_fan_speed = 60.0 +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.25 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg index 139736f7a3..4a6a7f11d7 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg @@ -14,7 +14,6 @@ weight = -2 [values] build_volume_temperature = 85 cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -30,14 +29,14 @@ raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 raft_surface_thickness = =0.25 if extruder_nr == support_extruder_nr else 0.2 raft_surface_z_offset = =-0.075 if extruder_nr == support_extruder_nr else 0 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 55 +speed_roofing = =speed_print * 11/24 speed_support = =speed_print -speed_topbottom = 85 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_topbottom = =speed_print * 17/24 +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 52 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg index 1d48bca467..6ba2c6fbfd 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 75 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -25,18 +24,17 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature-5 if extruder_nr == support_extruder_nr else default_material_print_temperature raft_airgap = =0.18 if extruder_nr == support_extruder_nr else 0 -raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50 +raft_surface_speed = =speed_print * 3/4 if extruder_nr == support_extruder_nr else 50 skin_overlap = 10 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 1/4 speed_print = 120.0 -speed_roofing = 65 -speed_support = 100 -speed_support_interface = 75 -speed_topbottom = 55 -speed_travel = 250.0 -speed_wall = 25 -speed_wall_0 = 20 +speed_roofing = =speed_print * 13/24 +speed_support = =speed_print * 5/6 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 +speed_wall = =speed_print * 5/24 +speed_wall_0 = =speed_print * 1/6 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height @@ -47,7 +45,6 @@ support_infill_angles = [45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,1 support_infill_rate = 15.0 support_interface_density = 85 support_interface_enable = True -support_interface_pattern = lines support_line_width = 0.3 support_material_flow = 85 support_roof_density = 85 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg index 657f43af9c..a4b42ed5a5 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg @@ -13,7 +13,6 @@ weight = -2 [values] cool_fan_enabled = =extruder_nr == support_extruder_nr -cool_fan_full_layer = 3 cool_fan_speed = 85.0 cool_fan_speed_0 = 0 cool_fan_speed_max = 100 @@ -28,15 +27,15 @@ retraction_amount = 0.5 retraction_min_travel = 3.2 skin_overlap = 10 small_skin_width = 3.6 -speed_layer_0 = 35 -speed_prime_tower = 30.0 +speed_layer_0 = =speed_print * 7/24 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 65 +speed_roofing = =speed_print * 13/24 speed_support = =speed_print * 5/6 -speed_support_interface = 75 -speed_topbottom = 55 +speed_support_interface = =speed_print * 15/24 +speed_topbottom = =speed_print * 11/24 speed_travel_layer_0 = 250 -speed_wall = 25 +speed_wall = =speed_print * 5/24 speed_wall_0 = =speed_print * 1/6 speed_wall_x = =speed_wall support_angle = 50 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..de870da341 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg @@ -0,0 +1,60 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_nylon-cf_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed_max = 65 +cool_min_layer_time = 3.5 +cool_min_speed = 7 +cool_min_temperature = =default_material_print_temperature-5 +initial_layer_line_width_factor = 120 +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.18 +raft_base_infill_overlap = 5 +raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1 +raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_speed = =raft_speed * 7 +raft_interface_z_offset = -0.08 +raft_surface_flow = 105 +raft_surface_infill_overlap = 35 +raft_surface_line_spacing = 0.42 +raft_surface_speed = =raft_speed * 7 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.08 +retraction_amount = 0.5 +retraction_min_travel = 3.2 +skin_overlap = 10 +small_skin_width = 3.6 +speed_prime_tower = =speed_print * 0.25 +speed_print = 120.0 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 +support_angle = 50 +support_bottom_density = 24 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_infill_rate = 12.0 +support_line_width = =line_width * 0.75 +support_material_flow = 90 +support_roof_density = 85 +support_xy_distance = 0.3 +support_z_distance = =layer_height + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg index d65d25f15e..92044f8449 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -23,12 +23,12 @@ raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 -speed_prime_tower = 30.0 +speed_prime_tower = =speed_print * 0.25 speed_print = 120.0 -speed_roofing = 55 -speed_topbottom = 55 -speed_wall_0 = 45 -speed_wall_x = 65 +speed_roofing = =speed_print * 11/24 +speed_topbottom = =speed_roofing +speed_wall_0 = =speed_print * 9/24 +speed_wall_x = =speed_print * 13/24 support_angle = 50 support_bottom_density = 24 support_bottom_distance = =layer_height diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..4a9d1b1405 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg @@ -0,0 +1,67 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_petg_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_min_layer_time = 10 +cool_min_speed = 5 +initial_layer_line_width_factor = 150 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.2 +raft_base_infill_overlap = 10 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_infill_overlap = 35 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 40 +raft_speed = 15 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 40 +raft_surface_wall_count = 2 +skin_overlap = 10 +speed_layer_0 = 15 +speed_print = 60 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 40 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_line_width = =line_width +support_supported_skin_fan_speed = =cool_fan_speed if support_wall_count > 0 else cool_fan_speed_max +support_top_distance = =support_z_distance +support_xy_distance = 0.3 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.2 +switch_extruder_retraction_amount = 1 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index 52b9b334a5..1d66d8c24a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -12,15 +12,12 @@ variant = LABS weight = -2 [values] -bottom_layers = 4 cool_fan_enabled = True -cool_fan_full_layer = 4 cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 -infill_sparse_density = 15 material_final_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..2fcd1a6e5a --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,82 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.22 +raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4 +raft_base_thickness = 0.6 +raft_interface_flow = 105 +raft_interface_infill_overlap = 25 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_z_offset = -0.1 +raft_margin = 3 +raft_speed = 15 +raft_surface_flow = 103 +raft_surface_infill_overlap = 25 +raft_surface_line_spacing = 0.425 +raft_surface_line_width = 0.4 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +raft_surface_z_offset = -0.1 +seam_overhang_angle = 35 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 200 +skirt_gap = 2.0 +skirt_height = 1 +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =support_z_distance +support_bottom_enable = False +support_infill_angles = [45 ] +support_infill_rate = 12 +support_interface_density = 75 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 0.8 +support_interface_pattern = zigzag +support_line_width = =line_width * 0.75 +support_material_flow = =material_flow * 0.9 +support_offset = 1 +support_pattern = zigzag +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_top_distance = =support_z_distance +support_xy_distance = 0.35 +support_xy_distance_overhang = 0.32 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +switch_extruder_retraction_amount = 1 + From e3f822b0aad4dfb9e304539eb64ce6c11038b12c Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 14:25:13 -0400 Subject: [PATCH 06/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 7a91506b5b..3f41ccc101 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -143,8 +143,7 @@ "adhesion_type": { "value": "'raft'" }, "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed": { "value": "cool_fan_speed_max" }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, "bridge_settings_enabled": { "value": true }, "bridge_skin_density": { "value": 100 }, From df5c502bc94c56c9e6041b44a07fcb36b828aafb Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 18:26:27 +0000 Subject: [PATCH 07/58] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 3f41ccc101..e8ab09e26e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -143,7 +143,7 @@ "adhesion_type": { "value": "'raft'" }, "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, "bridge_settings_enabled": { "value": true }, "bridge_skin_density": { "value": 100 }, From 077a922a6df495e6159ff8be8e2593c7310f3495 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 14:27:16 -0400 Subject: [PATCH 08/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index e8ab09e26e..8798241bc3 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -373,8 +373,7 @@ "multiple_mesh_overlap": { "value": 0 }, "optimize_wall_printing_order": { "value": true }, "prime_blob_enable": { "enabled": false }, - "prime_tower_base_curve_magnitude": { "value": 2 }, - "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_height": { "value": 6 }, "prime_tower_base_size": { "value": 10 }, "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, "prime_tower_flow": { "value": "material_flow" }, From ab44d8781cebc760cadaab3a7f3dd82ced08be99 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 18:28:51 +0000 Subject: [PATCH 09/58] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 8798241bc3..929c44e0b7 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -373,7 +373,7 @@ "multiple_mesh_overlap": { "value": 0 }, "optimize_wall_printing_order": { "value": true }, "prime_blob_enable": { "enabled": false }, - "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_height": { "value": 6 }, "prime_tower_base_size": { "value": 10 }, "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, "prime_tower_flow": { "value": "material_flow" }, From d0956347ffb044ed04a37532e3d29e39d2cd8290 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 14:38:43 -0400 Subject: [PATCH 10/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 929c44e0b7..21b94af93e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -416,8 +416,7 @@ "maximum_value_warning": 1.8, "value": 1.4 }, - "raft_base_speed": { "value": "raft_speed" }, - "raft_base_thickness": + "raft_base_thickness": { "force_depends_on_settings": [ "raft_interface_extruder_nr", From fd29ed6eb7903d8f13fc9153fff8b5120d24ba95 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 18:39:57 +0000 Subject: [PATCH 11/58] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 21b94af93e..58fc378816 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -416,7 +416,7 @@ "maximum_value_warning": 1.8, "value": 1.4 }, - "raft_base_thickness": + "raft_base_thickness": { "force_depends_on_settings": [ "raft_interface_extruder_nr", From 9a5e5443e11baf89c855dbeb3d3e6e6227090450 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 14:40:34 -0400 Subject: [PATCH 12/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 58fc378816..12a46a2527 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -522,8 +522,7 @@ "minimum_value_warning": 1, "value": 2 }, - "roofing_material_flow": { "value": "material_flow" }, - "roofing_monotonic": { "value": true }, + "roofing_monotonic": { "value": true }, "skin_angles": { "value": [0, 90] From 531c85f3c0fb15b139c25a45b3c1e018de65cc75 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 18:41:46 +0000 Subject: [PATCH 13/58] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 12a46a2527..a373a5988d 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -522,7 +522,7 @@ "minimum_value_warning": 1, "value": 2 }, - "roofing_monotonic": { "value": true }, + "roofing_monotonic": { "value": true }, "skin_angles": { "value": [0, 90] From 355715474af5ffd28c3b4806465638902e141865 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 27 Sep 2024 14:55:06 -0400 Subject: [PATCH 14/58] Corrected a typo in solid intent files, and removed redundant values from method base definition file PP-511 --- resources/definitions/ultimaker_method_base.def.json | 6 +----- .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_labs_um-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-abscf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-absr-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1xa_um-absr-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-absr-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- 53 files changed, 53 insertions(+), 57 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index a373a5988d..dc8541f7e9 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -144,7 +144,6 @@ "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, "bridge_settings_enabled": { "value": true }, "bridge_skin_density": { "value": 100 }, "bridge_skin_density_2": { "value": 100 }, @@ -373,9 +372,6 @@ "multiple_mesh_overlap": { "value": 0 }, "optimize_wall_printing_order": { "value": true }, "prime_blob_enable": { "enabled": false }, - "prime_tower_base_height": { "value": 6 }, - "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, "prime_tower_flow": { "value": "material_flow" }, "prime_tower_line_width": { @@ -522,7 +518,7 @@ "minimum_value_warning": 1, "value": 2 }, - "roofing_monotonic": { "value": true }, + "roofing_material_flow": { "value": "material_flow" }, "skin_angles": { "value": [0, 90] diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 927399a836..d3451ff092 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg index 410e483e60..59bde14f82 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg index 71c6d9d329..5bbe7588e2 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 2477908a4f..b289ef029d 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index a708bfdb10..d1afab4975 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg index b361ff9c78..44bfe19a1b 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg index 5ab5c06f0c..397a98cea9 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 09fdabc249..f6f560c6c4 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index d2414acb3c..4c6e0a065d 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg index 31a9353962..cb966aaf7b 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 2dd9cc562b..51ebc22483 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg index 72573610e5..22c04eaf82 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg index 5fbebd5d37..a6c1caadbe 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 100 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm_solid.inst.cfg index c9ff26a4a0..632d76dcb3 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_solid.inst.cfg index 60a8f90e70..6e24ed5066 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg index f4a43a5238..6e3e41cef9 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg index 8b55a887da..62f696f180 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index ecf2072190..e4b9a6d3d9 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index 24aea3e0a0..c15dad85c8 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg index 8453738f7c..f689ff85cf 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg index eff1e7a3bb..4656306ce1 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 100 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_solid.inst.cfg index a421a36dfd..6be3ee14cc 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1XA bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg index dd12e9b01c..dc5bd45821 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1XA bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg index 34a0fdae0f..12a2827eee 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 100 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg index bf20b9bdbe..96f7856441 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg index 5b1181e830..abfcf5395a 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg index 3917512f39..dbf8b4e923 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg index a367fe6d32..4ec545411d 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 1a283b953b..c46f8e5226 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 71dbd92252..2a355d02f7 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg index 74ee19dd10..727b7c05bf 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 47 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index ab423e9cfa..542a2bc232 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 45 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag material_bed_temperature = 45 top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg index 415b889cdb..d383d1e28f 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 45 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag material_bed_temperature = 45 top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg index 605f8cbb22..1e0317c71d 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg index 45de0cd183..5c307ffa72 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_solid.inst.cfg index 628d4fe825..2ec02a671f 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg index 448734f104..140d35edc6 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg index 158e4a303b..d983221d06 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 955d83ad4e..db1b475091 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1C bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index f451b6600a..dbb1da55fe 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 45 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag material_bed_temperature = 45 top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg index eade52916a..95748f3bd3 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 45 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag material_bed_temperature = 45 top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg index 8cd819b25a..a245ebb006 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1XA bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg index 170a209ff4..91c62b31b9 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1XA bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg index afd24eddf0..e4735d3425 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = 1XA bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg index 2a34c6cb9d..6a957dabc2 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg index 5872a8ebbf..fe110ecd40 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg index a50f90c261..b09c85102a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg index 9e8c6198af..dae561e776 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg index c6757b9150..ad82afea21 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 1dfd005673..3fad175b96 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -15,8 +15,8 @@ variant = LABS bottom_thickness = =top_bottom_thickness infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index 28e7a2b8e3..62687284de 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 45 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag material_bed_temperature = 45 top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg index 105776dd35..bd1ba0ee47 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -16,8 +16,8 @@ bottom_thickness = =top_bottom_thickness build_volume_temperature = 45 infill_angles = [45,135] infill_material_flow = 97 +infill_pattern = zigzag infill_sparse_density = 99 -infill_sparse_pattern = zigzag material_bed_temperature = 45 top_bottom_thickness = =layer_height * 2 top_thickness = =top_bottom_thickness From 89066d19e5fd33585c90d0751090772c7181234e Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 27 Sep 2024 15:05:46 -0400 Subject: [PATCH 15/58] removed more redundant values PP-511 --- resources/definitions/ultimaker_method_base.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index dc8541f7e9..48045188fa 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -144,7 +144,6 @@ "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_settings_enabled": { "value": true }, "bridge_skin_density": { "value": 100 }, "bridge_skin_density_2": { "value": 100 }, "bridge_skin_density_3": { "value": 100 }, @@ -518,7 +517,6 @@ "minimum_value_warning": 1, "value": 2 }, - "roofing_material_flow": { "value": "material_flow" }, "skin_angles": { "value": [0, 90] From e086772f476a44b414d753c6449cd9ec5c4b51b7 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 15:09:45 -0400 Subject: [PATCH 16/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 48045188fa..044e8e08f8 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -145,8 +145,7 @@ "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, - "bridge_skin_density_2": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, "bridge_skin_material_flow": { "value": "material_flow" }, "bridge_skin_material_flow_2": { "value": "material_flow" }, "bridge_skin_material_flow_3": { "value": "material_flow" }, From fb95341fd4739335e4b89719530be004ed74aba9 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 19:11:05 +0000 Subject: [PATCH 17/58] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 044e8e08f8..65a69ea735 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -145,7 +145,7 @@ "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, "bridge_skin_material_flow": { "value": "material_flow" }, "bridge_skin_material_flow_2": { "value": "material_flow" }, "bridge_skin_material_flow_3": { "value": "material_flow" }, From d5779ae320f959ba45a0995f555c6fa2c0fbb5b4 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 27 Sep 2024 15:29:35 -0400 Subject: [PATCH 18/58] update GUIDs in FormatMaps.py PP-511 --- cura/PrinterOutput/FormatMaps.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index b8ad4df2a2..cc384c1add 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -28,14 +28,15 @@ class FormatMaps: # A map from the material-name in their native file-formats to some info, including the internal name we use. MATERIAL_MAP = { - "abs": {"name": "ABS", "guid": "2780b345-577b-4a24-a2c5-12e6aad3e690"}, + "abs": {"name": "ABS", "guid": "e0f1d581-cc6b-4e36-8f3c-3f5601ecba5f"}, "abs-cf10": {"name": "ABS-CF", "guid": "495a0ce5-9daf-4a16-b7b2-06856d82394d"}, "abs-wss1": {"name": "ABS-R", "guid": "88c8919c-6a09-471a-b7b6-e801263d862d"}, "asa": {"name": "ASA", "guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, "nylon12-cf": {"name": "Nylon 12 CF", "guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, - "nylon": {"name": "Nylon", "guid": "283d439a-3490-4481-920c-c51d8cdecf9c"}, + "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": "69386c85-5b6c-421a-bec5-aeb1fb33f060"}, + "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"}, @@ -44,7 +45,7 @@ class FormatMaps: "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": "de031137-a8ca-4a72-bd1b-17bb964033ad"} + "im-pla": {"name": "Tough", "guid": "96fca5d9-0371-4516-9e96-8e8182677f3c"} } __inverse_printer_name: Optional[Dict[str, str]] = None From 253294548637408c13f0fff796da76d568a1e4dc Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 17:11:37 -0400 Subject: [PATCH 19/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 65a69ea735..512dc9b59f 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -145,8 +145,7 @@ "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, - "bridge_skin_material_flow": { "value": "material_flow" }, + "bridge_skin_material_flow": { "value": "material_flow" }, "bridge_skin_material_flow_2": { "value": "material_flow" }, "bridge_skin_material_flow_3": { "value": "material_flow" }, "bridge_skin_speed": { "value": "speed_topbottom" }, From 557755321fe36aaae4fd6d16615a4b6b2c9273bf Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 27 Sep 2024 21:12:54 +0000 Subject: [PATCH 20/58] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 512dc9b59f..95f93e2bc8 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -145,7 +145,7 @@ "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, - "bridge_skin_material_flow": { "value": "material_flow" }, + "bridge_skin_material_flow": { "value": "material_flow" }, "bridge_skin_material_flow_2": { "value": "material_flow" }, "bridge_skin_material_flow_3": { "value": "material_flow" }, "bridge_skin_speed": { "value": "speed_topbottom" }, From 523214912bb196310c20cfc746700df39f10b67a Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 27 Sep 2024 18:01:03 -0400 Subject: [PATCH 21/58] remove redundant values from Tough PLA 175 quality file, standardize skirt values in method base definition file PP-511 --- resources/definitions/ultimaker_method_base.def.json | 5 +++++ .../um_method_1a_um-tough-pla-175_0.2mm.inst.cfg | 8 -------- .../um_method_1c_um-tough-pla-175_0.2mm.inst.cfg | 8 -------- .../um_method_labs_um-tough-pla-175_0.2mm.inst.cfg | 8 -------- .../um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg | 8 -------- .../um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg | 8 -------- .../um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg | 8 -------- .../um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg | 8 -------- .../um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg | 8 -------- .../um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg | 8 -------- 10 files changed, 5 insertions(+), 72 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 95f93e2bc8..4221372d79 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -145,6 +145,8 @@ "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_skin_density": { "value": 100 }, + "bridge_skin_density_2": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, "bridge_skin_material_flow": { "value": "material_flow" }, "bridge_skin_material_flow_2": { "value": "material_flow" }, "bridge_skin_material_flow_3": { "value": "material_flow" }, @@ -530,8 +532,11 @@ "enabled": false, "value": "min(extruderValues('extruder_nr'))" }, + "skirt_brim_line_width": { "value": 1 }, "skirt_brim_material_flow": { "value": "material_flow" }, "skirt_brim_minimal_length": { "value": 500 }, + "skirt_gap": { "value": 2 }, + "skirt_height": { "value": 3 }, "small_skin_width": { "value": 4 }, "speed_equalize_flow_width_factor": { "value": 0 }, "speed_prime_tower": { "value": "speed_topbottom" }, diff --git a/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg index 205b273eda..1743940741 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg @@ -13,14 +13,11 @@ weight = -2 [values] cool_fan_enabled = True -cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_final_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 min_bead_width = =line_width * 0.75 min_wall_line_width = =line_width * 0.75 @@ -42,13 +39,8 @@ raft_surface_infill_overlap = 25 raft_surface_line_spacing = 0.425 raft_surface_line_width = 0.4 raft_surface_speed = 90 -raft_surface_wall_count = 2 raft_surface_z_offset = -0.1 seam_overhang_angle = 35 -skirt_brim_line_width = 1 -skirt_brim_minimal_length = 200 -skirt_gap = 2.0 -skirt_height = 1 speed_layer_0 = 15 speed_print = 150 speed_roofing = =speed_print / 3 diff --git a/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg index c411ef0cb5..fba19a3ab8 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg @@ -13,14 +13,11 @@ weight = -2 [values] cool_fan_enabled = True -cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_final_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 min_bead_width = =line_width * 0.75 min_wall_line_width = =line_width * 0.75 @@ -42,13 +39,8 @@ raft_surface_infill_overlap = 25 raft_surface_line_spacing = 0.425 raft_surface_line_width = 0.4 raft_surface_speed = 90 -raft_surface_wall_count = 2 raft_surface_z_offset = -0.1 seam_overhang_angle = 35 -skirt_brim_line_width = 1 -skirt_brim_minimal_length = 200 -skirt_gap = 2.0 -skirt_height = 1 speed_layer_0 = 15 speed_print = 150 speed_roofing = =speed_print / 3 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg index 46742b7589..64b34caffa 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg @@ -13,14 +13,11 @@ weight = -2 [values] cool_fan_enabled = True -cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_final_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 min_bead_width = =line_width * 0.75 min_wall_line_width = =line_width * 0.75 @@ -42,13 +39,8 @@ raft_surface_infill_overlap = 25 raft_surface_line_spacing = 0.425 raft_surface_line_width = 0.4 raft_surface_speed = 90 -raft_surface_wall_count = 2 raft_surface_z_offset = -0.1 seam_overhang_angle = 35 -skirt_brim_line_width = 1 -skirt_brim_minimal_length = 200 -skirt_gap = 2.0 -skirt_height = 1 speed_layer_0 = 15 speed_print = 150 speed_roofing = =speed_print / 3 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg index 73af8bcbf2..c603e06f3c 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg @@ -13,14 +13,11 @@ weight = -2 [values] cool_fan_enabled = True -cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_final_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 min_bead_width = =line_width * 0.75 min_wall_line_width = =line_width * 0.75 @@ -42,13 +39,8 @@ raft_surface_infill_overlap = 25 raft_surface_line_spacing = 0.425 raft_surface_line_width = 0.4 raft_surface_speed = 90 -raft_surface_wall_count = 2 raft_surface_z_offset = -0.1 seam_overhang_angle = 35 -skirt_brim_line_width = 1 -skirt_brim_minimal_length = 200 -skirt_gap = 2.0 -skirt_height = 1 speed_layer_0 = 15 speed_print = 150 speed_roofing = =speed_print / 3 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg index deee76d6c6..0ffed940a1 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg @@ -13,14 +13,11 @@ weight = -2 [values] cool_fan_enabled = True -cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_final_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 min_bead_width = =line_width * 0.75 min_wall_line_width = =line_width * 0.75 @@ -42,13 +39,8 @@ raft_surface_infill_overlap = 25 raft_surface_line_spacing = 0.425 raft_surface_line_width = 0.4 raft_surface_speed = 90 -raft_surface_wall_count = 2 raft_surface_z_offset = -0.1 seam_overhang_angle = 35 -skirt_brim_line_width = 1 -skirt_brim_minimal_length = 200 -skirt_gap = 2.0 -skirt_height = 1 speed_layer_0 = 15 speed_print = 150 speed_roofing = =speed_print / 3 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg index 05aecd0542..235b4bca45 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg @@ -13,14 +13,11 @@ weight = -2 [values] cool_fan_enabled = True -cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_final_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 min_bead_width = =line_width * 0.75 min_wall_line_width = =line_width * 0.75 @@ -42,13 +39,8 @@ raft_surface_infill_overlap = 25 raft_surface_line_spacing = 0.425 raft_surface_line_width = 0.4 raft_surface_speed = 90 -raft_surface_wall_count = 2 raft_surface_z_offset = -0.1 seam_overhang_angle = 35 -skirt_brim_line_width = 1 -skirt_brim_minimal_length = 200 -skirt_gap = 2.0 -skirt_height = 1 speed_layer_0 = 15 speed_print = 150 speed_roofing = =speed_print / 3 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg index fa8a3ea69c..7d69659208 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg @@ -13,14 +13,11 @@ weight = -2 [values] cool_fan_enabled = True -cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_final_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 min_bead_width = =line_width * 0.75 min_wall_line_width = =line_width * 0.75 @@ -40,13 +37,8 @@ raft_surface_infill_overlap = 25 raft_surface_line_spacing = 0.425 raft_surface_line_width = 0.4 raft_surface_speed = 90 -raft_surface_wall_count = 2 raft_surface_z_offset = -0.1 seam_overhang_angle = 35 -skirt_brim_line_width = 1 -skirt_brim_minimal_length = 200 -skirt_gap = 2.0 -skirt_height = 1 speed_layer_0 = 15 speed_print = 150 speed_roofing = =speed_print / 3 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg index a8183e2e87..86b7399b21 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg @@ -13,14 +13,11 @@ weight = -2 [values] cool_fan_enabled = True -cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_final_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 min_bead_width = =line_width * 0.75 min_wall_line_width = =line_width * 0.75 @@ -40,13 +37,8 @@ raft_surface_infill_overlap = 25 raft_surface_line_spacing = 0.425 raft_surface_line_width = 0.4 raft_surface_speed = 90 -raft_surface_wall_count = 2 raft_surface_z_offset = -0.1 seam_overhang_angle = 35 -skirt_brim_line_width = 1 -skirt_brim_minimal_length = 200 -skirt_gap = 2.0 -skirt_height = 1 speed_layer_0 = 15 speed_print = 150 speed_roofing = =speed_print / 3 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg index 2fcd1a6e5a..6b0ad8591d 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg @@ -13,14 +13,11 @@ weight = -2 [values] cool_fan_enabled = True -cool_fan_speed = 100 cool_fan_speed_0 = 0 cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_final_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =default_material_print_temperature + 15 min_bead_width = =line_width * 0.75 min_wall_line_width = =line_width * 0.75 @@ -40,13 +37,8 @@ raft_surface_infill_overlap = 25 raft_surface_line_spacing = 0.425 raft_surface_line_width = 0.4 raft_surface_speed = 90 -raft_surface_wall_count = 2 raft_surface_z_offset = -0.1 seam_overhang_angle = 35 -skirt_brim_line_width = 1 -skirt_brim_minimal_length = 200 -skirt_gap = 2.0 -skirt_height = 1 speed_layer_0 = 15 speed_print = 150 speed_roofing = =speed_print / 3 From e4c4b0422f568712851459e514828f2cc33c37c0 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Mon, 30 Sep 2024 21:16:18 -0400 Subject: [PATCH 22/58] Adding placeholders for new 3rd party materials in /bundled_packages/cura.json PP-511 --- resources/bundled_packages/cura.json | 51 ++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index a32d1d61f6..7c9ade9e3a 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -1429,6 +1429,23 @@ } } }, + "BASFUltrafuse316L": { + "package_info": { + "package_id": "BASFUltrafuse316L", + "package_type": "material", + "display_name": "BASF Ultrafuse 316L", + "description": "An innovative filament to produce 316L grade stainless steel parts.", + "package_version": "1.0.1", + "sdk_version": "8.6.0", + "website": "https://forward-am.com/material-portfolio/ultrafuse-filaments-for-fused-filaments-fabrication-fff/metal-filaments/ultrafuse-316l/", + "author": { + "author_id": "BASF", + "display_name": "BASF", + "email": null, + "website": "https://forward-am.com/" + } + } + }, "DagomaChromatikPLA": { "package_info": { "package_id": "DagomaChromatikPLA", @@ -1582,6 +1599,23 @@ } } }, + "JabilTPE_SEBS1300_95a": { + "package_info": { + "package_id": "JabilTPE_SEBS1300_95a", + "package_type": "material", + "display_name": "Jabil TPE SEBS 1300 95a", + "description": "Soft material great for prototyping where rubber-like or elastomeric properties and durability are required.", + "package_version": "1.0.1", + "sdk_version": "8.6.0", + "website": "https://www.jabil.com/services/additive-manufacturing/additive-materials/compare-filaments/tpe-sebs-95a.html", + "author": { + "author_id": "Jabil", + "display_name": "Jabil", + "email": null, + "website": "https://www.jabil.com/" + } + } + }, "OctofiberPLA": { "package_info": { "package_id": "OctofiberPLA", @@ -1616,6 +1650,23 @@ } } }, + "PolyMaxPC": { + "package_info": { + "package_id": "PolyMaxPC", + "package_type": "material", + "display_name": "PolyMax™ PC", + "description": "PolyMax™ PC is an engineered PC filament combining excellent strength, toughness, heat resistance and printing quality. It is the ideal choice for a wide range of engineering applications.", + "package_version": "1.0.1", + "sdk_version": "8.6.0", + "website": "http://www.polymaker.com/shop/polymax/", + "author": { + "author_id": "Polymaker", + "display_name": "Polymaker L.L.C.", + "email": "inquiry@polymaker.com", + "website": "https://www.polymaker.com" + } + } + }, "PolyMaxPLA": { "package_info": { "package_id": "PolyMaxPLA", From aa3a9f36d2d210b430f6dc6e476bb978d8a350f2 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Mon, 30 Sep 2024 21:20:06 -0400 Subject: [PATCH 23/58] update start gcode for method extruders, convert generic profiles into Labs extruder profiles, mark these as experimental PP-511 --- .../definitions/ultimaker_method.def.json | 25 +- .../ultimaker_method_base.def.json | 237 +++++++++++++----- .../definitions/ultimaker_methodx.def.json | 7 +- .../definitions/ultimaker_methodxl.def.json | 54 +++- .../ultimaker_method_extruder_left.def.json | 2 +- .../ultimaker_method_extruder_right.def.json | 2 +- .../ultimaker_methodx_extruder_left.def.json | 2 +- .../ultimaker_methodx_extruder_right.def.json | 2 +- .../ultimaker_methodxl_extruder_left.def.json | 2 +- ...ultimaker_methodxl_extruder_right.def.json | 2 +- ...bs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 41 +++ ...jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg | 36 +++ ...bs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 41 +++ ...jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg | 36 +++ ...bs_polymaker-polymax-pc-175_0.2mm.inst.cfg | 58 +++++ ...jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg | 36 +++ ...bs_polymaker-polymax-pc-175_0.2mm.inst.cfg | 58 +++++ 17 files changed, 547 insertions(+), 94 deletions(-) create mode 100644 resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 93a6b23f7b..99a42a57a2 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -23,19 +23,7 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_asa_175", - "generic_abs_175", - "generic_bvoh_175", - "generic_petg_175", - "generic_pla_175", - "generic_tough_pla_175", - "generic_pva_175", - "generic_cffpa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_hips_175", - "generic_pc_175", - "generic_tpu_175", + "generic_", "goofoo_", "ideagen3D_", "imade3d_", @@ -44,6 +32,7 @@ "leapfrog_", "polyflex_pla", "polymax_pla", + "polymaker_pc_175", "polyplus_pla", "polywood_pla", "redd_", @@ -53,23 +42,22 @@ "ultimaker_absr_175", "ultimaker_abscf_175", "ultimaker_bvoh_175", - "ultimaker_petg_175", "ultimaker_cffpa_175", "ultimaker_cpe_175", - "ultimaker_nylon_175", "ultimaker_hips_175", "ultimaker_pc_175", "ultimaker_tpu_175", - "ultimaker_tough_pla_175", "ultimaker_rapidrinse_175", "ultimaker_sr30", + "ultimaker_metallic_pla_175", "verbatim_", "Vertex_", "volumic_", "xyzprinting_", "zyyx_pro_", "octofiber_", - "fiberlogy_" + "fiberlogy_", + "ultimaker_metallic_pla_175" ], "has_machine_materials": true, "has_machine_quality": true, @@ -98,7 +86,6 @@ "overrides": { "build_volume_temperature": { "maximum_value": "67" }, - "machine_depth": { "default_value": 236.48 }, "machine_disallowed_areas": { "default_value": [ @@ -128,9 +115,7 @@ ] ] }, - "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method" }, - "machine_width": { "default_value": 283.3 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } } diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 23e61410d9..7a91506b5b 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -9,42 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", "platform": "ultimaker_method_platform.stl", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], + "exclude_materials": [], "has_machine_materials": true, "has_machine_quality": true, "has_materials": true, @@ -170,8 +135,13 @@ "enabled": false, "value": "acceleration_print" }, - "adhesion_extruder_nr": { "value": 0 }, + "adhesion_extruder_nr": + { + "enabled": false, + "value": "min(extruderValues('extruder_nr'))" + }, "adhesion_type": { "value": "'raft'" }, + "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed": { "value": "cool_fan_speed_max" }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, @@ -195,14 +165,38 @@ { "force_depends_on_settings": [ "support_extruder_nr" ] }, + "cool_fan_full_at_height": { "value": "1 if resolveOrValue('adhesion_type') == 'raft' else layer_height + layer_height_0" }, + "cool_fan_full_layer": { "value": "1 if resolveOrValue('adhesion_type') == 'raft' else 3" }, "default_material_bed_temperature": { "resolve": "min(extruderValues('default_material_bed_temperature'))" }, "extruder_prime_pos_abs": { "default_value": true }, "gradual_support_infill_steps": { "value": 0 }, + "group_outer_walls": { "value": false }, + "infill_angles": + { + "value": [ + 45, + 45, + 45, + 45, + 45, + 135, + 135, + 135, + 135, + 135 + ] + }, "infill_before_walls": { "value": false }, "infill_material_flow": { "value": "material_flow" }, "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'grid' if infill_sparse_density < 80 else 'lines'" }, + "infill_pattern": { "value": "'zigzag'" }, "infill_wipe_dist": { "value": 0 }, + "initial_layer_line_width_factor": + { + "maximum_value": 350, + "maximum_value_warning": 320, + "value": "100 if resolveOrValue('adhesion_type') == 'raft' else 200" + }, "inset_direction": { "value": "'inside_out'" }, "jerk_enabled": { @@ -309,22 +303,66 @@ "enabled": false, "value": "jerk_print" }, + "layer_height_0": { "value": "layer_height if resolveOrValue('adhesion_type') == 'raft' else layer_height * 1.25" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, + "machine_depth": { "default_value": 236.48 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -95.205], + [-141.65, -95.205] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 95.205], + [-141.65, 95.205] + ], + [ + [-141.65, -118.11], + [-76.149, -118.11], + [-76.149, 118.37], + [-141.65, 118.37] + ], + [ + [76.149, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [76.149, 118.37] + ] + ], + "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" + }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_heated_bed": { "default_value": false }, "machine_heated_build_volume": { "default_value": true }, + "machine_height": { "default_value": 196.749 }, "machine_min_cool_heat_time_window": { "value": 15 }, "machine_name": { "default_value": "UltiMaker Method" }, "machine_nozzle_cool_down_speed": { "value": 0.8 }, "machine_nozzle_heat_up_speed": { "value": 3.5 }, "machine_scale_fan_speed_zero_to_one": { "value": true }, "machine_start_gcode": { "default_value": "G0 Z20" }, + "machine_width": { "default_value": 283.3 }, "material_bed_temperature": { "enabled": "machine_heated_bed" }, + "material_final_print_temperature": + { + "maximum_value": "material_print_temperature", + "minimum_value": "material_standby_temperature" + }, "material_flow": { "value": 100 }, - "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_initial_print_temperature": + { + "maximum_value": "material_print_temperature", + "minimum_value": "material_standby_temperature", + "value": "material_print_temperature-5" + }, "material_print_temperature": { "force_depends_on_settings": [ "support_extruder_nr" ] @@ -339,17 +377,35 @@ "prime_tower_base_curve_magnitude": { "value": 2 }, "prime_tower_base_height": { "value": 6 }, "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": false }, + "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, "prime_tower_flow": { "value": "material_flow" }, - "prime_tower_line_width": { "value": 1 }, + "prime_tower_line_width": + { + "maximum_value": 2, + "maximum_value_warning": 1.5, + "value": 1 + }, + "prime_tower_mode": + { + "resolve": "'normal'", + "value": "'normal'" + }, "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, "prime_tower_wipe_enabled": { "value": true }, "print_sequence": { "enabled": false }, + "raft_acceleration": { "enabled": false }, "raft_airgap": { "force_depends_on_settings": [ "support_extruder_nr" ] }, + "raft_base_acceleration": { "enabled": false }, + "raft_base_extruder_nr": + { + "enabled": false, + "value": "min(extruderValues('extruder_nr'))" + }, "raft_base_fan_speed": { "value": 0 }, + "raft_base_jerk": { "enabled": false }, "raft_base_line_spacing": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ], @@ -358,9 +414,11 @@ "raft_base_line_width": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ], + "maximum_value": 2.5, + "maximum_value_warning": 1.8, "value": 1.4 }, - "raft_base_speed": { "value": 10 }, + "raft_base_speed": { "value": "raft_speed" }, "raft_base_thickness": { "force_depends_on_settings": [ @@ -369,24 +427,24 @@ ], "value": 0.8 }, - "raft_base_wall_count": - { - "force_depends_on_settings": [ "support_extruder_nr" ], - "value": "raft_wall_count" - }, - "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, + "raft_base_wall_count": { "value": "raft_wall_count" }, + "raft_interface_acceleration": { "enabled": false }, + "raft_interface_extruder_nr": { "value": "max(extruderValues('extruder_nr'))" }, "raft_interface_fan_speed": { "value": 0 }, "raft_interface_infill_overlap": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ] }, + "raft_interface_infill_overlap_mm": { "maximum_value_warning": "2 * machine_nozzle_size" }, + "raft_interface_jerk": { "enabled": false }, "raft_interface_layers": { "value": 2 }, "raft_interface_line_spacing": { "force_depends_on_settings": [ "raft_base_thickness", "raft_interface_extruder_nr" - ] + ], + "minimum_value_warning": "raft_interface_line_width * 0.8" }, "raft_interface_line_width": { @@ -396,7 +454,11 @@ ], "value": 0.7 }, - "raft_interface_speed": { "value": 90 }, + "raft_interface_speed": + { + "force_depends_on_settings": [ "support_extruder_nr" ], + "value": "raft_speed * 5" + }, "raft_interface_thickness": { "value": 0.3 }, "raft_interface_wall_count": { "value": "raft_wall_count" }, "raft_interface_z_offset": @@ -406,14 +468,18 @@ "raft_interface_extruder_nr" ] }, + "raft_jerk": { "enabled": false }, "raft_margin": { "value": 1.2 }, "raft_smoothing": { "value": 9.5 }, - "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, + "raft_speed": { "value": 10 }, + "raft_surface_acceleration": { "enabled": false }, + "raft_surface_extruder_nr": { "value": "max(extruderValues('extruder_nr'))" }, "raft_surface_fan_speed": { "value": 0 }, "raft_surface_flow": { "force_depends_on_settings": [ "support_extruder_nr" ] }, + "raft_surface_jerk": { "enabled": false }, "raft_surface_speed": { "force_depends_on_settings": [ "support_extruder_nr" ] @@ -430,25 +496,52 @@ "raft_wall_count": { "value": 2 }, "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, - "retraction_combing": { "value": "'off'" }, + "retraction_combing": + { + "enabled": false, + "value": "'off'" + }, "retraction_combing_max_distance": { "value": "speed_travel / 10" }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 0 }, "retraction_hop": { "value": 0.4 }, "retraction_hop_enabled": { "value": true }, "retraction_hop_only_when_collides": { "value": false }, - "retraction_min_travel": { "value": "0.6" }, + "retraction_min_travel": + { + "minimum_value_warning": "line_width * 1.25", + "value": 0.6 + }, "retraction_prime_speed": { "value": "retraction_speed" }, "retraction_speed": { "value": 5 }, - "roofing_layer_count": { "value": 2 }, + "roofing_angles": + { + "value": [45, 135] + }, + "roofing_layer_count": + { + "maximum_value_warning": 10, + "minimum_value": 0, + "minimum_value_warning": 1, + "value": 2 + }, "roofing_material_flow": { "value": "material_flow" }, "roofing_monotonic": { "value": true }, + "skin_angles": + { + "value": [0, 90] + }, "skin_material_flow": { "value": "material_flow" }, "skin_material_flow_layer_0": { "value": "material_flow" }, "skin_monotonic": { "value": true }, "skin_outline_count": { "value": 0 }, "skin_overlap": { "value": 0 }, "skin_preshrink": { "value": 0 }, + "skirt_brim_extruder_nr": + { + "enabled": false, + "value": "min(extruderValues('extruder_nr'))" + }, "skirt_brim_material_flow": { "value": "material_flow" }, "skirt_brim_minimal_length": { "value": 500 }, "small_skin_width": { "value": 4 }, @@ -465,34 +558,58 @@ "speed_wall_x": { "value": "speed_wall" }, "support_angle": { "value": 40 }, "support_bottom_height": { "value": "2*support_infill_sparse_thickness" }, + "support_bottom_line_width": + { + "maximum_value": 3, + "maximum_value_warning": 1.8 + }, "support_bottom_material_flow": { "value": "material_flow" }, - "support_bottom_wall_count": { "value": "0" }, + "support_bottom_wall_count": + { + "maximum_value": 8, + "maximum_value_warning": 6, + "value": 0 + }, "support_brim_enable": { "value": false }, "support_conical_min_width": { "value": 10 }, "support_enable": { "value": true }, "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, "support_fan_enable": { "value": "True" }, + "support_infill_angles": + { + "value": [ + 45 + ] + }, "support_infill_rate": { "value": 20.0 }, "support_infill_sparse_thickness": { "value": "layer_height" }, "support_interface_enable": { "value": true }, "support_interface_height": { "value": "4*support_infill_sparse_thickness" }, "support_interface_material_flow": { "value": "material_flow" }, "support_interface_offset": { "value": "1" }, - "support_interface_pattern": { "value": "'lines'" }, + "support_interface_pattern": { "value": "'zigzag' if support_wall_count > 1 else 'lines'" }, "support_interface_wall_count": { "value": "1" }, + "support_join_distance": { "value": "4.5 if support_wall_count > 1 else 2" }, "support_material_flow": { "value": "material_flow" }, - "support_offset": { "value": "1.8" }, - "support_pattern": { "value": "'lines'" }, + "support_offset": { "value": "2.4 if support_wall_count > 1 else 1.8" }, + "support_pattern": { "value": "'zigzag' if support_wall_count > 1 else 'lines'" }, "support_roof_height": { "value": "4*layer_height" }, "support_roof_material_flow": { "value": "material_flow" }, "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_use_towers": { "value": "False" }, + "support_use_towers": { "value": false }, "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" }, "support_xy_distance": { "value": 0.2 }, "support_xy_distance_overhang": { "value": "support_xy_distance" }, "switch_extruder_retraction_amount": { "value": 0.5 }, "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, - "top_bottom_thickness": { "value": "5*layer_height" }, + "top_bottom_pattern": { "value": "'zigzag'" }, + "top_bottom_pattern_0": { "value": "'zigzag'" }, + "top_bottom_thickness": + { + "minimum_value_warning": 0.3, + "value": "4*layer_height" + }, + "top_thickness": { "value": "top_bottom_thickness * 1.5" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "travel_avoid_other_parts": { "value": false }, "wall_0_inset": { "value": 0 }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 07efe3ef80..42c1ffda78 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -36,14 +36,14 @@ "polywood_pla", "redd_", "tizyx_", - "ultimaker_tough_pla_175", "verbatim_", "Vertex_", "volumic_", "xyzprinting_", "zyyx_pro_", "octofiber_", - "fiberlogy_" + "fiberlogy_", + "ultimaker_metallic_pla_175" ], "has_machine_materials": true, "has_machine_quality": true, @@ -72,7 +72,6 @@ "overrides": { "build_volume_temperature": { "maximum_value": "107" }, - "machine_depth": { "default_value": 236.48 }, "machine_disallowed_areas": { "default_value": [ @@ -102,9 +101,7 @@ ] ] }, - "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method X" }, - "machine_width": { "default_value": 283.3 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } } diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 993a99a36c..f5c9ba9958 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -9,6 +9,42 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", "platform": "ultimaker_method_xl_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_", + "ultimaker_metallic_pla_175" + ], "has_machine_materials": true, "has_machine_quality": true, "has_materials": true, @@ -56,14 +92,26 @@ [205, 160], [154.5, 160] ] - ] + ], + "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" }, "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 320 }, + "machine_height": { "default_value": 319.9 }, "machine_name": { "default_value": "UltiMaker Method XL" }, "machine_width": { "default_value": 410 }, "prime_tower_position_x": { "value": "(305 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (305 / 2)" }, "prime_tower_position_y": { "value": "305 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (305 / 2)" }, - "speed_travel": { "value": 500 } + "speed_travel": + { + "maximum_value": 500, + "maximum_value_warning": 450, + "value": 400 + }, + "speed_travel_layer_0": + { + "maximum_value": 500, + "maximum_value_warning": 450, + "value": 250 + } } } \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index 44680a3468..84c144fc18 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 75eb50bdd8..4f0b091a69 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 2b927405f0..34d8c2e96a 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index 43979e136b..a0042da784 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index c7e365f269..767a52a784 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 7ac702d3c2..5049735ade 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg new file mode 100644 index 0000000000..f12aabf07f --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = ultimaker_method +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = basf_ultrafuse_316l_175 +quality_type = fast +setting_version = 23 +type = quality +variant = LABS +weight = -1 + +[values] +adhesion_type = skirt +bottom_thickness = =top_bottom_thickness +cool_fan_full_at_height = 0 +infill_angles = [45,135] +infill_overlap = 25 +infill_sparse_density = 100 +initial_layer_line_width_factor = 110 +layer_height_0 = =layer_height * 1.5 +material_flow_layer_0 = 110 +material_initial_print_temperature = 245 +retraction_amount = 1.5 +retraction_speed = 45 +roofing_line_width = 0.4 +skin_line_width = 0.45 +skin_material_flow_layer_0 = 110 +skin_overlap = 20.0 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 100.0 +skirt_height = 3 +speed_print = 25 +support_enable = False +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness +wall_0_material_flow_layer_0 = 110 +wall_x_material_flow_layer_0 = 110 + diff --git a/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..83132de3fa --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_method +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = jabil_tpe_sebs_1300_95a_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +infill_sparse_density = 50 +raft_airgap = 0.22 +raft_interface_speed = =speed_print * 1/2 +raft_surface_speed = =speed_print * 1/2 +speed_layer_0 = =speed_print * 1/4 +speed_prime_tower = =speed_print * 3/4 +speed_print = 40 +speed_roofing = =speed_print +speed_support = =speed_print +speed_support_bottom = =speed_print * 1/4 +speed_support_interface = =speed_print +speed_topbottom = =speed_print +speed_wall_0 = =speed_print +speed_wall_x = =speed_print +support_bottom_enable = False +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.26 +support_z_distance = 0.22 +wall_line_width = 0.5 +wall_thickness = =wall_line_width * 4 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg new file mode 100644 index 0000000000..d00f6568ca --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = ultimaker_methodx +name = Normal - Experimental +version = 4 + +[metadata] +is_experimental = True +material = basf_ultrafuse_316l_175 +quality_type = fast +setting_version = 23 +type = quality +variant = LABS +weight = -1 + +[values] +adhesion_type = skirt +bottom_thickness = =top_bottom_thickness +cool_fan_full_at_height = 0 +infill_angles = [45,135] +infill_overlap = 25 +infill_sparse_density = 100 +initial_layer_line_width_factor = 110 +layer_height_0 = =layer_height * 1.5 +material_flow_layer_0 = 110 +material_initial_print_temperature = 245 +retraction_amount = 1.5 +retraction_speed = 45 +roofing_line_width = 0.4 +skin_line_width = 0.45 +skin_material_flow_layer_0 = 110 +skin_overlap = 20.0 +skirt_brim_line_width = 1 +skirt_brim_minimal_length = 100.0 +skirt_height = 3 +speed_print = 25 +support_enable = False +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness +wall_0_material_flow_layer_0 = 110 +wall_x_material_flow_layer_0 = 110 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..706bf80ed2 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_methodx +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = jabil_tpe_sebs_1300_95a_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +infill_sparse_density = 50 +raft_airgap = 0.22 +raft_interface_speed = =speed_print * 1/2 +raft_surface_speed = =speed_print * 1/2 +speed_layer_0 = =speed_print * 1/4 +speed_prime_tower = =speed_print * 3/4 +speed_print = 40 +speed_roofing = =speed_print +speed_support = =speed_print +speed_support_bottom = =speed_print * 1/4 +speed_support_interface = =speed_print +speed_topbottom = =speed_print +speed_wall_0 = =speed_print +speed_wall_x = =speed_print +support_bottom_enable = False +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.26 +support_z_distance = 0.22 +wall_line_width = 0.5 +wall_thickness = =wall_line_width * 4 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..558e7b648d --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg @@ -0,0 +1,58 @@ +[general] +definition = ultimaker_methodx +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = polymaker_polymax_pc_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_full_layer = 6 +cool_fan_speed_max = 100 +cool_min_layer_time = 8 +cool_min_layer_time_fan_speed_max = 5 +cool_min_speed = 10 +raft_airgap = 0.22 +raft_interface_fan_speed = 0 +raft_interface_line_spacing = 0.7 +raft_interface_line_width = 0.55 +raft_interface_speed = 25 +raft_interface_thickness = 0.25 +raft_surface_fan_speed = 0 +raft_surface_speed = 50 +raft_surface_thickness = 0.25 +speed_print = 50 +speed_wall_0 = 30 +speed_wall_x = =speed_wall +support_angle = 52 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_fan_enable = True +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 10 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_offset = 1.2 +support_interface_wall_count = 0 +support_line_width = 0.35 +support_material_flow = 90 +support_offset = 1.5 +support_roof_density = =extruderValue(support_roof_extruder_nr, 'support_interface_density') +support_roof_height = =support_interface_height +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 100 +support_xy_distance = 0.35 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..d1ba21f96a --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg @@ -0,0 +1,36 @@ +[general] +definition = ultimaker_methodxl +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = jabil_tpe_sebs_1300_95a_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +infill_sparse_density = 50 +raft_airgap = 0.22 +raft_interface_speed = =speed_print * 1/2 +raft_surface_speed = =speed_print * 1/2 +speed_layer_0 = =speed_print * 1/4 +speed_prime_tower = =speed_print * 3/4 +speed_print = 40 +speed_roofing = =speed_print +speed_support = =speed_print +speed_support_bottom = =speed_print * 1/4 +speed_support_interface = =speed_print +speed_topbottom = =speed_print +speed_wall_0 = =speed_print +speed_wall_x = =speed_print +support_bottom_enable = False +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.26 +support_z_distance = 0.22 +wall_line_width = 0.5 +wall_thickness = =wall_line_width * 4 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..14754d79e0 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg @@ -0,0 +1,58 @@ +[general] +definition = ultimaker_methodxl +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = polymaker_polymax_pc_175 +quality_type = draft +setting_version = 23 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = True +cool_fan_full_layer = 6 +cool_fan_speed_max = 100 +cool_min_layer_time = 8 +cool_min_layer_time_fan_speed_max = 5 +cool_min_speed = 10 +raft_airgap = 0.22 +raft_interface_fan_speed = 0 +raft_interface_line_spacing = 0.7 +raft_interface_line_width = 0.55 +raft_interface_speed = 25 +raft_interface_thickness = 0.25 +raft_surface_fan_speed = 0 +raft_surface_speed = 50 +raft_surface_thickness = 0.25 +speed_print = 50 +speed_wall_0 = 30 +speed_wall_x = =speed_wall +support_angle = 52 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_fan_enable = True +support_infill_angles = [45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135,135,135,135] +support_infill_rate = 10 +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_offset = 1.2 +support_interface_wall_count = 0 +support_line_width = 0.35 +support_material_flow = 90 +support_offset = 1.5 +support_roof_density = =extruderValue(support_roof_extruder_nr, 'support_interface_density') +support_roof_height = =support_interface_height +support_roof_wall_count = 1 +support_supported_skin_fan_speed = 100 +support_xy_distance = 0.35 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.22 +top_skin_expand_distance = 2.4 +wall_overhang_angle = 30 +wall_overhang_speed_factor = 40 + From 4cf419b4ade4926c346b97f2f14123b22905032e Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:52:48 -0400 Subject: [PATCH 24/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 7a91506b5b..3f41ccc101 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -143,8 +143,7 @@ "adhesion_type": { "value": "'raft'" }, "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed": { "value": "cool_fan_speed_max" }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, "bridge_settings_enabled": { "value": true }, "bridge_skin_density": { "value": 100 }, From 5f11e20e905c92b122dce30094726532699b695e Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:53:00 -0400 Subject: [PATCH 25/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 3f41ccc101..8bc2f5f666 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -373,8 +373,7 @@ "multiple_mesh_overlap": { "value": 0 }, "optimize_wall_printing_order": { "value": true }, "prime_blob_enable": { "enabled": false }, - "prime_tower_base_curve_magnitude": { "value": 2 }, - "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_height": { "value": 6 }, "prime_tower_base_size": { "value": 10 }, "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, "prime_tower_flow": { "value": "material_flow" }, From efaa1674ef0579357e83b3b6cd9cda1ffebf91aa Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:53:38 -0400 Subject: [PATCH 26/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 8bc2f5f666..e065245cae 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -416,8 +416,7 @@ "maximum_value_warning": 1.8, "value": 1.4 }, - "raft_base_speed": { "value": "raft_speed" }, - "raft_base_thickness": + "raft_base_thickness": { "force_depends_on_settings": [ "raft_interface_extruder_nr", From 60a2dddd4e7bbb4b52dbd4943f6b6629f6df4991 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:53:47 -0400 Subject: [PATCH 27/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index e065245cae..7f05a6e1cc 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -522,8 +522,7 @@ "minimum_value_warning": 1, "value": 2 }, - "roofing_material_flow": { "value": "material_flow" }, - "roofing_monotonic": { "value": true }, + "roofing_monotonic": { "value": true }, "skin_angles": { "value": [0, 90] From 5fe2fee35631716016a68f8d3c982cecb51d21ba Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:54:38 -0400 Subject: [PATCH 28/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 7f05a6e1cc..57848cb978 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -144,8 +144,7 @@ "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, - "bridge_settings_enabled": { "value": true }, + "bridge_settings_enabled": { "value": true }, "bridge_skin_density": { "value": 100 }, "bridge_skin_density_2": { "value": 100 }, "bridge_skin_density_3": { "value": 100 }, From 69c4a1bd2bde505cf7088d5d1743bb25a1173858 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:54:52 -0400 Subject: [PATCH 29/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 57848cb978..e5b287a1ed 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -373,7 +373,6 @@ "optimize_wall_printing_order": { "value": true }, "prime_blob_enable": { "enabled": false }, "prime_tower_base_height": { "value": 6 }, - "prime_tower_base_size": { "value": 10 }, "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, "prime_tower_flow": { "value": "material_flow" }, "prime_tower_line_width": From a004e69d0ea21d538da68210288620ec514d822e Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:55:08 -0400 Subject: [PATCH 30/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index e5b287a1ed..5e97349cc1 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -373,8 +373,7 @@ "optimize_wall_printing_order": { "value": true }, "prime_blob_enable": { "enabled": false }, "prime_tower_base_height": { "value": 6 }, - "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, - "prime_tower_flow": { "value": "material_flow" }, + "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, "prime_tower_line_width": { "maximum_value": 2, From bedf2ef277a497120208f78187b7066e41b1ba5e Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:55:24 -0400 Subject: [PATCH 31/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 5e97349cc1..d0b990856c 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -414,8 +414,7 @@ "value": 1.4 }, "raft_base_thickness": - { - "force_depends_on_settings": [ + "raft_base_thickness": "raft_interface_extruder_nr", "support_extruder_nr" ], From 49b52737ee426ae1c28190f1d3ada1784cc0ee27 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:55:32 -0400 Subject: [PATCH 32/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index d0b990856c..2ab5123877 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -520,8 +520,7 @@ }, "roofing_monotonic": { "value": true }, "skin_angles": - { - "value": [0, 90] + "roofing_monotonic": { "value": true }, }, "skin_material_flow": { "value": "material_flow" }, "skin_material_flow_layer_0": { "value": "material_flow" }, From febc1ebb93c7d04b2c73e95ddacdd5f8a7bfbe54 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:56:33 -0400 Subject: [PATCH 33/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 2ab5123877..a3dd4b8c9e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -145,7 +145,6 @@ "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_settings_enabled": { "value": true }, - "bridge_skin_density": { "value": 100 }, "bridge_skin_density_2": { "value": 100 }, "bridge_skin_density_3": { "value": 100 }, "bridge_skin_material_flow": { "value": "material_flow" }, From 6f87a313be0b3690a5a26233db0c4df02fbdadd8 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:57:31 -0400 Subject: [PATCH 34/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index a3dd4b8c9e..408d7975c3 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -372,8 +372,7 @@ "optimize_wall_printing_order": { "value": true }, "prime_blob_enable": { "enabled": false }, "prime_tower_base_height": { "value": 6 }, - "prime_tower_enable": { "value": "extruders_enabled_count > 1" }, - "prime_tower_line_width": + "prime_tower_base_size": { "value": 10 }, { "maximum_value": 2, "maximum_value_warning": 1.5, From 1eb04e79ff0d4eacdd716c425980497d424e141f Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:57:46 -0400 Subject: [PATCH 35/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 408d7975c3..a2271c1e76 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -520,8 +520,7 @@ "skin_angles": "roofing_monotonic": { "value": true }, }, - "skin_material_flow": { "value": "material_flow" }, - "skin_material_flow_layer_0": { "value": "material_flow" }, + "roofing_monotonic": { "value": true }, "skin_monotonic": { "value": true }, "skin_outline_count": { "value": 0 }, "skin_overlap": { "value": 0 }, From 14a44c7a0bc871ea1857c183dd447d4471d8ecff Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Mon, 30 Sep 2024 21:58:07 -0400 Subject: [PATCH 36/58] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index a2271c1e76..74f0547735 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -145,8 +145,7 @@ "bridge_enable_more_layers": { "value": true }, "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, "bridge_settings_enabled": { "value": true }, - "bridge_skin_density_2": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, "bridge_skin_material_flow": { "value": "material_flow" }, "bridge_skin_material_flow_2": { "value": "material_flow" }, "bridge_skin_material_flow_3": { "value": "material_flow" }, From 4f0c77e16a5da321a74491cfb9cd445ef0343897 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 1 Oct 2024 10:48:27 +0200 Subject: [PATCH 37/58] Fix disallowed areas definition conflict CURA-12165 --- .../definitions/ultimaker_method.def.json | 29 ------------------- .../ultimaker_method_base.def.json | 26 ----------------- .../definitions/ultimaker_methodx.def.json | 29 ------------------- .../definitions/ultimaker_methodxl.def.json | 26 ----------------- 4 files changed, 110 deletions(-) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 2f4e372e28..5963f4dfa0 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -85,35 +85,6 @@ "overrides": { "build_volume_temperature": { "maximum_value": "67" }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-141.65, -118.11], - [141.65, -118.11], - [141.65, -94], - [-141.65, -94] - ], - [ - [-141.65, 118.37], - [141.65, 118.37], - [141.65, 94], - [-141.65, 94] - ], - [ - [-141.65, -118.11], - [-75, -118.11], - [-75, 118.37], - [-141.65, 118.37] - ], - [ - [75, -118.11], - [141.65, -118.11], - [141.65, 118.37], - [75, 118.37] - ] - ] - }, "machine_name": { "default_value": "UltiMaker Method" }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 4221372d79..51ca06ccae 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -306,32 +306,6 @@ "machine_depth": { "default_value": 236.48 }, "machine_disallowed_areas": { - "default_value": [ - [ - [-141.65, -118.11], - [141.65, -118.11], - [141.65, -95.205], - [-141.65, -95.205] - ], - [ - [-141.65, 118.37], - [141.65, 118.37], - [141.65, 95.205], - [-141.65, 95.205] - ], - [ - [-141.65, -118.11], - [-76.149, -118.11], - [-76.149, 118.37], - [-141.65, 118.37] - ], - [ - [76.149, -118.11], - [141.65, -118.11], - [141.65, 118.37], - [76.149, 118.37] - ] - ], "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index a5298473ed..75adf3fbd4 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -83,35 +83,6 @@ "overrides": { "build_volume_temperature": { "maximum_value": "107" }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-141.65, -118.11], - [141.65, -118.11], - [141.65, -94], - [-141.65, -94] - ], - [ - [-141.65, 118.37], - [141.65, 118.37], - [141.65, 94], - [-141.65, 94] - ], - [ - [-141.65, -118.11], - [-75, -118.11], - [-75, 118.37], - [-141.65, 118.37] - ], - [ - [75, -118.11], - [141.65, -118.11], - [141.65, 118.37], - [75, 118.37] - ] - ] - }, "machine_name": { "default_value": "UltiMaker Method X" }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index f5c9ba9958..64f156926f 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -67,32 +67,6 @@ "machine_depth": { "default_value": 320 }, "machine_disallowed_areas": { - "default_value": [ - [ - [-204, -160], - [204, -160], - [204, -154.5], - [-204, -154.5] - ], - [ - [-204, 160], - [204, 160], - [204, 154.5], - [-204, 154.5] - ], - [ - [-205, -160], - [-154.5, -160], - [-154.5, 160], - [-205, 160] - ], - [ - [154.5, -160], - [205, -160], - [205, 160], - [154.5, 160] - ] - ], "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" }, "machine_heated_bed": { "default_value": true }, From 8e5a766193245bf5dcfb37267f0952a7c2d23a7b Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Tue, 1 Oct 2024 08:49:25 +0000 Subject: [PATCH 38/58] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 5 +---- resources/definitions/ultimaker_methodxl.def.json | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 51ca06ccae..6dea197f18 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -304,10 +304,7 @@ "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, "machine_depth": { "default_value": 236.48 }, - "machine_disallowed_areas": - { - "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" - }, + "machine_disallowed_areas": { "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 64f156926f..da1afde467 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -65,10 +65,7 @@ { "build_volume_temperature": { "maximum_value": "100" }, "machine_depth": { "default_value": 320 }, - "machine_disallowed_areas": - { - "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" - }, + "machine_disallowed_areas": { "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 319.9 }, "machine_name": { "default_value": "UltiMaker Method XL" }, From acd477d183839e81e0015129ce585749a7938135 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 1 Oct 2024 13:36:39 +0200 Subject: [PATCH 39/58] Adjust Method XL build area CURA-12165 This is required because methodxl definition inherits methodx, which has a defined plaftofm_offset. --- resources/definitions/ultimaker_methodxl.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index da1afde467..d286f81a5b 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -9,6 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", "platform": "ultimaker_method_xl_platform.stl", + "platform_offset": [ 0, 0, 0 ], "exclude_materials": [ "dsm_", "Essentium_", From 8e4b85ec4ca7dc0dfefb328700c2358635daa255 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Tue, 1 Oct 2024 11:37:40 +0000 Subject: [PATCH 40/58] Applied printer-linter format --- resources/definitions/ultimaker_methodxl.def.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index d286f81a5b..17341da861 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -9,7 +9,6 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", "platform": "ultimaker_method_xl_platform.stl", - "platform_offset": [ 0, 0, 0 ], "exclude_materials": [ "dsm_", "Essentium_", @@ -55,6 +54,11 @@ "0": "ultimaker_methodxl_extruder_left", "1": "ultimaker_methodxl_extruder_right" }, + "platform_offset": [ + 0, + 0, + 0 + ], "preferred_quality_type": "draft", "reference_machine_id": "magma_10", "supports_network_connection": true, From 85c7fede7ecfc3b2b0cfd01855b5304f5538826f Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Tue, 1 Oct 2024 11:49:18 -0400 Subject: [PATCH 41/58] update method extruder start gcode, exclude all generic materials PP-511 --- .../definitions/ultimaker_method.def.json | 29 +++++++++++++ .../ultimaker_method_base.def.json | 31 +++++++++++++- .../definitions/ultimaker_methodx.def.json | 42 +++++++++++++------ .../definitions/ultimaker_methodxl.def.json | 36 +++++++++++++--- .../ultimaker_method_extruder_left.def.json | 2 +- .../ultimaker_method_extruder_right.def.json | 2 +- .../ultimaker_methodx_extruder_left.def.json | 2 +- .../ultimaker_methodx_extruder_right.def.json | 2 +- .../ultimaker_methodxl_extruder_left.def.json | 2 +- ...ultimaker_methodxl_extruder_right.def.json | 2 +- 10 files changed, 125 insertions(+), 25 deletions(-) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 5963f4dfa0..2f4e372e28 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -85,6 +85,35 @@ "overrides": { "build_volume_temperature": { "maximum_value": "67" }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -94], + [-141.65, -94] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 94], + [-141.65, 94] + ], + [ + [-141.65, -118.11], + [-75, -118.11], + [-75, 118.37], + [-141.65, 118.37] + ], + [ + [75, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [75, 118.37] + ] + ] + }, "machine_name": { "default_value": "UltiMaker Method" }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 6dea197f18..4221372d79 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -304,7 +304,36 @@ "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, "machine_depth": { "default_value": 236.48 }, - "machine_disallowed_areas": { "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -95.205], + [-141.65, -95.205] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 95.205], + [-141.65, 95.205] + ], + [ + [-141.65, -118.11], + [-76.149, -118.11], + [-76.149, 118.37], + [-141.65, 118.37] + ], + [ + [76.149, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [76.149, 118.37] + ] + ], + "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" + }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 75adf3fbd4..42c1ffda78 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -23,18 +23,7 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_asa_175", - "generic_abs_175", - "generic_bvoh_175", - "generic_petg_175", - "generic_pla_175", - "generic_tough_pla_175", - "generic_pva_175", - "generic_cffpa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_hips_175", - "generic_tpu_175", + "generic_", "goofoo_", "ideagen3D_", "imade3d_", @@ -83,6 +72,35 @@ "overrides": { "build_volume_temperature": { "maximum_value": "107" }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -94], + [-141.65, -94] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 94], + [-141.65, 94] + ], + [ + [-141.65, -118.11], + [-75, -118.11], + [-75, 118.37], + [-141.65, 118.37] + ], + [ + [75, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [75, 118.37] + ] + ] + }, "machine_name": { "default_value": "UltiMaker Method X" }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 17341da861..f5c9ba9958 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -54,11 +54,6 @@ "0": "ultimaker_methodxl_extruder_left", "1": "ultimaker_methodxl_extruder_right" }, - "platform_offset": [ - 0, - 0, - 0 - ], "preferred_quality_type": "draft", "reference_machine_id": "magma_10", "supports_network_connection": true, @@ -70,7 +65,36 @@ { "build_volume_temperature": { "maximum_value": "100" }, "machine_depth": { "default_value": 320 }, - "machine_disallowed_areas": { "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-204, -160], + [204, -160], + [204, -154.5], + [-204, -154.5] + ], + [ + [-204, 160], + [204, 160], + [204, 154.5], + [-204, 154.5] + ], + [ + [-205, -160], + [-154.5, -160], + [-154.5, 160], + [-205, 160] + ], + [ + [154.5, -160], + [205, -160], + [205, 160], + [154.5, 160] + ] + ], + "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" + }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 319.9 }, "machine_name": { "default_value": "UltiMaker Method XL" }, diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index 44680a3468..f3b665516f 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 75eb50bdd8..23155e4060 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 2b927405f0..8e43544770 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index 43979e136b..c456c67e68 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index c7e365f269..c553454546 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 7ac702d3c2..9cb98b9da3 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, From b37e13d68457c3a073a324456351ff15125bb27f Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Tue, 1 Oct 2024 12:44:35 -0400 Subject: [PATCH 42/58] reverted the method definition files to match master PP-511 --- .../definitions/ultimaker_method.def.json | 9 +- .../ultimaker_method_base.def.json | 261 ++++++------------ .../definitions/ultimaker_methodx.def.json | 4 + .../definitions/ultimaker_methodxl.def.json | 20 +- .../ultimaker_method_extruder_left.def.json | 2 +- .../ultimaker_method_extruder_right.def.json | 2 +- .../ultimaker_methodx_extruder_left.def.json | 2 +- .../ultimaker_methodx_extruder_right.def.json | 2 +- .../ultimaker_methodxl_extruder_left.def.json | 2 +- ...ultimaker_methodxl_extruder_right.def.json | 2 +- 10 files changed, 100 insertions(+), 206 deletions(-) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 99a42a57a2..cea6882ba4 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -32,7 +32,7 @@ "leapfrog_", "polyflex_pla", "polymax_pla", - "polymaker_pc_175", + "polymaker_polymax_pc_175", "polyplus_pla", "polywood_pla", "redd_", @@ -44,6 +44,7 @@ "ultimaker_bvoh_175", "ultimaker_cffpa_175", "ultimaker_cpe_175", + "ultimaker_nylon_175", "ultimaker_hips_175", "ultimaker_pc_175", "ultimaker_tpu_175", @@ -56,8 +57,7 @@ "xyzprinting_", "zyyx_pro_", "octofiber_", - "fiberlogy_", - "ultimaker_metallic_pla_175" + "fiberlogy_" ], "has_machine_materials": true, "has_machine_quality": true, @@ -86,6 +86,7 @@ "overrides": { "build_volume_temperature": { "maximum_value": "67" }, + "machine_depth": { "default_value": 236.48 }, "machine_disallowed_areas": { "default_value": [ @@ -115,7 +116,9 @@ ] ] }, + "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method" }, + "machine_width": { "default_value": 283.3 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } } diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 74f0547735..9e1dab3dd1 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -9,7 +9,43 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-makerbot", "platform": "ultimaker_method_platform.stl", - "exclude_materials": [], + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "ultimaker_metallic_pla_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], "has_machine_materials": true, "has_machine_quality": true, "has_materials": true, @@ -135,17 +171,16 @@ "enabled": false, "value": "acceleration_print" }, - "adhesion_extruder_nr": - { - "enabled": false, - "value": "min(extruderValues('extruder_nr'))" - }, + "adhesion_extruder_nr": { "value": 0 }, "adhesion_type": { "value": "'raft'" }, - "bottom_thickness": { "value": "top_bottom_thickness" }, "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_settings_enabled": { "value": true }, - "bridge_skin_density_3": { "value": 100 }, + "bridge_fan_speed": { "value": "cool_fan_speed_max" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, + "bridge_settings_enabled": { "value": true }, + "bridge_skin_density": { "value": 100 }, + "bridge_skin_density_2": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, "bridge_skin_material_flow": { "value": "material_flow" }, "bridge_skin_material_flow_2": { "value": "material_flow" }, "bridge_skin_material_flow_3": { "value": "material_flow" }, @@ -161,38 +196,14 @@ { "force_depends_on_settings": [ "support_extruder_nr" ] }, - "cool_fan_full_at_height": { "value": "1 if resolveOrValue('adhesion_type') == 'raft' else layer_height + layer_height_0" }, - "cool_fan_full_layer": { "value": "1 if resolveOrValue('adhesion_type') == 'raft' else 3" }, "default_material_bed_temperature": { "resolve": "min(extruderValues('default_material_bed_temperature'))" }, "extruder_prime_pos_abs": { "default_value": true }, "gradual_support_infill_steps": { "value": 0 }, - "group_outer_walls": { "value": false }, - "infill_angles": - { - "value": [ - 45, - 45, - 45, - 45, - 45, - 135, - 135, - 135, - 135, - 135 - ] - }, "infill_before_walls": { "value": false }, "infill_material_flow": { "value": "material_flow" }, "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'zigzag'" }, + "infill_pattern": { "value": "'grid' if infill_sparse_density < 80 else 'lines'" }, "infill_wipe_dist": { "value": 0 }, - "initial_layer_line_width_factor": - { - "maximum_value": 350, - "maximum_value_warning": 320, - "value": "100 if resolveOrValue('adhesion_type') == 'raft' else 200" - }, "inset_direction": { "value": "'inside_out'" }, "jerk_enabled": { @@ -299,66 +310,22 @@ "enabled": false, "value": "jerk_print" }, - "layer_height_0": { "value": "layer_height if resolveOrValue('adhesion_type') == 'raft' else layer_height * 1.25" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, - "machine_depth": { "default_value": 236.48 }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-141.65, -118.11], - [141.65, -118.11], - [141.65, -95.205], - [-141.65, -95.205] - ], - [ - [-141.65, 118.37], - [141.65, 118.37], - [141.65, 95.205], - [-141.65, 95.205] - ], - [ - [-141.65, -118.11], - [-76.149, -118.11], - [-76.149, 118.37], - [-141.65, 118.37] - ], - [ - [76.149, -118.11], - [141.65, -118.11], - [141.65, 118.37], - [76.149, 118.37] - ] - ], - "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" - }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_heated_bed": { "default_value": false }, "machine_heated_build_volume": { "default_value": true }, - "machine_height": { "default_value": 196.749 }, "machine_min_cool_heat_time_window": { "value": 15 }, "machine_name": { "default_value": "UltiMaker Method" }, "machine_nozzle_cool_down_speed": { "value": 0.8 }, "machine_nozzle_heat_up_speed": { "value": 3.5 }, "machine_scale_fan_speed_zero_to_one": { "value": true }, "machine_start_gcode": { "default_value": "G0 Z20" }, - "machine_width": { "default_value": 283.3 }, "material_bed_temperature": { "enabled": "machine_heated_bed" }, - "material_final_print_temperature": - { - "maximum_value": "material_print_temperature", - "minimum_value": "material_standby_temperature" - }, "material_flow": { "value": 100 }, - "material_initial_print_temperature": - { - "maximum_value": "material_print_temperature", - "minimum_value": "material_standby_temperature", - "value": "material_print_temperature-5" - }, + "material_initial_print_temperature": { "value": "material_print_temperature-10" }, "material_print_temperature": { "force_depends_on_settings": [ "support_extruder_nr" ] @@ -370,34 +337,20 @@ "multiple_mesh_overlap": { "value": 0 }, "optimize_wall_printing_order": { "value": true }, "prime_blob_enable": { "enabled": false }, - "prime_tower_base_height": { "value": 6 }, - "prime_tower_base_size": { "value": 10 }, - { - "maximum_value": 2, - "maximum_value_warning": 1.5, - "value": 1 - }, - "prime_tower_mode": - { - "resolve": "'normal'", - "value": "'normal'" - }, + "prime_tower_base_curve_magnitude": { "value": 2 }, + "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_size": { "value": 10 }, + "prime_tower_enable": { "value": false }, + "prime_tower_flow": { "value": "material_flow" }, + "prime_tower_line_width": { "value": 1 }, "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, "prime_tower_wipe_enabled": { "value": true }, "print_sequence": { "enabled": false }, - "raft_acceleration": { "enabled": false }, "raft_airgap": { "force_depends_on_settings": [ "support_extruder_nr" ] }, - "raft_base_acceleration": { "enabled": false }, - "raft_base_extruder_nr": - { - "enabled": false, - "value": "min(extruderValues('extruder_nr'))" - }, "raft_base_fan_speed": { "value": 0 }, - "raft_base_jerk": { "enabled": false }, "raft_base_line_spacing": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ], @@ -406,35 +359,35 @@ "raft_base_line_width": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ], - "maximum_value": 2.5, - "maximum_value_warning": 1.8, "value": 1.4 }, - "raft_base_thickness": - "raft_base_thickness": + "raft_base_speed": { "value": 10 }, + "raft_base_thickness": + { + "force_depends_on_settings": [ "raft_interface_extruder_nr", "support_extruder_nr" ], "value": 0.8 }, - "raft_base_wall_count": { "value": "raft_wall_count" }, - "raft_interface_acceleration": { "enabled": false }, - "raft_interface_extruder_nr": { "value": "max(extruderValues('extruder_nr'))" }, + "raft_base_wall_count": + { + "force_depends_on_settings": [ "support_extruder_nr" ], + "value": "raft_wall_count" + }, + "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, "raft_interface_fan_speed": { "value": 0 }, "raft_interface_infill_overlap": { "force_depends_on_settings": [ "raft_interface_extruder_nr" ] }, - "raft_interface_infill_overlap_mm": { "maximum_value_warning": "2 * machine_nozzle_size" }, - "raft_interface_jerk": { "enabled": false }, "raft_interface_layers": { "value": 2 }, "raft_interface_line_spacing": { "force_depends_on_settings": [ "raft_base_thickness", "raft_interface_extruder_nr" - ], - "minimum_value_warning": "raft_interface_line_width * 0.8" + ] }, "raft_interface_line_width": { @@ -444,11 +397,7 @@ ], "value": 0.7 }, - "raft_interface_speed": - { - "force_depends_on_settings": [ "support_extruder_nr" ], - "value": "raft_speed * 5" - }, + "raft_interface_speed": { "value": 90 }, "raft_interface_thickness": { "value": 0.3 }, "raft_interface_wall_count": { "value": "raft_wall_count" }, "raft_interface_z_offset": @@ -458,18 +407,14 @@ "raft_interface_extruder_nr" ] }, - "raft_jerk": { "enabled": false }, "raft_margin": { "value": 1.2 }, "raft_smoothing": { "value": 9.5 }, - "raft_speed": { "value": 10 }, - "raft_surface_acceleration": { "enabled": false }, - "raft_surface_extruder_nr": { "value": "max(extruderValues('extruder_nr'))" }, + "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, "raft_surface_fan_speed": { "value": 0 }, "raft_surface_flow": { "force_depends_on_settings": [ "support_extruder_nr" ] }, - "raft_surface_jerk": { "enabled": false }, "raft_surface_speed": { "force_depends_on_settings": [ "support_extruder_nr" ] @@ -486,49 +431,25 @@ "raft_wall_count": { "value": 2 }, "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, - "retraction_combing": - { - "enabled": false, - "value": "'off'" - }, + "retraction_combing": { "value": "'off'" }, "retraction_combing_max_distance": { "value": "speed_travel / 10" }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 0 }, "retraction_hop": { "value": 0.4 }, "retraction_hop_enabled": { "value": true }, "retraction_hop_only_when_collides": { "value": false }, - "retraction_min_travel": - { - "minimum_value_warning": "line_width * 1.25", - "value": 0.6 - }, + "retraction_min_travel": { "value": "0.6" }, "retraction_prime_speed": { "value": "retraction_speed" }, "retraction_speed": { "value": 5 }, - "roofing_angles": - { - "value": [45, 135] - }, - "roofing_layer_count": - { - "maximum_value_warning": 10, - "minimum_value": 0, - "minimum_value_warning": 1, - "value": 2 - }, - "roofing_monotonic": { "value": true }, - "skin_angles": - "roofing_monotonic": { "value": true }, - }, - "roofing_monotonic": { "value": true }, + "roofing_layer_count": { "value": 2 }, + "roofing_material_flow": { "value": "material_flow" }, + "roofing_monotonic": { "value": true }, + "skin_material_flow": { "value": "material_flow" }, + "skin_material_flow_layer_0": { "value": "material_flow" }, "skin_monotonic": { "value": true }, "skin_outline_count": { "value": 0 }, "skin_overlap": { "value": 0 }, "skin_preshrink": { "value": 0 }, - "skirt_brim_extruder_nr": - { - "enabled": false, - "value": "min(extruderValues('extruder_nr'))" - }, "skirt_brim_material_flow": { "value": "material_flow" }, "skirt_brim_minimal_length": { "value": 500 }, "small_skin_width": { "value": 4 }, @@ -545,58 +466,34 @@ "speed_wall_x": { "value": "speed_wall" }, "support_angle": { "value": 40 }, "support_bottom_height": { "value": "2*support_infill_sparse_thickness" }, - "support_bottom_line_width": - { - "maximum_value": 3, - "maximum_value_warning": 1.8 - }, "support_bottom_material_flow": { "value": "material_flow" }, - "support_bottom_wall_count": - { - "maximum_value": 8, - "maximum_value_warning": 6, - "value": 0 - }, + "support_bottom_wall_count": { "value": "0" }, "support_brim_enable": { "value": false }, "support_conical_min_width": { "value": 10 }, "support_enable": { "value": true }, "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, "support_fan_enable": { "value": "True" }, - "support_infill_angles": - { - "value": [ - 45 - ] - }, "support_infill_rate": { "value": 20.0 }, "support_infill_sparse_thickness": { "value": "layer_height" }, "support_interface_enable": { "value": true }, "support_interface_height": { "value": "4*support_infill_sparse_thickness" }, "support_interface_material_flow": { "value": "material_flow" }, "support_interface_offset": { "value": "1" }, - "support_interface_pattern": { "value": "'zigzag' if support_wall_count > 1 else 'lines'" }, + "support_interface_pattern": { "value": "'lines'" }, "support_interface_wall_count": { "value": "1" }, - "support_join_distance": { "value": "4.5 if support_wall_count > 1 else 2" }, "support_material_flow": { "value": "material_flow" }, - "support_offset": { "value": "2.4 if support_wall_count > 1 else 1.8" }, - "support_pattern": { "value": "'zigzag' if support_wall_count > 1 else 'lines'" }, + "support_offset": { "value": "1.8" }, + "support_pattern": { "value": "'lines'" }, "support_roof_height": { "value": "4*layer_height" }, "support_roof_material_flow": { "value": "material_flow" }, "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_use_towers": { "value": false }, + "support_use_towers": { "value": "False" }, "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" }, "support_xy_distance": { "value": 0.2 }, "support_xy_distance_overhang": { "value": "support_xy_distance" }, "switch_extruder_retraction_amount": { "value": 0.5 }, "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, - "top_bottom_pattern": { "value": "'zigzag'" }, - "top_bottom_pattern_0": { "value": "'zigzag'" }, - "top_bottom_thickness": - { - "minimum_value_warning": 0.3, - "value": "4*layer_height" - }, - "top_thickness": { "value": "top_bottom_thickness * 1.5" }, + "top_bottom_thickness": { "value": "5*layer_height" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "travel_avoid_other_parts": { "value": false }, "wall_0_inset": { "value": 0 }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 42c1ffda78..9561d1bf26 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -43,6 +43,7 @@ "zyyx_pro_", "octofiber_", "fiberlogy_", + "ultimaker_nylon_175", "ultimaker_metallic_pla_175" ], "has_machine_materials": true, @@ -72,6 +73,7 @@ "overrides": { "build_volume_temperature": { "maximum_value": "107" }, + "machine_depth": { "default_value": 236.48 }, "machine_disallowed_areas": { "default_value": [ @@ -101,7 +103,9 @@ ] ] }, + "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method X" }, + "machine_width": { "default_value": 283.3 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } } diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index f5c9ba9958..72654f9b37 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -43,6 +43,8 @@ "zyyx_pro_", "octofiber_", "fiberlogy_", + "basf_ultrafuse_316l_175", + "ultimaker_nylon_175", "ultimaker_metallic_pla_175" ], "has_machine_materials": true, @@ -92,26 +94,14 @@ [205, 160], [154.5, 160] ] - ], - "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" + ] }, "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 319.9 }, + "machine_height": { "default_value": 320 }, "machine_name": { "default_value": "UltiMaker Method XL" }, "machine_width": { "default_value": 410 }, "prime_tower_position_x": { "value": "(305 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (305 / 2)" }, "prime_tower_position_y": { "value": "305 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (305 / 2)" }, - "speed_travel": - { - "maximum_value": 500, - "maximum_value_warning": 450, - "value": 400 - }, - "speed_travel_layer_0": - { - "maximum_value": 500, - "maximum_value_warning": 450, - "value": 250 - } + "speed_travel": { "value": 500 } } } \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index 84c144fc18..44680a3468 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 4f0b091a69..75eb50bdd8 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 34d8c2e96a..2b927405f0 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index a0042da784..43979e136b 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 767a52a784..c7e365f269 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 5049735ade..7ac702d3c2 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? fan_speed : fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, From d1b889b96cde2f96f2580656b25193f641a9f5da Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 2 Oct 2024 08:56:18 +0200 Subject: [PATCH 43/58] Re-apply disallowed areas and build area fixes CURA-12165 --- .../definitions/ultimaker_method.def.json | 29 ----------------- .../ultimaker_method_base.def.json | 26 ---------------- .../definitions/ultimaker_methodx.def.json | 29 ----------------- .../definitions/ultimaker_methodxl.def.json | 31 +++---------------- 4 files changed, 5 insertions(+), 110 deletions(-) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 2f4e372e28..5963f4dfa0 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -85,35 +85,6 @@ "overrides": { "build_volume_temperature": { "maximum_value": "67" }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-141.65, -118.11], - [141.65, -118.11], - [141.65, -94], - [-141.65, -94] - ], - [ - [-141.65, 118.37], - [141.65, 118.37], - [141.65, 94], - [-141.65, 94] - ], - [ - [-141.65, -118.11], - [-75, -118.11], - [-75, 118.37], - [-141.65, 118.37] - ], - [ - [75, -118.11], - [141.65, -118.11], - [141.65, 118.37], - [75, 118.37] - ] - ] - }, "machine_name": { "default_value": "UltiMaker Method" }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 4221372d79..51ca06ccae 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -306,32 +306,6 @@ "machine_depth": { "default_value": 236.48 }, "machine_disallowed_areas": { - "default_value": [ - [ - [-141.65, -118.11], - [141.65, -118.11], - [141.65, -95.205], - [-141.65, -95.205] - ], - [ - [-141.65, 118.37], - [141.65, 118.37], - [141.65, 95.205], - [-141.65, 95.205] - ], - [ - [-141.65, -118.11], - [-76.149, -118.11], - [-76.149, 118.37], - [-141.65, 118.37] - ], - [ - [76.149, -118.11], - [141.65, -118.11], - [141.65, 118.37], - [76.149, 118.37] - ] - ], "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 42c1ffda78..245ad23ecb 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -72,35 +72,6 @@ "overrides": { "build_volume_temperature": { "maximum_value": "107" }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-141.65, -118.11], - [141.65, -118.11], - [141.65, -94], - [-141.65, -94] - ], - [ - [-141.65, 118.37], - [141.65, 118.37], - [141.65, 94], - [-141.65, 94] - ], - [ - [-141.65, -118.11], - [-75, -118.11], - [-75, 118.37], - [-141.65, 118.37] - ], - [ - [75, -118.11], - [141.65, -118.11], - [141.65, 118.37], - [75, 118.37] - ] - ] - }, "machine_name": { "default_value": "UltiMaker Method X" }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index f5c9ba9958..69200511fd 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -54,6 +54,11 @@ "0": "ultimaker_methodxl_extruder_left", "1": "ultimaker_methodxl_extruder_right" }, + "platform_offset": [ + 0, + 0, + 0 + ], "preferred_quality_type": "draft", "reference_machine_id": "magma_10", "supports_network_connection": true, @@ -67,32 +72,6 @@ "machine_depth": { "default_value": 320 }, "machine_disallowed_areas": { - "default_value": [ - [ - [-204, -160], - [204, -160], - [204, -154.5], - [-204, -154.5] - ], - [ - [-204, 160], - [204, 160], - [204, 154.5], - [-204, 154.5] - ], - [ - [-205, -160], - [-154.5, -160], - [-154.5, 160], - [-205, 160] - ], - [ - [154.5, -160], - [205, -160], - [205, 160], - [154.5, 160] - ] - ], "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" }, "machine_heated_bed": { "default_value": true }, From c2c34195023101b0064039a1e6b4eb5959342704 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Wed, 2 Oct 2024 06:57:13 +0000 Subject: [PATCH 44/58] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 5 +---- resources/definitions/ultimaker_methodxl.def.json | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 51ca06ccae..6dea197f18 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -304,10 +304,7 @@ "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, "machine_depth": { "default_value": 236.48 }, - "machine_disallowed_areas": - { - "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" - }, + "machine_disallowed_areas": { "value": "[ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-114.249, -118.11], [-114.249, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-141.65, -118.11], [141.65, -118.11], [141.65, -95.205], [-141.65, -95.205] ], [ [-141.65, 118.37], [141.65, 118.37], [141.65, 95.205], [-141.65, 95.205] ], [ [-141.65, -118.11], [-76.149, -118.11], [-76.149, 118.37], [-141.65, 118.37] ], [ [76.149, -118.11], [141.65, -118.11], [141.65, 118.37], [76.149, 118.37] ] ]" }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 69200511fd..17341da861 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -70,10 +70,7 @@ { "build_volume_temperature": { "maximum_value": "100" }, "machine_depth": { "default_value": 320 }, - "machine_disallowed_areas": - { - "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" - }, + "machine_disallowed_areas": { "value": "[ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-191.5, -160], [-191.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ] if max(extruderValues('extruder_nr')) == 0 else [ [ [-204, -160], [204, -160], [204, -154.5], [-204, -154.5] ], [ [-204, 160], [204, 160], [204, 154.5], [-204, 154.5] ], [ [-205, -160], [-154.5, -160], [-154.5, 160], [-205, 160] ], [ [154.5, -160], [205, -160], [205, 160], [154.5, 160] ] ]" }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 319.9 }, "machine_name": { "default_value": "UltiMaker Method XL" }, From 88df1280f8a3c5fe755c8607569cbb4cd4404fcf Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 2 Oct 2024 11:05:26 +0200 Subject: [PATCH 45/58] Add warning when changing the MATERIAL-MAP list CURA-12165 --- cura/PrinterOutput/FormatMaps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index cc384c1add..80eb8049a3 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -46,6 +46,7 @@ class FormatMaps: "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 } __inverse_printer_name: Optional[Dict[str, str]] = None From 6555f5c9ae3c07751deb2a186d7cef54e0494215 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:42:39 +0200 Subject: [PATCH 46/58] Update ultimaker_method_extruder_left.def.json --- resources/extruders/ultimaker_method_extruder_left.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index f3b665516f..ee07f22bd2 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -16,11 +16,11 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed/100.0 : cool_fan_speed_0/100.0)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} From 806a2be60ebbb05fca6b8cbaa75a478621ac1488 Mon Sep 17 00:00:00 2001 From: pkuiper-ultimaker Date: Wed, 2 Oct 2024 10:43:35 +0000 Subject: [PATCH 47/58] Applied printer-linter format --- resources/extruders/ultimaker_method_extruder_left.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index ee07f22bd2..20f5374a1b 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -23,4 +23,4 @@ "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From 5561f650170b5e802d84688c57e8ad5da65e1d2d Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:51:44 +0200 Subject: [PATCH 48/58] Adjusted start GCode formula Method machines to ensure the fan speed range stay within 0..1. PP-511 --- resources/extruders/ultimaker_method_extruder_left.def.json | 2 +- resources/extruders/ultimaker_method_extruder_right.def.json | 2 +- resources/extruders/ultimaker_methodx_extruder_left.def.json | 2 +- resources/extruders/ultimaker_methodx_extruder_right.def.json | 2 +- resources/extruders/ultimaker_methodxl_extruder_left.def.json | 2 +- resources/extruders/ultimaker_methodxl_extruder_right.def.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index 20f5374a1b..560a09f9f7 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed/100.0 : cool_fan_speed_0/100.0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed/100 : cool_fan_speed_0/100)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 23155e4060..31da366404 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed/100 : cool_fan_speed_0/100)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 8e43544770..b16a358371 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed/100 : cool_fan_speed_0/100)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index c456c67e68..15ddccfd62 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed/100 : cool_fan_speed_0/100)}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index c553454546..5ac02aa38e 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed/100 : cool_fan_speed_0/100)}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 9cb98b9da3..be807a3d4b 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -16,7 +16,7 @@ }, "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed : cool_fan_speed_0)}" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{(layer_z > 1 ? cool_fan_speed/100 : cool_fan_speed_0/100)}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, From 4ea8bfd9bdd71a43d73b9be165143aad136b6964 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:20:13 +0200 Subject: [PATCH 49/58] Update cura.json file to bundle the new material packages. PP-511 --- resources/bundled_packages/cura.json | 202 ++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 6 deletions(-) diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index a32d1d61f6..4faa17273f 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -1933,11 +1933,201 @@ } } }, + "ULTIMAKERABSMETHOD": { + "package_info": { + "package_id": "ULTIMAKERABSMETHOD", + "package_type": "material", + "display_name": "ABS", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-series-abs/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, + "ULTIMAKERNYLONMETHOD": { + "package_info": { + "package_id": "ULTIMAKERNYLONMETHOD", + "package_type": "material", + "display_name": "Nylon", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-series-nylon/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, + "ULTIMAKERNYLONCFMETHOD": { + "package_info": { + "package_id": "ULTIMAKERNYLONCFMETHOD", + "package_type": "material", + "display_name": "Nylon Carbon Fiber", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-series-nylon-carbon-fiber/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, + "ULTIMAKERPLAMETHOD": { + "package_info": { + "package_id": "ULTIMAKERPLAMETHOD", + "package_type": "material", + "display_name": "PLA", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-series-pla/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, + "ULTIMAKERPVAMETHOD": { + "package_info": { + "package_id": "ULTIMAKERPVAMETHOD", + "package_type": "material", + "display_name": "PVA", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-series-pva/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, + "ULTIMAKERPETGMETHOD": { + "package_info": { + "package_id": "ULTIMAKERPETGMETHOD", + "package_type": "material", + "display_name": "PETG", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-series-petg/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, + "ULTIMAKERTOUGHMETHOD": { + "package_info": { + "package_id": "ULTIMAKERTOUGHMETHOD", + "package_type": "material", + "display_name": "Tough PLA", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-series-tough/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, + "BASFMETALMETHOD": { + "package_info": { + "package_id": "BASFMETALMETHOD", + "package_type": "material", + "display_name": "BASF Ultrafuse 316L", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-materials/#metal", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, + "JABILSEBSMETHOD": { + "package_info": { + "package_id": "JABILSEBSMETHOD", + "package_type": "material", + "display_name": "Jabil TPE SEBS 95A", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-materials/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, + "POLYMAKERPCMETHOD": { + "package_info": { + "package_id": "POLYMAKERPCMETHOD", + "package_type": "material", + "display_name": "Polymaker PolyMax PC", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "2.0.0", + "sdk_version": "8.6.0", + "website": "https://ultimaker.com/materials/method-materials/", + "author": { + "author_id": "UltimakerPackages", + "display_name": "UltiMaker", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/materials/method-materials/" + } + } + }, "ULTIMAKERBASCFMETHOD": { "package_info": { "package_id": "ULTIMAKERBASCFMETHOD", "package_type": "material", - "display_name": "Ultimaker ABS-CF", + "display_name": "ABS-CF", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "2.0.0", "sdk_version": "8.6.0", @@ -1956,7 +2146,7 @@ "package_info": { "package_id": "ULTIMAKERABSRMETHOD", "package_type": "material", - "display_name": "Ultimaker ABS-R", + "display_name": "ABS-R", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "2.0.0", "sdk_version": "8.6.0", @@ -1975,7 +2165,7 @@ "package_info": { "package_id": "ULTIMAKERASAMETHOD", "package_type": "material", - "display_name": "Ultimaker ASA", + "display_name": "ASA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "2.0.0", "sdk_version": "8.6.0", @@ -1994,7 +2184,7 @@ "package_info": { "package_id": "ULTIMAKERNYLON12CFMETHOD", "package_type": "material", - "display_name": "Ultimaker Nylon12 Carbon Fiber", + "display_name": "Nylon12 Carbon Fiber", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "2.0.0", "sdk_version": "8.6.0", @@ -2013,7 +2203,7 @@ "package_info": { "package_id": "ULTIMAKERRAPIDRINSEMETHOD", "package_type": "material", - "display_name": "Ultimaker RapidRinse", + "display_name": "RapidRinse", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "2.0.0", "sdk_version": "8.6.0", @@ -2032,7 +2222,7 @@ "package_info": { "package_id": "ULTIMAKERSR30METHOD", "package_type": "material", - "display_name": "Ultimaker SR-30", + "display_name": "SR-30", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "2.0.0", "sdk_version": "8.6.0", From 2de9e735cdc6c3df72cc3f218e9f585178ce5754 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 2 Oct 2024 14:46:30 +0200 Subject: [PATCH 50/58] Update setting_version for 5.9 CURA-12165 --- .../um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg | 2 +- .../um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg | 2 +- .../ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg | 2 +- .../um_method_1a_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../um_method_1c_um-nylon-cf-175_0.2mm.inst.cfg | 2 +- .../ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg | 2 +- .../um_method_1c_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../ultimaker_method/um_method_global_Fast_Quality.inst.cfg | 2 +- .../um_method_labs_um-nylon-cf-175_0.2mm.inst.cfg | 2 +- .../ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg | 2 +- .../um_method_labs_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg | 2 +- .../um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg | 2 +- .../um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_global_Fast_Quality.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_um-nylon-cf-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_um-petg-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1a_um-petg-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1c_um-petg-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodxl/um_methodxl_global_Fast_Quality.inst.cfg | 2 +- .../um_methodxl_labs_um-abs-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_um-petg-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg index 59bde14f82..5712e21f97 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1A diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg index 5bbe7588e2..b745e784f9 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1C diff --git a/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg index 44bfe19a1b..664409d5ce 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1C diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg index 397a98cea9..e146cf933a 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = LABS diff --git a/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg index cb966aaf7b..6e4af6bc11 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = LABS diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg index 22c04eaf82..8a1818a534 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1A diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg index a6c1caadbe..aaca409691 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1C diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg index 62f696f180..b0cabec01a 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1C diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg index f689ff85cf..5825daa615 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1C diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg index 4656306ce1..0ac67ddf1b 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1XA diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg index 12a2827eee..813b4c6704 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = LABS diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg index 4ec545411d..89614764a8 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = LABS diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg index 727b7c05bf..459be79ff1 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = LABS diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg index d383d1e28f..d7651f180e 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1A diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg index 1e0317c71d..623960db13 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1C diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg index d983221d06..45c066fdf1 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1C diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg index 95748f3bd3..6b0e83b93a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1C diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg index a245ebb006..be4d3e69f6 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = 1XA diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg index 6a957dabc2..1f705ddc51 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = LABS diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg index ad82afea21..ebaf2a02d9 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = LABS diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg index bd1ba0ee47..e6f81c5f91 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_solid.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = solid material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = intent variant = LABS diff --git a/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg index 5ef9cfe781..f6b18d4da5 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_petg_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1A weight = -2 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg index 1743940741..f79fe83fb9 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1A weight = -2 diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm.inst.cfg index 05f9ea7503..a328777f49 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon-cf-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg index 0f5986e4de..6ca8ebc768 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_petg_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg index fba19a3ab8..52a7cff2e0 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_method/um_method_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Fast_Quality.inst.cfg index 5d3abc6ce7..5aa5d6ce31 100644 --- a/resources/quality/ultimaker_method/um_method_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Fast_Quality.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 23 +setting_version = 24 type = quality weight = -2 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm.inst.cfg index 29562e0796..46193880f9 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon-cf-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg index 420461b125..83d160323c 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_petg_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg index 64b34caffa..3a804d10e3 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg index e61deada8a..694fa5499b 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_petg_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1A weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg index c603e06f3c..834ef7ce14 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1A weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg index e9170db215..4f5ae8282d 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abs-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg index c629a1a1fc..96918aac7b 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon-cf-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg index a16d223f2c..8a6fb0320d 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_petg_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg index 0ffed940a1..36c1f99bf2 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg index 8481ee5a7a..45e11f5e9d 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-abs-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1XA weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_global_Fast_Quality.inst.cfg index 22becb55c9..d1bb7b6b3c 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_global_Fast_Quality.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 23 +setting_version = 24 type = quality weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg index 36db7aed8d..a5f7d05d6e 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abs-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm.inst.cfg index 99dceedb0a..4e6d9007cb 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon-cf-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg index f92032bdd9..0caa760547 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_petg_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg index 235b4bca45..006f929acb 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg index 8b4f91cd67..1c51fb895d 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_petg_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1A weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg index 7d69659208..a8a877007b 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1A weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg index f95261eaf7..caf364adc9 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abs-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg index eb081e421e..a366406627 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon-cf-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg index a6f2f15159..aed6b809dc 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_petg_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg index 86b7399b21..adcb34d9ca 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1C weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg index ff53e2ec22..39b7d69230 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-abs-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 1XA weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_global_Fast_Quality.inst.cfg index 9b598c2c05..16a98bcfd2 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_global_Fast_Quality.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 23 +setting_version = 24 type = quality weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg index 6f0ac5328e..3309bb6660 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abs-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_abs_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg index de870da341..18bc09978e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon-cf-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_nylon-cf_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg index 4a9d1b1405..69c62ca3f2 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_petg_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg index 6b0ad8591d..631fae2fe3 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 From dca7d0cd3cacf696798764af7c8872f99e44691b Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Wed, 2 Oct 2024 17:18:11 -0400 Subject: [PATCH 51/58] adding sketch / sketch large files after merging other PRs PP-511 --- .../definitions/ultimaker_sketch.def.json | 191 ++++++++++++++++++ .../ultimaker_sketch_large.def.json | 40 ++++ .../ultimaker_sketch_extruder.def.json | 22 ++ .../ultimaker_sketch_large_extruder.def.json | 22 ++ .../um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg | 16 ++ ...etch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg | 16 ++ .../um_sketch_global_Draft_Quality.inst.cfg | 15 ++ ...etch_large_0.4mm_um-pla-175_0.2mm.inst.cfg | 16 ++ ...arge_0.4mm_um-tough-pla-175_0.2mm.inst.cfg | 16 ++ ...sketch_large_global_Draft_Quality.inst.cfg | 15 ++ .../variants/ultimaker_sketch_0.4mm.inst.cfg | 15 ++ .../ultimaker_sketch_large_0.4mm.inst.cfg | 15 ++ 12 files changed, 399 insertions(+) create mode 100644 resources/definitions/ultimaker_sketch.def.json create mode 100644 resources/definitions/ultimaker_sketch_large.def.json create mode 100644 resources/extruders/ultimaker_sketch_extruder.def.json create mode 100644 resources/extruders/ultimaker_sketch_large_extruder.def.json create mode 100644 resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg create mode 100644 resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg create mode 100644 resources/variants/ultimaker_sketch_0.4mm.inst.cfg create mode 100644 resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json new file mode 100644 index 0000000000..6b23ae9a26 --- /dev/null +++ b/resources/definitions/ultimaker_sketch.def.json @@ -0,0 +1,191 @@ +{ + "version": 2, + "name": "MakerBot Sketch", + "inherits": "ultimaker", + "metadata": + { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot-sketch", + "platform": "ultimaker_sketch_platform.obj", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_", + "generic_", + "ultimaker_asa", + "ultimaker_abs", + "ultimaker_nylon", + "ultimaker_pva", + "ultimaker_rapidrinse", + "ultimaker_sr30", + "ultimaker_petg", + "ultimaker_metallic_pla", + "basf_", + "jabil_", + "polymaker_", + "ultimaker_pva", + "ultimaker_metallic_pla" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker_sketch_extruder" }, + "preferred_quality_type": "draft", + "preferred_variant_name": "0.4mm", + "reference_machine_id": "sketch", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "acceleration_enabled": + { + "enabled": false, + "value": false + }, + "adhesion_type": { "value": "'skirt'" }, + "brim_width": { "value": "3" }, + "cool_during_extruder_switch": + { + "enabled": false, + "value": false + }, + "cool_fan_full_at_height": { "value": "layer_height + layer_height_0" }, + "cool_fan_speed": { "value": 100 }, + "cool_fan_speed_0": { "value": 0 }, + "cool_min_layer_time": { "value": 8 }, + "extruder_prime_pos_abs": { "default_value": true }, + "fill_outline_gaps": { "value": false }, + "gantry_height": { "value": "60" }, + "infill_angles": { "value": "[45,45,45,45,45,135,135,135,135,135]" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 0 }, + "infill_pattern": { "value": "'zigzag'" }, + "infill_sparse_density": { "value": 20 }, + "infill_wipe_dist": { "value": 0 }, + "initial_layer_line_width_factor": { "value": 125 }, + "inset_direction": { "value": "'inside_out'" }, + "jerk_enabled": + { + "enabled": false, + "value": false + }, + "layer_height_0": { "value": "layer_height * 1.25" }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "M107; Disable Fan; \n; End of print; \n; End GCode\nM104 S0 T0; Set Toolhead Temp to 0\nM140 S0 T0; Set Platform Temp to 0\nG162 Z F1800; Move to max axes position\nG28 X Y; Home\nM652; Turn off back fan\nM132 X Y Z A B; Set Home Position\nG91; Use Relative Positioning\nM18; Disable Axes\n\n" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 150 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_min_cool_heat_time_window": { "value": "15" }, + "machine_name": { "default_value": "MakerBot Sketch" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "M140 S50 T0; Set Platform Temp\nM104 S220 T0; Set Extruder Temp\nG90; Use Absolute Positioning\nG28; Home\nM132 X Y Z A B; Set Current Position to Home\nG161 X Y F3300; Move to min axes positions\nM7 T0; Wait For Platform to Heat\nM6 T0; Wait For Extruders to Heat\nM651; Turn on back fan\nM907 X100 Y100 Z40 A80 B20; Set Stepper Currents\nM106; Enable Cooling Fan\n; Purge Line\nG92 E0; Reset Extruder Axis Position\nG1 X-26.18 Y-75.90 Z0.200 F420\nG1 X26.18 Y-75.90 E10\nG92 E0; Reset Extruder Axis Position\n; Start GCode\n" }, + "machine_width": { "default_value": 150 }, + "material_diameter": { "default_value": 1.75 }, + "material_flow": { "default_value": 100 }, + "min_bead_width": + { + "minimum_value": "line_width * 0.5", + "minimum_value_warning": "line_width * 0.75", + "value": "line_width" + }, + "min_wall_line_width": + { + "minimum_value": "line_width * 0.5", + "minimum_value_warning": "line_width * 0.75", + "value": "line_width" + }, + "multiple_mesh_overlap": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": true, + "enabled": true, + "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" + }, + "raft_margin": { "value": "5" }, + "retract_at_layer_change": { "value": true }, + "retraction_amount": + { + "maximum_value": 6, + "maximum_value_warning": 5.75, + "value": 5.5 + }, + "retraction_combing": { "value": "'no_outer_surfaces'" }, + "retraction_min_travel": { "value": "2 * line_width" }, + "retraction_prime_speed": { "value": "15" }, + "retraction_speed": { "value": "25" }, + "roofing_material_flow": { "value": 100 }, + "skin_material_flow": { "value": 95 }, + "skin_material_flow_layer_0": { "value": 100 }, + "skirt_brim_line_width": { "value": 1 }, + "skirt_brim_speed": { "value": 15 }, + "skirt_height": { "value": 3 }, + "speed_print": { "value": 50 }, + "speed_roofing": { "value": "0.8 * speed_print" }, + "speed_support": { "value": "0.7 * speed_print" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_roofing" }, + "speed_travel": { "value": 80 }, + "speed_wall": { "value": "0.5 * speed_print" }, + "speed_wall_0": { "value": "1 * speed_wall" }, + "speed_wall_x": { "value": "1 * speed_wall" }, + "speed_z_hop": { "value": 10 }, + "support_angle": { "value": "45" }, + "support_structure": { "value": "'tree'" }, + "top_bottom_thickness": { "value": "4 * layer_height" }, + "travel_avoid_distance": { "value": "machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "travel_avoid_supports": { "value": true }, + "wall_0_inset": { "value": "0" }, + "wall_0_material_flow_layer_0": { "value": "1 * material_flow" }, + "wall_thickness": { "value": "2 * machine_nozzle_size" }, + "wall_x_material_flow": { "value": "0.95 * material_flow" }, + "wall_x_material_flow_layer_0": { "value": "1 * material_flow" }, + "xy_offset": { "value": 0 }, + "xy_offset_layer_0": { "value": 0 }, + "z_seam_corner": { "value": "'z_seam_corner_any'" }, + "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } + } +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_sketch_large.def.json b/resources/definitions/ultimaker_sketch_large.def.json new file mode 100644 index 0000000000..a0ed0c9365 --- /dev/null +++ b/resources/definitions/ultimaker_sketch_large.def.json @@ -0,0 +1,40 @@ +{ + "version": 2, + "name": "MakerBot Sketch Large", + "inherits": "ultimaker_sketch", + "metadata": + { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot-sketch", + "platform": "ultimaker_sketch_large_platform.obj", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker_sketch_large_extruder" }, + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "draft", + "preferred_variant_name": "0.4mm", + "reference_machine_id": "sketch_large", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "MakerBot Sketch Large" }, + "machine_width": { "default_value": 220 }, + "retraction_amount": + { + "maximum_value": 6.5, + "maximum_value_warning": 6.25, + "value": 6 + }, + "retraction_prime_speed": { "value": "retraction_speed * 0.8" }, + "speed_travel": { "value": 150 } + } +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_sketch_extruder.def.json b/resources/extruders/ultimaker_sketch_extruder.def.json new file mode 100644 index 0000000000..5f6c3054ac --- /dev/null +++ b/resources/extruders/ultimaker_sketch_extruder.def.json @@ -0,0 +1,22 @@ +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "ultimaker_sketch", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_sketch_large_extruder.def.json b/resources/extruders/ultimaker_sketch_large_extruder.def.json new file mode 100644 index 0000000000..946b047072 --- /dev/null +++ b/resources/extruders/ultimaker_sketch_large_extruder.def.json @@ -0,0 +1,22 @@ +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "ultimaker_sketch_large", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..850af7aff1 --- /dev/null +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = ultimaker_sketch +name = Fast +version = 4 + +[metadata] +material = ultimaker_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 0.4mm +weight = -2 + +[values] +support_z_distance = =layer_height + diff --git a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..55824119eb --- /dev/null +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = ultimaker_sketch +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 0.4mm +weight = -2 + +[values] +support_z_distance = =layer_height + diff --git a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg new file mode 100644 index 0000000000..01222c6f9d --- /dev/null +++ b/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch +name = Fast +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 23 +type = quality +weight = -2 + +[values] +layer_height = 0.2 + diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..5574fceb66 --- /dev/null +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = ultimaker_sketch_large +name = Fast +version = 4 + +[metadata] +material = ultimaker_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 0.4mm +weight = -2 + +[values] +support_z_distance = =layer_height * 0.75 + diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..319ef2cae0 --- /dev/null +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = ultimaker_sketch_large +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 23 +type = quality +variant = 0.4mm +weight = -2 + +[values] +support_z_distance = =layer_height * 0.75 + diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg new file mode 100644 index 0000000000..d62a7f666a --- /dev/null +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch_large +name = Fast +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 23 +type = quality +weight = -2 + +[values] +layer_height = 0.2 + diff --git a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_0.4mm.inst.cfg new file mode 100644 index 0000000000..26ab646015 --- /dev/null +++ b/resources/variants/ultimaker_sketch_0.4mm.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch +name = 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = sketch_extruder +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 0.4mm +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg new file mode 100644 index 0000000000..3d9edf5382 --- /dev/null +++ b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch_large +name = 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = sketch_l_extruder +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 0.4mm +machine_nozzle_size = 0.4 + From 2c8e069e33cf60cdde095e42d97c5373ecf8dda5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 3 Oct 2024 09:16:05 +0200 Subject: [PATCH 52/58] Update setting_version for 5.9 --- .../um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 2 +- .../um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg | 2 +- .../um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg | 2 +- .../um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg | 2 +- .../ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg | 2 +- .../um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg | 2 +- .../um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg | 2 +- .../um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../um_sketch_large_global_Draft_Quality.inst.cfg | 2 +- resources/variants/ultimaker_sketch_0.4mm.inst.cfg | 2 +- resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg index f12aabf07f..501facd1a8 100644 --- a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -7,7 +7,7 @@ version = 4 is_experimental = True material = basf_ultrafuse_316l_175 quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -1 diff --git a/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg index 83132de3fa..af34079d70 100644 --- a/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg @@ -7,7 +7,7 @@ version = 4 is_experimental = True material = jabil_tpe_sebs_1300_95a_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg index d00f6568ca..2b17449bb6 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg @@ -7,7 +7,7 @@ version = 4 is_experimental = True material = basf_ultrafuse_316l_175 quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -1 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg index 706bf80ed2..a1366e7eec 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg @@ -7,7 +7,7 @@ version = 4 is_experimental = True material = jabil_tpe_sebs_1300_95a_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg index 558e7b648d..e9d09c2c34 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg @@ -7,7 +7,7 @@ version = 4 is_experimental = True material = polymaker_polymax_pc_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg index d1ba21f96a..5fff8ce1fb 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg @@ -7,7 +7,7 @@ version = 4 is_experimental = True material = jabil_tpe_sebs_1300_95a_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg index 14754d79e0..a075d5ffe6 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_polymaker-polymax-pc-175_0.2mm.inst.cfg @@ -7,7 +7,7 @@ version = 4 is_experimental = True material = polymaker_polymax_pc_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = LABS weight = -2 diff --git a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg index 850af7aff1..892a25b850 100644 --- a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 0.4mm weight = -2 diff --git a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg index 55824119eb..31d1b656f0 100644 --- a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 0.4mm weight = -2 diff --git a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg index 01222c6f9d..34518c2b2f 100644 --- a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = draft -setting_version = 23 +setting_version = 24 type = quality weight = -2 diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg index 5574fceb66..86b220cd39 100644 --- a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 0.4mm weight = -2 diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg index 319ef2cae0..7f09f7f567 100644 --- a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 0.4mm weight = -2 diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg index d62a7f666a..3e56fb942a 100644 --- a/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = draft -setting_version = 23 +setting_version = 24 type = quality weight = -2 diff --git a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_0.4mm.inst.cfg index 26ab646015..7e51a99f6a 100644 --- a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg +++ b/resources/variants/ultimaker_sketch_0.4mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] hardware_type = nozzle reference_extruder_id = sketch_extruder -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg index 3d9edf5382..b3eee4a546 100644 --- a/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg +++ b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] hardware_type = nozzle reference_extruder_id = sketch_l_extruder -setting_version = 23 +setting_version = 24 type = variant [values] From 47551c42009a67b0553d89a222f44c7b3282e601 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 3 Oct 2024 10:42:19 +0200 Subject: [PATCH 53/58] Sketch printer --- .../ultimaker_sketch_sprint.def.json | 398 ++++++++++++++++++ .../ultimaker_sketch_sprint_extruder.def.json | 22 + ...tch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg | 15 + ...rint_0.4mm_um-tough-pla-175_0.2mm.inst.cfg | 22 + ...ketch_sprint_global_Draft_Quality.inst.cfg | 15 + .../ultimaker_sketch_sprint_0.4mm.inst.cfg | 15 + 6 files changed, 487 insertions(+) create mode 100644 resources/definitions/ultimaker_sketch_sprint.def.json create mode 100644 resources/extruders/ultimaker_sketch_sprint_extruder.def.json create mode 100644 resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_global_Draft_Quality.inst.cfg create mode 100644 resources/variants/ultimaker_sketch_sprint_0.4mm.inst.cfg diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json new file mode 100644 index 0000000000..3ec6d88fe7 --- /dev/null +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -0,0 +1,398 @@ +{ + "version": 2, + "name": "MakerBot Sketch Sprint", + "inherits": "ultimaker", + "metadata": + { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot-sketch", + "platform": "ultimaker_sketch_sprint_platform.obj", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_", + "generic_", + "ultimaker_asa", + "ultimaker_abs", + "ultimaker_nylon", + "ultimaker_pva", + "ultimaker_rapidrinse", + "ultimaker_sr30", + "ultimaker_petg", + "ultimaker_metallic_pla" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker_sketch_sprint_extruder" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "draft", + "preferred_variant_name": "0.4mm", + "reference_machine_id": "sketch_sprint", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "acceleration_enabled": { "value": true }, + "acceleration_layer_0": { "value": "acceleration_print * 0.05" }, + "acceleration_print": { "value": 10000 }, + "acceleration_print_layer_0": { "value": "acceleration_layer_0" }, + "acceleration_roofing": { "value": "acceleration_print * 0.2" }, + "acceleration_skirt_brim": { "value": "acceleration_layer_0" }, + "acceleration_topbottom": { "value": "acceleration_print * 0.2" }, + "acceleration_travel": { "value": "acceleration_print" }, + "acceleration_travel_enabled": { "value": true }, + "acceleration_travel_layer_0": { "value": "acceleration_travel * 0.2" }, + "acceleration_wall": { "value": "acceleration_print * 0.5" }, + "acceleration_wall_0_roofing": { "value": "acceleration_wall * 2/5" }, + "acceleration_wall_x_roofing": { "value": "acceleration_wall * 2/5" }, + "adhesion_type": { "value": "'none'" }, + "bottom_layers": { "value": 3 }, + "bridge_skin_density": { "value": 100 }, + "bridge_skin_density_2": { "value": 75 }, + "bridge_skin_density_3": { "value": 80 }, + "bridge_skin_material_flow_3": { "value": 110 }, + "bridge_skin_speed": { "value": 50 }, + "bridge_skin_speed_2": { "value": 50 }, + "bridge_skin_speed_3": { "value": 50 }, + "bridge_sparse_infill_max_density": { "value": 15 }, + "bridge_wall_min_length": { "value": 2.4 }, + "bridge_wall_speed": { "value": 20 }, + "brim_gap": { "value": 0.32 }, + "brim_inside_margin": { "value": 1.6 }, + "brim_line_count": { "value": 3 }, + "brim_width": { "value": 2.4 }, + "build_volume_fan_nr": { "value": 101 }, + "cool_fan_full_layer": { "value": "1 if adhesion_type == 'raft' else 3" }, + "cool_fan_speed_0": { "value": 0 }, + "cool_min_layer_time": { "value": 3 }, + "cool_min_layer_time_fan_speed_max": { "value": 10 }, + "cool_min_speed": { "value": 20 }, + "default_material_print_temperature": + { + "maximum_value": 280, + "maximum_value_warning": 240 + }, + "gantry_height": { "value": 27.5 }, + "gradual_infill_steps": { "value": 0 }, + "gradual_support_infill_steps": { "value": 0 }, + "group_outer_walls": { "value": false }, + "infill_angles": + { + "value": [ + 135 + ] + }, + "infill_before_walls": { "value": false }, + "infill_line_width": { "value": 0.45 }, + "infill_overlap": { "value": 10 }, + "infill_pattern": { "value": "'lines'" }, + "infill_sparse_density": { "value": 15 }, + "infill_wipe_dist": { "value": 0 }, + "initial_layer_line_width_factor": { "value": 150 }, + "inset_direction": { "value": "'inside_out'" }, + "jerk_enabled": + { + "enabled": false, + "value": false + }, + "jerk_travel_enabled": + { + "enabled": false, + "value": false + }, + "layer_height_0": { "value": "layer_height if adhesion_type == 'raft' else layer_height * 1.25" }, + "line_width": { "value": 0.42 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 221.5 }, + "machine_end_gcode": { "default_value": "M104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM132 X Y A B\nM652\nG91" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 220.4 }, + "machine_max_feedrate_x": { "default_value": 600 }, + "machine_max_feedrate_y": { "default_value": 600 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_min_cool_heat_time_window": { "value": "15" }, + "machine_name": { "default_value": "MakerBot Sketch Sprint" }, + "machine_start_gcode": { "default_value": "G28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\nG1 Z0.25 F6000\nG1 E-1.5 F800\nG1 E2 F800\nG1 X111 Y111 Z0.25 F4800\nG1 X111 Y-111 E25 F1200" }, + "machine_width": { "default_value": 221.5 }, + "material_bed_temp_wait": { "value": "False" }, + "material_bed_temperature": + { + "maximum_value": 100, + "maximum_value_warning": 70 + }, + "material_bed_temperature_layer_0": + { + "maximum_value": 100, + "maximum_value_warning": 70 + }, + "material_diameter": { "default_value": 1.75 }, + "material_flow": { "default_value": 100 }, + "material_print_temperature": + { + "maximum_value": 280, + "maximum_value_warning": 240 + }, + "min_bead_width": { "default_value": 0.3 }, + "min_thin_wall_line_width": { "default_value": 0.3 }, + "min_wall_line_width": { "default_value": 0.34 }, + "multiple_mesh_overlap": { "value": "0" }, + "raft_airgap": { "value": 0.35 }, + "raft_base_acceleration": { "value": "acceleration_layer_0" }, + "raft_base_speed": + { + "maximum_value": "raft_speed", + "maximum_value_warning": "raft_speed * 1/2", + "value": "raft_speed * 1/4" + }, + "raft_interface_acceleration": { "value": "acceleration_print * 0.2" }, + "raft_interface_line_width": { "value": 0.7 }, + "raft_interface_speed": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "raft_speed * 3/4" + }, + "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_margin": { "value": "1.5" }, + "raft_smoothing": { "value": "9.5" }, + "raft_speed": { "value": 200 }, + "raft_surface_acceleration": { "value": "acceleration_print * 0.5" }, + "raft_surface_line_width": { "value": 0.4 }, + "raft_surface_speed": + { + "maximum_value": 300, + "maximum_value_warning": 275 + }, + "raft_surface_wall_count": { "value": "raft_wall_count" }, + "raft_wall_count": { "value": 2 }, + "retract_at_layer_change": { "value": true }, + "retraction_amount": { "value": "1.0" }, + "retraction_combing": { "value": "'all'" }, + "retraction_combing_max_distance": { "value": 10 }, + "retraction_count_max": { "value": 90 }, + "retraction_extrusion_window": { "value": 1.2 }, + "retraction_hop": { "value": 0.4 }, + "retraction_hop_enabled": { "value": true }, + "retraction_hop_only_when_collides": { "value": true }, + "retraction_min_travel": { "value": 0.8 }, + "retraction_prime_speed": { "value": "35" }, + "retraction_speed": { "value": "35" }, + "seam_overhang_angle": { "value": 30 }, + "skin_edge_support_thickness": { "value": 0 }, + "skin_material_flow": { "value": "material_flow" }, + "skin_material_flow_layer_0": { "value": "material_flow * 0.95" }, + "skin_monotonic": { "value": true }, + "skin_outline_count": { "value": 0 }, + "skin_overlap": { "value": 10 }, + "skirt_brim_minimal_length": { "value": 250 }, + "skirt_gap": { "value": 1.2 }, + "skirt_height": { "value": 1 }, + "small_feature_speed_factor": { "value": 10 }, + "small_hole_max_size": { "value": 0 }, + "speed_equalize_flow_width_factor": { "value": 100 }, + "speed_infill": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "speed_print if infill_sparse_density < 70 else speed_print * 0.8" + }, + "speed_layer_0": + { + "maximum_value": 200, + "maximum_value_warning": 175, + "value": "round(8/35 * speed_print)" + }, + "speed_print": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": 250 + }, + "speed_roofing": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "round(9/14 * speed_print)" + }, + "speed_slowdown_layers": { "value": 2 }, + "speed_support": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "1 * speed_print" + }, + "speed_support_bottom": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "round(3/7 * speed_support)" + }, + "speed_support_infill": + { + "maximum_value": 300, + "maximum_value_warning": 275 + }, + "speed_support_interface": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "round(23/35 * speed_support)" + }, + "speed_support_roof": + { + "maximum_value": 300, + "maximum_value_warning": 275 + }, + "speed_topbottom": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "round(9/14 * speed_print)" + }, + "speed_travel": + { + "maximum_value": 600, + "maximum_value_warning": 550, + "value": 500 + }, + "speed_travel_layer_0": + { + "maximum_value": 550, + "maximum_value_warning": 500, + "value": 250 + }, + "speed_wall": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "2/5 * speed_print" + }, + "speed_wall_0": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "1 * speed_wall" + }, + "speed_wall_0_roofing": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "speed_wall_0" + }, + "speed_wall_x": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "round(1.428575 * speed_wall,0)" + }, + "speed_wall_x_roofing": + { + "maximum_value": 300, + "maximum_value_warning": 275 + }, + "speed_z_hop": + { + "maximum_value": 24, + "maximum_value_warning": 22, + "value": 20 + }, + "support_angle": { "value": "60" }, + "support_bottom_density": { "value": "support_infill_rate" }, + "support_bottom_distance": { "value": "layer_height" }, + "support_bottom_enable": { "value": true }, + "support_bottom_height": { "value": "layer_height * 2" }, + "support_brim_line_count": { "value": 5 }, + "support_infill_angles": + { + "value": [ + 45 + ] + }, + "support_infill_rate": { "value": 15 }, + "support_interface_density": { "value": 80 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_material_flow": { "value": "material_flow" }, + "support_interface_offset": { "value": 1 }, + "support_interface_pattern": { "value": "'lines'" }, + "support_interface_wall_count": { "value": 0 }, + "support_line_width": { "value": 0.32 }, + "support_material_flow": { "value": "material_flow * 0.9" }, + "support_offset": { "value": 1.6 }, + "support_pattern": { "value": "'lines'" }, + "support_roof_height": { "value": "support_interface_height" }, + "support_roof_wall_count": { "value": "support_interface_wall_count" }, + "support_top_distance": { "value": "support_z_distance" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": 0.3 }, + "support_xy_distance_overhang": { "value": 0.2 }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if support_structure == 'tree' else 0.25" }, + "top_bottom_thickness": { "value": "5 * layer_height" }, + "top_layers": { "value": 5 }, + "travel_avoid_distance": { "value": 0.625 }, + "travel_avoid_supports": { "value": true }, + "wall_0_inset": { "value": "0" }, + "wall_0_material_flow_layer_0": { "value": "material_flow * 0.95" }, + "wall_0_wipe_dist": { "value": 0.2 }, + "wall_line_width_x": { "value": 0.58 }, + "wall_overhang_angle": { "value": 35 }, + "wall_overhang_speed_factor": + { + "minimum_value_warning": 15, + "value": 17.5 + }, + "wall_thickness": { "value": 1 }, + "wall_x_material_flow_layer_0": { "value": "material_flow" }, + "xy_offset": { "value": 0 }, + "xy_offset_layer_0": { "value": -0.1 }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_position": { "value": "'backleft'" }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_x": { "value": 150 }, + "z_seam_y": { "value": 180 }, + "zig_zaggify_infill": { "value": true } + } +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_sketch_sprint_extruder.def.json b/resources/extruders/ultimaker_sketch_sprint_extruder.def.json new file mode 100644 index 0000000000..adea8a923c --- /dev/null +++ b/resources/extruders/ultimaker_sketch_sprint_extruder.def.json @@ -0,0 +1,22 @@ +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "ultimaker_sketch_sprint", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..0180153f85 --- /dev/null +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch_sprint +name = Fast +version = 4 + +[metadata] +material = ultimaker_pla_175 +quality_type = draft +setting_version = 24 +type = quality +variant = 0.4mm +weight = -2 + +[values] + diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..f46bb7fb9b --- /dev/null +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = ultimaker_sketch_sprint +name = Fast +version = 4 + +[metadata] +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 24 +type = quality +variant = 0.4mm +weight = -2 + +[values] +acceleration_layer_0 = 200 +acceleration_travel_layer_0 = =acceleration_layer_0 +speed_layer_0 = 30 +speed_slowdown_layers = 4 +speed_travel_layer_0 = 150 +wall_0_material_flow_layer_0 = =material_flow * 1.03 +wall_x_material_flow_layer_0 = =material_flow * 0.95 + diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_global_Draft_Quality.inst.cfg new file mode 100644 index 0000000000..4608f97271 --- /dev/null +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_global_Draft_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch_sprint +name = Fast +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 24 +type = quality +weight = -2 + +[values] +layer_height = 0.2 + diff --git a/resources/variants/ultimaker_sketch_sprint_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_sprint_0.4mm.inst.cfg new file mode 100644 index 0000000000..ca484f6ce5 --- /dev/null +++ b/resources/variants/ultimaker_sketch_sprint_0.4mm.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch_sprint +name = 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = sketch_sprint_extruder +setting_version = 24 +type = variant + +[values] +machine_nozzle_id = 0.4mm +machine_nozzle_size = 0.4 + From 83407e13310e257c7ad28f0541928ff3b84e6688 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 3 Oct 2024 11:34:43 +0200 Subject: [PATCH 54/58] Updating version number of Sketch quality files --- .../ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg | 2 +- .../um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg | 2 +- .../um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg | 2 +- .../um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg | 2 +- .../um_sketch_large_global_Draft_Quality.inst.cfg | 2 +- resources/variants/ultimaker_sketch_0.4mm.inst.cfg | 2 +- resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg index 850af7aff1..892a25b850 100644 --- a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 0.4mm weight = -2 diff --git a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg index 55824119eb..31d1b656f0 100644 --- a/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 0.4mm weight = -2 diff --git a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg index 01222c6f9d..34518c2b2f 100644 --- a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = draft -setting_version = 23 +setting_version = 24 type = quality weight = -2 diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg index 5574fceb66..86b220cd39 100644 --- a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 0.4mm weight = -2 diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg index 319ef2cae0..7f09f7f567 100644 --- a/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = ultimaker_tough_pla_175 quality_type = draft -setting_version = 23 +setting_version = 24 type = quality variant = 0.4mm weight = -2 diff --git a/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg index d62a7f666a..3e56fb942a 100644 --- a/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = draft -setting_version = 23 +setting_version = 24 type = quality weight = -2 diff --git a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_0.4mm.inst.cfg index 26ab646015..7e51a99f6a 100644 --- a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg +++ b/resources/variants/ultimaker_sketch_0.4mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] hardware_type = nozzle reference_extruder_id = sketch_extruder -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg index 3d9edf5382..b3eee4a546 100644 --- a/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg +++ b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] hardware_type = nozzle reference_extruder_id = sketch_l_extruder -setting_version = 23 +setting_version = 24 type = variant [values] From a2e07014928b97f98ce1ceb2d13982cccd5253cf Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 3 Oct 2024 13:19:28 +0200 Subject: [PATCH 55/58] Add mesh and texture for Sketch Sprint CURA-12167 --- .../ultimaker_sketch_sprint.def.json | 1 + resources/images/MakerbotSketchSprint.png | Bin 0 -> 35904 bytes .../ultimaker_sketch_sprint_platform.obj | 3576 +++++++++++++++++ 3 files changed, 3577 insertions(+) create mode 100644 resources/images/MakerbotSketchSprint.png create mode 100644 resources/meshes/ultimaker_sketch_sprint_platform.obj diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index 3ec6d88fe7..cda786f68a 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -61,6 +61,7 @@ 0, 0 ], + "platform_texture": "MakerbotSketchSprint.png", "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "draft", "preferred_variant_name": "0.4mm", diff --git a/resources/images/MakerbotSketchSprint.png b/resources/images/MakerbotSketchSprint.png new file mode 100644 index 0000000000000000000000000000000000000000..d2b967acab3e7198cf8b0a032d9cf46b3853d99c GIT binary patch literal 35904 zcmeFa2T+t*w>H}97)Hk&P)QDA7!i<+L`P9XMT~&NfhI_7a;96yQBed8gD5DB0hK{$ zL7_pQVI;JQh)Pb~NDzrl&fz{A=KId~)jd_WPMv%1f2yujSqOB$z2Cjpde*bn-s^cU z9XYJMc;Whm6bfar&VH?96v|v*{NpT`hu?^tWW?cHzTXK$k7E|z8(iFIHg=BI8$5hn ztT$Nu*x67hKGjY~jxNdFuwY_nmFn!-_k}pAQdNt+#_xT2=rp*(_jSpZ>jgu7hne5M zyOUPBdE4xH`uZI=3ofWDsp;#mn=1x>qGwgi+nzIu~xtS`0CX{klV zqPOoWMfQEwdj8nJ$sJm?Ah~= z8^Uee3B0DhKX;c4elPZ!tnvcFC)`%ZJ$9pO8xOdsY=Z92b3Mnq_+u`Y{Kr@Eo?$&RA7%X1=~qgt(Y zzx$$}A8qj4hCh}*SY~Cj&i(rDzw(D)YM)_x%S1Obx{5zCzevvePOCv#?ogD^IUk!6 zMP>d5|@eLAP~^S8504Th5mdes|!}J~dsTlL~ix z&z%Z8`QG?W%7KuSt~cgu-?vK?nmpe5tN5Cv@4gpXReEIKTt&+lZ4V9im(X8vG&@E& zx&73%?c6o$tdpm&nraS)qzB^^>(a?zQQx&9fsEZt>SBx14&(Wk!8|4xNqt zvtA!Dh!d=@U$$2I*x<|J41ZPsv7tlp*`hL9ZdV%4=3b*vmKfW?z6^B_sZeQ7QWjP; zOKT|~Cl?qVg`%eE<6=Q|u=dzsX>DugtS-jS$QIjRXQeJ?prE@$*JY3OX}kS?Zq~>B z4xgatp97E2gnBB7Y{p{^9FKF3rm`(hq{;; z{=VTK<8yM+)&1w?o!$SQ1HEHAc}sc8or+5Gk_z(5@^VTx%CfSGmj7}o z9cOnB3ume|xfCugWryp??og1Iv7stU+Q?I_aS4T;l9p5jc}ZDW89AGsHdeA!s~!Jx z2|YJESfz#IzmAGr$_kgFTFYA4>`;)EwAg8*ASo{^Zz*Z9Ls3c6Qc<2NYh}4Z$x2yq z`chU@m3=ffCkrg6os)&FwX}<~?erhWgsc2~L`PjrR%+%`r+;(A(Za(9Z%`LIWasSZ z^B*rgVdrFh+{1#*ri_xT(oO|A1tr}7jvcb{|M4PyYd3dTBDto_4k@{rA&_NJ!OdV| zEr^}s0@Lrny{PPQv$pV{xt*ZV9M#3h05*_!{`1eea3?DZ4+|{|4{KZ$pQR$RLuH5D z2^l$+9f~S4iV{0yRd)Q#>uFYYHopH)uO`m3L2YKq_uIMS^L?j(HRDmotzBn+n)%Vu zZrYVLY?yWm6$|RjEx22FSzAqy6W5yg6ZN!(v#mAI<8O2Q$M5a_6H`#IRNg5gyHi1u zs;DF@DX(NBBe`>@jHRTtwUV;DjN(o?3xLhPeXu*t#>3mf&H86s%p>Ls<~coA8@5g_ z)KCBZYVXt5WEC)Bk}^9a$%M(M$SbSJ%KklJ(*N_fXtP7c+EPwlMp90B2X0Y$hk~Sq zyoJ1^m6furjFqyyl9l|7ef)C*|GT&N?>6!GEviWqSp3JLs!9LfmVM?0|AM2Knwj4L zp8@yM|HS*h=M3ZhpZxlJ)&D0yV#9`SAM#(C-*40PZMyzTGw@$}@i*)GHeLUv8Tc=~ z_?vb8zcyV9|083xb_UV&Mm|_yv~3o0$$6FswY4bu6gp+`@abkb{N{U?{iob16se8m z-z=Y4O)va%zK4$P-uYh_&RH~X*-!M^ITXqUijLOLCw!_q>ROK*+eUVO9^2m$Pnk3C zN)KE7u;Z52#AxY~DL(_fqC;CsS|65pWm;YlaC~R;Jb164=EKh^xyx;y7u_&1IQi$X zGao*Fl-WdAdl}PF%$V%+Cc~oay1wx6%zs{LnUPN5_?df`VFR zRc-B+=H_Of$#Gw`z|npeX?j~*Lr2x~j};XHy1KeYw|0z2d8ZhKl$Dj;ijEFVN=n)q zQ5e0ILaDEOJ2~E>$!L+MP-0%y*Z*RY<)@(ZqFh#0RZw$snCj^4+%-07WNh465F+^T z)2HN?nx_c~`FffYtK8k)qj%s6hRN3jD8u3^s;Z4|!zGSxU3LFhTwZDEiS66BH)a14 z7au%1IeFUIIkc;*E6s1fzLp)R`e#{NG@p57YhH>&Md}>>_;|p(ckh}C8g}1X7JKZc zmoH!5zjyD)MAM8lJo=auKF_xSt3%bsDrmgiUPx~2==L>KcXv7ZXzOF#5O+ZF!Gi}q zWd`PZ4GawWhlV)A!#+h@@7SI`y|ucgW}{d`)pJ|dmiKpuxHeW+;!Vom@)Xn@$E4K^=Fizbh zA7XWCO|#oh5siSf$2IDKqw-%`S~iN^Ke4UT;pul2N)D$%X*H$(L1FUt%lVck;>!XP z3QSL(x|EWV@;Z5YWK`6UCj%o`zC0-{ZLOf7p#MwL*khOS^Yep(PCGhY*weZE*?Z&b88ph?<{-gb^YuBx-3N1~k&1Ps8a5!O28cfXBoH=v+ zN2|}DKR?`+!N)oXMLF2Jxa`oF8t)Si9Y|}1y%a`BYunnkoORAlPhW>y;AZ-+JbwH* z3M#D+XHx>cgGuMeD5$9kMM#-eA2;c0YrDKfFIq_1lJ?V@;Ex|aCbcj%J0=1bl-Vm_ z8AJQLgu(`t?XbRrO3qq)_T=76jJbL9=4m^-OJ~oXH8eF1fwB1vcHCb11EqV`CPCl! z_Vx$y@e(kp2lwv%bw!Obd}hs>HCmBjPYt&heE9Go+F+@-hlf^@VQt^m%SQMbR9JY9 z7kcmBy*+ceYM3gpto`NmPZza&^i-?}w?TH=PkpWl5Zvv}|K z6j4LWDQ4Wz$mnu~?)`g_HoCvRf04-KT{D`bq@-xa*ie6eo`HGbYR1$UZ|TIvprr}V zpSyDkLNOnh%D$sv7McuLRA|B5w+C>6g1kJfO!|aM992)OcMz5dOMH-(RaZ8Ta&=>2 z^4HEz^%G4+$=eUaUVqlFdUE?3&96f=8ZE3?V{H560FyCtZaKweyMmGu=fj61KP+CH z|LWE5DA#FPfs-omRHW@ikQQYEn37G^$Bxof~|X)q`6pBtezWwVAI=XH@K(p7%OnruD2RrYJRV(tFAU0 z=S@wR2lN#weJn2@eBXjax}TIJqpz>Oq(2MGW#e0-E`Y;2x>smt%}?Y*bXq)_q-aaL=R!vqTVPIfjxJ7en9b>#v)SZ(Mejs*Z zm3TL+qq#7mr?>gwme~}I`&=#;c32o_a4gAi+N~TM9BR|uTMR{}l8i22vp!{#;U%fm z?d<57_x0=P@n&hpr5YA(Q6?paZ^S+DdVAshjEu2ea-I$$_D}TV&AgLnm{Ac;`kf3T z)-(>eT?gt}+uLt*=COqtBZcOc9v<>TOFun6eD|_LMWS$_`u5PW1KhrrVopv@PH0#$ z%q_u~b>BoP1AsX>G5X|KT*q3c6om+HfVDY~iB*8#c?Sf*O0abD^72BhJwro7+Q2;G zw2qFo^m`@=`VUN`IG;WpdskEx*qdXrEgZ||%HhP9*~6f_>=f(|9y|z;)rM!tD=E>k zS9f=E0RR49ccz${n)=hD%gf6x5jf68XSBAq);h?G-Dk5Wck!NQWvTo5`@{UzBO@cZ zJ0s%b-008?u4IQi0;C5a5cDPZEdrJ@>F zU<_e?p&1z&jbDnQ()+3~b>p2hM$Nz=S&8G14>yNye==Zb&JI`?CZc{BkfSbYiz$_6 z4~yYO2Lq!1M&u=#Iy`z}NnLb%7Q(>$J3CkI*|P`tn%SP-(b*XyXZv0&-6T{%+AQyZ zc9>Tdy&X|JSeji~^0f7@zy4Y)Bs6Z-vVt<4h5-ajO$@n?^foIa+^fb2u3L9$WMsq# zMxV5kOI_}Z+imD=E>tx$2?+@i&e*nu;v#fnTezX2VdZk)Mdx>u`!&C&1ORGldwZAT ze0|W1@IyhU(BTOL0j+jD$fVVJm~eK0JMMb5Vmtld6*R?8R96qC{F?myxt!7}DM?9Td#&9!t$V6$ zV>)k9y^i1x63w!V05s}37(V;&$u3%xNN`uNB2db8C zDokFxcI|8RL2x?5Q>Us1Qq2Q;_WrPRsc6-s%~(L!zAr_4!a^w&dN$Te0E6KNJk8E# zRJa}!E!iSku>&^l={YsEV_WzEkO+oelp%#O9_<9Qg6n&Dd9nL?ER)vO)z$ShnLHO2LK?jVJcyjLCx%7Ao_)jCy(6zlh zVQH`82xw}WN9!@?C#G;oRqw8*=o`_|(P=(CmPK3B5sR{B`_Sq1G4|-#SYy+h8>-Q{ ztZaVl!HB^u3V2M1O7P&G>~a{3M}L2R6W!U~-oApW>ObgsN6pu*f*N!8E*VN^lDM$2 zFaSb0D=UjX?%b0~NGA*l1F;>ej?<4%0ua6LGu^(%J!T5St!?4*B`MuwzMX+nlM`u} z-$94-;GaN}OBvpLdT-;{!)pYLX*9m7XjD{Ga8=bQgC&$4e>l^vsHmFd3!ZPUac`1b zwNUlT=)Un4*^eGSUK-$d>SmeArBey|jc^}s&rMcPP(F&!>8MDVnhZ(kBY5&8J2yyxCvC`&H@Mm^v9n z#WhqamEMi`RoT(ui0F{j$LT;6^y#ku>zb2(z>ygF-kS$vy=@#%#+MP!SA=wF@H7J0 z;TVl9YO@6}(K2b6D-Z?$PnWQ%06j?YtzoVX&X0^gzGcgnp;dp->Rzq}t0AdIqd(s^ zw%2U&k|q1h&CR=7FtrZOTu*RcVNRNLKtSdfpNp(4pB^!N1B1rVfp*p1w0lQ_770k@ z)z;QV8|d4fT65~A@SFBFgf?%*^>LnzgoK2T#B}$$z;rqQ@^9od8yUb-rhrl4(DLd;7?ujXy=@qL=-^6Ne(fpA@`RSCQVUSyTCUw9L!RX$^dz#1&M+k@)y@$q~58>fHg zn4lluGd|L%p3gysAtxuNI@|uH^~LJS?Rp5C zRiEx(ia9%!lmxJfA;p?g0UY;FU~F*Ki$%JBhvgh0{Mw; z&GarpVsOLiJRZ^{c}2y7*RNlP7N@*;kp~D@^B;V-bQ$Fr9!M9Mg!b{{C4&wn@Krso zyk={GLpI%^p4`G0_AJUc7y03r#5C~N!*`UE+MQShD&s0g^yABJ-My<`y6pq*3S0q` zIsBf{*VosB_^Hl_0bd_b(IM%{>bCS_-DX4(r{nw;?GS@ zR$X6{>l9^GyRe20WBhF5K&CP05Dg1CQu+*cTfj5QGS_$;=NmiZrKX*#GC3FJAN? zZD=zqt$x?B0XgKf&1-PW%EAThdC1~GRi2JaEIhxvt1`$wWjzdUzFFoDRn@Wg#uOH~ zo|c0{J6nIZr~q&UY2U$A=PA9iEF2y68z1j0&WOIaz0f|f z8f51RmP%yUu0kxEi)3}MJ>r4TCa)u&(Q7DYUYwjk@FX!$hcC`%O$h^o z!}ckoKPwK|J2;S<#n-N`P*~l@rD@u6_!KZQuAl&dxLa;hxv!@Eshfe<`v#Fzq`9}e zkIrTzuD_2~H|`5tU|Sp=f_&54MyDmAA!OLvgkv#Te+0Rir>Cbjay>_m&3QnCgz{WU z&SQ_?X`Ctbcm>ZkDgckkXM{3MSt&SB&sv4Hmqx94Our#a6v zk+?wLKUVig2Lf_WW0+>ax%o@om~RlUkwGzRQ{3(yd7TyGmLBj#9o3dU(=!0tzoL2- z;8AApIo7E=c1qVEL7$XR#0HgywiPCKen{v2^1_pmZ|TZQYNr~RnY|YdEc^87x_{_& z%EoW6V6sH}EbeLqs<21CL`6nL3L7BIAf3Gt^pR5qBsp~GP!m1z#I`JV)ACVj@zL?9 z=SgyuZvPE16;V?lE-F+(L0|cNUSC_@f!O4UHKTx)+VCg7aNhf|v75xi)(8j;tqvq5 z31nz(ZEco5KEsvKC5Y7C+(|YlPwmbZzEL3vF9cw&Z!Iq=SqZxQ?yh7;6j=J-nZD0R zuQkctt9BZJY*bZM2~Rce?R@m;5y1Qo)C4-W#pM-tQk#yh4`9v2s9Xl53QUyx{0T2_|d$O#K;HqHScP+eSHI3`^9 z+NqmP+ApwxSanrrbC`?0ecJ~P>S+yNFB$W=m_5+T0yKUUw}m$pN@rgo)f;Cpna0LO{$gcR41q)@crkl&wB4uw>rui- zi{tGgA|e{GDh9w%PRwNgW0Jrsbc0520~Kr3V~ie0>2R2%Ihpi$@f)}U3R}{X__?69 zCC)&^W10#ur52hpN9N8`TU`CpLs2oEX`5J+c7c46FZL}S@V=S82c$y(@$%Bg>TE3 zFKR!NI}S(T;@%yNKtF%$c7XLEUEOA9%9@^o%AF|2A>%_f5(FDfV@%PJ2JXX2B@$S( ze;M&scA6>w4g=q(?-v}yam>qCP>GmjloHL7PS?N`kN1QzYR&#q(bN=$MWi2GjzP(mmhG$_e`SAu! zuPdvboY>Zb_yu~W$~H$)3?5r1wCBjdo7OVQ%C`hJ3kV2=nQmajSSA_v`Js?rV-ZND zZX^XI$4@MU43_?Hyu$Q%8FW;<>?iNcrtH5){K*g@wdAp$_D$=fQW1@!Q^TCWg3~FO zssho;?u(>g`uX!`f-89R5oq%7 zs(N$%qpn@MMhu&9x!ZEK4M?Pul9N{;&E*YvffSOwaqF63*DvpGld6`lc+~Aqa<2{G zg{rUgL835CB!~X}6|C%9NW_!X))L`w+3)v&P$Pv3bK@dQMAWivsQXD6qzQ&Tf*Dqg&TKqNQTxU~QEN%EUJOGIkgH|6h+?>!8CaM_f-2Dy5s!eLuk2wY^Lu_rRfyOXYFLAA3E0I&pRLmMsqK^9)pt zy<2gFt6R7VRIX9m9WEzU2u`2`EE zDx#fYr2a|wmA%vb6oo{pG~AvPCqxHofpExliiAHOH86+}{Dq}YX{mdJ()&Pr#n380 zR>7~O3vWxCv#+?N-^nXJpRl++(LCF%Zz;iORU3OIlUZ?v37DP6eZkSJgp?Eof@-G4 z)(H-)C>u@|C}1zo>%;QzVtSoEi8?sGdMvN5E{sIgZ_9q0Q)`rH+@~V}Ld|Q>;D33T z^w4F9L?-M2Uw<|2Xz;Bxm(RP4iaw`$czEQ6OBkfal)y!?kDz{?8gu8)yE;cFhn1<9 zE?x50(2$c`iJ%*VtpQTLjek-2`hGyZ{CHqL6eDj-HE}<3A!bwhRae(0)Q*4(CNx z$)zYQGc!{N`%PmS^MUNz+ML1h9#(i^^Q}8~#!bf^QTvz1{$Rb*7ffmTwUnDE{zYzF zv&2%OAzH=Lp3~BX$_TP*vh{mvYs{0NBI%#2g03z6{ulP0A z3<14QiqwH!so&S2Mo!A8N{81hJl{E-_Uzd*QcHz9V1wi%m&8|+L&9n`sB3V_*G8b=D|PZJXh;1_T^B<|JR6G=Bo zEqtUU#(mG287R+}&`SsuVFpYy?3U(ivBnlv4(;8SFJIUNwn%)MLj{$uAO@R0a6rua z;fEjcFlDGpaX^LKd1j0g5*|ay*nBzmb&|$W&nBwj2;;+zVHxjZxkihtQ9eR-1IcTO zLwy|x11d#Aty@F%2m=SjCHr_8^ty(I=@`xrP5$PK0`#$i0cOY+B&h;8}wOw2)sAgg64y@)=&90t!@XSk85qVTtO26ZmveeXS7`6)7kmsy?`#iMrCWXZ05s zP_7D1ul!f+H~1Uf%|Iooy{#k{Ts4HBJw@kze2T()XAO&#^+;;o)5sAG4DBOWKp$6D z`n{t1H_3*GG8Wl+#Xf0h5M^&7Zw((HrS+_a7#vv z!H-ctI_=<4Gtdr#Jhu+JV=_Jkzh!xDR`Dk>^&O8I}D*oNC( zhTM=$h_^^1I9ns1G39?}r~78I`6RR__Ly&r42ff(K79&Zkiq+^A|tbW%i%k(?`qdn zR<1>^tU#^D&KOb#E!1|fueBFxV$r%cD6x@imz0$Bpb8i`w=>0Ud+nBgoCQcp+35S! zn03m?NTt*>BPnS)JSPdxh?mPCdVFOp0^yR;&=5fh(zUng&1o8qCnG)5*-p2x_z@u9 zh>UUm=&9#;C)rsh1(pM`$B>9-4`t4x1lVKm)8!ZAS;#YlKRYSWIEk5MS2OB(HACr0 zbvjkXJfsKvhEu!1OXke)1V#)`j`5cUWFn%Gjp&X3i7d;`pGif^EYoNC^6YmhPDmwT z1n^^01L3AABYwAVd55Q#v_gbG|2WtmR%W%UbKqp>X+(!Jgu#*%|Cmh zGWchiJtjw+cvpi3c4f-SRxi)KvPZd1x9AuvIk`8(WFjposV8dfUoJvqAMn(Nxs+ka z9XA9h%Fj^n>a2PoJr|8^-}I8vBYh z!;k_Y!tvaHMnRAo7^sekKu)8D8bhKv2^B9re!`+@X<@69(eIm#eR6&<;ihMuvSLSo zt4C3u$KLg2aH2?w4uI_g%%&K9oi>uUbAe1ZY?#=Q7>y0!2Oz|geVS9xZMMEo-j1y? zmbNN#7)zeSPo&%mpOi9vxeAaf$iHZ~E%LL~qa^`P>V_ob8T^w$G z9MeGdrz$JcCV0*y{R2Vr7vXoOChUwO6qbDI!t<{Nw_Y&9%wp4dJV#EO!{J~-^2oNZ z;r1`ic>@k`I#kUiX+O=UP&AYQD9SI8!wxg2Mwx3xM7Yu6QMSn2fd<0hH|nJe&Jj!e zd{GqJiG<##8q9Aw1yn%Ms-U5v;hsn%wn^b=1c(t-OKXQgo+Uv;R^PaBL+S^d;CQgi zch;GWM^UZ@NE5#c^NImgns2l?;K>@}`QRO6g*BaRjB0m|)(DQ6T!LMe@95pH=s@uXZ$KzBDg`#|OCKG3`^lNEp z(QK6|3w*0ORk~D!{P7n}ASx;zLh)2tKoGwE4;;|?W)A-ibNJtL&hFbXep^NW$p3;9 zpWiI;+bVps#Q!blumAt!jonj~Npn^Z7WMO#IcwvGb+2yCoPu9_W9F1R7015u^~)h7 zK=`_%GjoVu=FRjO`5l{Q&d?W#Pal!b`SxbYw+Z`ZBoxXw$Dn)z1Ijlr_!cn`G{1qt zH!y%1d}9XRn87zNfFpck2H(KoTP}$i_{I$WGcfo%$o=?_vjE?U58nzd-{|wVhzYFx zMxXze(`S4B`(@JeoKb4I@cm3#TJ{i5N8#(+B`B2t(YY`z;RN*H z2>IyLW4rY@>x5&EcUF^`ufOqoaSJ)adR;t@rmCzw{DjkgbPqQhItc?)dL{Dgv963t z9?v_LyqFU65N#;KgEchi^O;k9jLG6Kze6#HGA_vLnxfqjTwx3Uc%kgTx7Ge%Yx#WI z!|7(gj7wy_>dPG2ErJel9wZu&@cTII)id zo&#rwhKH5uBh3+&T(06y(W?izOP~CG`267NOdQg~5zv(o>yi7Jd_e7boC0^{bF=U_ zG*0x4@uqOr^ZNIrXMW2R-G5zN26`1vRU>Fy^YHY%jgx#hYv+%45;PcX)VVG}9SP7N zZS(1OPWSGSxgokAZ6G+MYN{Gt+(LDBPW*g+F?mbO4IE=U?c|i@mHFVoM(FV9md+Pz znpk$@R$+ceM~9$hAbK~@G;;bCdG)X(PIP9;n?8U)9O8xWS#dT`4{FR7Q#&9JLSVQPY(N6Ttiyn0a1%-Tch#0dhzJC1* zts5!I(1Eq&qrp$2rnNwf-x5*^e zy+en+laz3^x(x3G>HyoFwve6`H5z;;CWeDU;JHcUWAENoIE%MX0u*uR@jea)ey;55 zauyO6RuFowG~vnc(_FVCOVtYcZbF%KUd#;M1)Szm4&{YYmZvPd(4l|dgtJNdLjKT={XY;a#Z$mb6Y{WH((7u6I5HS`3=*aM*nFDqQi*ySA@i(-i-Zj3^}MkC#ikKZoQ< znfr5tO*$*k+On7**;4ddX7(#6xuC;DNvMX$3&X+q(F!ywLZ|_KsAhM^O{8Ex;WI`5)2m03%-Znp15jJRIqBRaoNq>pP-}Q6CdSpzuey6D%p5X1HkQ0=SBHe* z1$&`FlbeL00X(yl)pbj5;j}&`T7r7uBRReK8cp2-Xy#B#m3Q*+_Q#=jv=UxuH(b5& zJXSg-v@9cf(eds&UIYa$(E{p z8oFd9@ui$CL=X(^OzZV)^{16eP8-GoWMXXSsQmX{psK-mh1OB+(#6q``8NAYEfynd=h-zFv1{$@(V3ilBIGHP>pkV!p_p5x*VjOiulbwR&gCmO^X>HP< zUSmofot)rx#57!$$XyQK!inF+td$eP!@~(ik!)w2+CHqOCm0$M7N%`%9Ce8?=SRLE zK!sOn-c(;-e|PAV#9mFDLYKV>tijby>ZgHBJ*xM^04wy%q5%(BKvjdDa?Rn8Wwo0}}U1=fdlc6AlN zZ<*Yoe;Nl)g5yrM)X&?^b;yj%evLoexpOD8!eP6Vlvzd?M2cd+lB)!)fOZ-VF3UfC zf@YQMKVw_t(ZroHH(crDvOZCFtA*<&&=|+#@mxBZn#7?bvmT($o*1l=ILX?$abr&> zi-#`6q1aBes}cNXb0Ap3`F`qdaI&|*426$vGg$i|>h9gFq}bNapDobhQeZyW z8v$vj_%Jv>j?)K8XOH(Dld*;w(%2)L(Y@AI1GJ&~`)7Q1fF21>RzF+my7))h1D!X` zMEIy+QVczUL@)zA@gywa+d#`uLU{*!~+M6w zAJD?5w@D|EF@tS_im~jU9La+z&hU(IarBrv9V`KAD66UlGMR0 zy}fSf1MIIrTg^aVC?eZ+@gx?@ptwv-441cba!UA|^dcn%@$2^+pU(7mE0Cc3=+XLA zohNgX?IQPKk};(HCGzDJ73~(zkPHcmSQL*CUM5{jc;tD1=)~A%Lyf88=6!EZPt(!g z2^>)-&CuE)onr1&*3;vP);f7HGcJ@>S{ld4)gbC2Ce}7`N-GZtkhNPWrWh@c+7Ip4 zquI*9=(ZF@AE4`!TX6?cHs$5|TfQjl=2pNo_jlen58%d>;RZXpy2?dM&~JgMgA`SJ zjG?&BFzHstb;4wAYKBL=WRt;`?j4i?Um zD-jM5v)YTn1JDi-Zj$h5MsF+E^C^B#;dsOshyOIJhZE2cqWa|00lAG&3mMG8snexf z9v+J`nU3Z1x=d5+ZZx!D8d#~RW~XYW9hrWRbWy`hE>JN==m_(*_D?ZNXffBhUYc9k zE}OJ3-AIcl{Gk0H^K&KX3Gnt-{h7I}ck&{F5NRAhTfk^4z#VG;oaI}u@XTUx+LEIJkd0I#y;QGF}~kQ~N>??gwJj|FG? z-NQWWh1to=pWw04;RYMQ;!QLpghwN#fR+VtGPlC__)nvVug5%yEzmLB?gMLnV4}Y% zyOjQ8gY{;8sG1?-LSATNgEd{>ArRvDN0y??^*{%ouZ_#^*x};D#Yk7Hs;VyL%mkSa zmqwTF=BDkOU?MyRu0M)s1c;UdnLvNNUw9|rLP$h}m@Jy8M)#uAXFZx$2K0VT?1M(7 zvWkkmvZAuGPn`W)GAfN1Fl>0Qv$DQa1Qq={ZwEo9Dyyn4iR)Opxg|$Ght`W0T4S(! zqZ*hdba3oLdndFg9E^9vTH%+Aja9^Th*Hd-zEkH;1qGo2YxDqviTo)DA^!puVH#b- zq-6zeDu89e`w<+qA|K%falg`1Qf)j678kwqf?dziRfn$rEW3f&8?mc|F~&2zBMHFS z_M>I^JV>`-vCCaL(5D7yL4QdGy=4sUh0ZRxH6qo?VuDDP?(TiZ63bts?JuR>5OX-~ z+-r7oNzXAMASA;E6^k5ZTQC5HVax zB)U9({J5oB56{K{8xADwyXI3rdTk95=i0ivcOdMvpG+MIV4H>b!zM|4G;nXZ^q$W| z2@vc6@(yLjYVyg?o_*M12v|fnXQJezOkL-|*H~mhG(|4v5Oo$%=7JVJ0u|7q$t@jy zoL9tk#B@s_xA27FcGO{mX$>%kG?i5hD)qL!175;j2wF8`4mA8eUm%AStCWf zQu8J_``c}2LrVRE@D4!hz}~XZurMmLTi(8MgmqzNfbAOl_U%io;{$wV=w`P!n#xX^ zd$)O_kFFwBKJa9^Ng~S@VjIl)EHohpyQK%%S)>LR(?61p&l~Ohj%H z0t)m_*kvtUvRrJ?iKjXH*A_fk1kXWqA5P^|` zG)*KS*pMGFZg%R)jra*-Ac7)$oP^`sx1FV(GZrNBnH4o#GrLH%hZ2SJ$`Mfk$As%j z4c1p{zc&0iw{Rq2vLKlM=vY5w9g!ihMjObv(fV8{b!DWoI?-n-BqWqMz_#yPYgSZ1 z3J;8wuf1iR%r!cS$^USDG?$^ho?G4LEwP7d^pf}WRos9;I*4%l!~hgOkPP4sz$XV5 zz0i+CFfv*uz`4PU=LA@JIrAU#7dCV;c%HTo}1q|A+f_Ai;d zE`A9dezdQ5BmiAma8M$%HcE9*H$m^OwpM0O;%K#)bNGSgw}wthETy^mG4aMDi7){4 zcRu)B2>?pTauL+IE)FKqcF(EP63muqu(0Al=|(Xkt_rD$Px4uVH!d20gu;?fSC;-w zLitE=1%rQt_yq4|teut?urjNqYjTpVe)TR)KR`p&F0x>7&}*Ux<_nx?1g$eu^Sy!3 zb$Ffuec^rf;d2~n9Ksmr7d5{42Dgru$=o$75amJb5+r9< zui_18lbl@1v$eeyFXRIiRuVN6z$o;3A>1IZOLT}JSJdX6$$Ieu*ofS0J-j>+9pHAt z@g$3e33|53YAPrUXlj%PL#os4r3>j1#D^&PXCX2W;f&l}{h%w8oxDlO_r=9LyBN4$ z5)2cFIIxH{Xa@U&!fP!3ud-B8QBe-AtD1EfG!g%~pzh-ka~Lv`BNg9cF3+%_B0%IN z7jv*;4Idw9^D~Q)So-ud>?KrfP6J|(p|No=lJkR|2WPZU3W!xX95ZbJx+1T*pPoMQ z))0UK)2dh`t@#3r0@|6iDimRaUg}=uVJuZ`V7yhn7tu~>PynD9$Fe#7ki{B$n~I{t zg|NV^E#2grlI!e=E({3()zyC1jsXE`s1Puo2a|H`nPP238bb7i;-_1ST^cPNF#V`) zqIeXfM$+gDk?HZx9MZU2aFwNhnU3m^ga8eE1!_&CdvjcZz(r1qeQ*M@ z;R}smhpsLz-35WrswGXZ^EKJX+K^HdTm|Nobt7B^-eVbn=KyEJFuBIAhiQ9XkKIE7 zo;QUM)gmbB5Xqp1yR7Di(3o}MASm$qGd_x->kcQbqLvK#myj5At559VBBd7nJZje zqs^Zv9ioh3&X^bo=e|k_9)fgQw!%zWm6>I_Luk|j%si$lP%co1*y zTz_3W-77q&xXvk%hu2f&%S%f=BzTa_?Mn$~#{?IT)*-uUb{o+*%Z%yUGM(UNX4FL9 zK-}M7(*K+u7UTKa-_?~gqqDkRsRLW?-W8s5BNK9j#bODd>dop36n<9WS-2j0}M29L>VWh&&=m+LeQJ`eNrMR^5=pXg2~Va`F+o6c|Rl?p>)6TQ_me= zH9A2rJ;23sjXne$g}%-;@i(^F)xwnVETRjHoDE1ZS|>-TT>?A>vqx1ZA6HIj%U(dq z4mXf{7l}8A(M?1Zn$*?QP%Gk&RzO7QT48hl?{m)#eSi!EvJgTRk;eW;SvJJyh2eH9 ztE(>qw;6*HSLS@)e-W&DeFJ$$Kn`tFL?ID@h;>3>7M)1buz#KL{P{{;W1uMmr6UN8 zfuxqKo*i_#HmF)w1k9KWDucx$jNd96qQO@>irsN1V^^FXVwlfj9`EM)p^Y;RD zIY`m5R-B%mr0?gXS!-@2J?qmoUItQnv-LE{3usQX>h+*+o-;c7^7}bwlrZj$Qa?p8 zLdtKPRkL2Fmyr&`MQXj&oVf4b#B)g8nGt0@SuEO9n&N zp!tSsm)@VBkAcD>i~!{JB9@zIe0cPT2%kW~B@g(4l+p0k;xoqNkqk)KC)$CLqGx7z zn=#I*LuUb&75HN+o)~}$&;E3HDMiB;WC1xpsnAypJ~2mK0!q{)H`FHelH(^Kc`5{0 zb;Wj%A8hhWR3w2t%=zVr{wV*#PZ>(1|lHXEAeTBWz^Kv7!&~Fh@(eCMG2(@;uP$j+-`Z@c8(VWlD}e? z4iY(CZ`-}Syb7?hf?{d8|20z+lRQ*(iHaSmhN(>w2|RgSL8;ldP=8y>7~X?&@^BAF zRC9k=G3X5ePcOPX=LJk3Igr77DE*iq=Q7*rO;S~eo$SpkJWxQy0^?5jHTFDZGR=MO zMj9pU1|3#cQ$>V@y2$jtkh_uUg@f5Iloaw=Jh~u8-_!j$cYn!?$vZ}(Wd_9qh>F`K zB~9C^Ors(yM9s-|g2_rOGZfb}wSXuw^wFPCi(}rsi0}lC9t=SC<9DM#g=--ixU?GD z^IINKN66?$F5fPGGdan=DsaY_k0g|UBQ)sU9b)9ITYrI$e)~!jJpSbI<1Hkr9NB78 zvuqtjLx6}cRa6*E%^8PA>BE5U;GI3t^pio9CPMqr(wl)uV^VsC$kBZ;FT!mkehh%a zp@>cb>?1qu63Tb9Ly~g^tS4ekmH$bUYQexzWEpT`UU-bll4K19l88UE95|#>3G^{| zbqBI5ehVPBeqw1qDpZ!g{IUVwHr`*N2Qh3j#$k<^FkA&SPJr6PaJ%`GUu)nNofXK@ zMf<%|kabN7Kf6{fgZjS7PH)C&Nesr<_$l21c@N_DFx1tdz?4r!b4LTRRG0`4@Sz6i z$sSwgS9ehoDM$}_FbmQ|jF6;*sP_6P*Wf-hr^ekM+EsVoVbePapp3Gmp;H4nHqd=n zB-RWQaC6u{Q5FG=a z5D*XZhW*{WU?h+lJ;*ucuZgWk#FWHLugFIld7}%Usn%9eUsZMceB!LM)tX}@45GjR z2yf3mZhh3|#zzn*@Q&W#`4kp}lJ}DbW&B2Iq9P%jzAu<0cD0_0d?+J|Wkkx42%>{s zNMt_--6dlObNO4|54uvm%(ilrLYHoGU}Nr(PK6+B{0LGi6=G@-TLD8i^4dMIk zz)-$`d7glIz;b}yVu|fzpfPwH2252W-5s076SYJ@ajE9GOKWY}t1)EHB(o*YN`S_f zbSKruW-|yhDK&=hWl(Md1J}|T$5TbJN;NYOy2zt{IJhSw>j}!pbC*4t*WZh>s=C$X(B)dP9`ynmRGo|ozQAT3@j7mh{n0h+ta%S;|GGz zfdL?HBwU=xJ`et&j4CVcQ=;rIn!hP7tOYy8h8&(kW3+1Fd6F6TrXj+^`apq7pPhUI z*CwS>_$iWL3C?|Wq$6YGtWsvI(XN!_WH+Zx17E(_Ae;Jn?BKbeh_gHZH^2bQ$_RQ& zr0T7xIQWrgfGc1|2)RkxJpi6c$_r%MrMN{p1n7V#qqx1m{u`K!X1aR?lv$TAhssw) zG)VCC%G%neG4VquQ2@sVD;^XQoU$B{DEz1sM^<@0fKwvTuOF9nPUJ1QT>7SG#z^Qv0f za``f3Bm?eI;yPq%0ZXwrmoZgQ)30p6M9TkA%5?aCHf0wTXVA{DeiwhkOuYQG?h6}x z0NA0Jq4_A39ftOulF6A)er$PUJ@!ls%!=(I%g5prU*@yH6tJ_nf-#&cN+dgpx@lHf zyB^3>+-VJD4TK>Kg`E9LG(PR8(oLi=Mx4yZPRc&*wEP(czyEqumY;dW>^eyQlY9li zYq*Y2CmAQOoyf%b^68J^9x&F}bh3?wBUdI;N*!_4Jf1nzkzR&GII9lw@B0af$LgwQ zlIJs!ML>*R)mzS%rWcubVj}U#BTwrwD4(YULn_TB90%>{g<q0BVK-_Y+#SKh)W3!S<^XoWX>GM5(1}V4 z-UGSB%P`YnK9 zDy#3?AXN`>TD6{(0uSekydpct8X9I(FJUG499VX(PnVdP{>^=P;U7j!%c}i}TjDP> zTlGW`n(UyE4QdkQfxcvaWOWjANQFKyVa9?)?E|y3#$X6BldUlTPzkbcc9k5ef|(BblG-%${IfVD1F%Am?vT*~BvdkiLaf;EoJX2;%@VV%>qk`coRSDD~>}DfzjS ztBdvjm`eL3pCEnRv&7O4MPRb|4P;v06SF80O6z2o3vA@zRN1d}27BHZowP{^dDU*8 z@SVnqwE@^$!L*aWk2fl@u{V^813H;KDag5?=S1+6JdC5?fwg8q#g~znjdqx7p!gG1 zxlp1sV^(pwB2)c(Q>&1gl!Y&BC8&pdEGQzJ#fe2pmPAm!p*}=kP_tj=s z8(Cp9{_TKK`wbK0GYNn^>`lO+NBh>V0{~$(!0}0$S(M?$PnzbQx$@-vuI19_Zne+e zMOOtiCOWd9Hm*KCKGtVbKxs&>6BNN}eQalB{?O6EL1Jt<(X zWC+6f{Ri0VJDU4O$VR@rE-!s_Km~;#1eONT$9dGz zMJb!%5S|LGgIkgs0(48m546H=;hkVRJi~#P5RW9T0k1;(n_y&9T51$bMl#uKKH2=% z7dvP~e40EU4`hls7qTP508sZOhmAhj-vjkU1(4M1b2}sDbx-!tcbhqJdL72L&!LE3 z1ZK$IFW>k=|F*&QH9UWdt=u9ci^zp{5S8OJ{~>3D2^6($0CISyfH$C18_o{9!D*W8 z6RWG9B<#v7eESY59pH({o6SJI60wJ*iBrR2Q-({0q0dh;K@ggN~ZQO?G(o_?J>8HDnLF|#LC z$Z0_2qS$^jr8VxrCxRf8tyW0K2Jrdu$QO~ykc6oKPc;)J!jxETKrbGtfz*a6;)#LIwx_?fggn}jXo2G8ZKAtS0ws%sb3ND{iO_g@*{7=DGtm^! zrB+o}k3Lznf~$y`jM$b66&+Ao|Ie2b4sYo zMjqAln~O3BJ^|oDz?Se7ij2~m*ane@h<@d>ZT&AR{D^Wr(rrYo`A$_w+Rgn-Gz3Fn z2KnB+K!NPBIzDV#30w5iML5YdT}-KVX?HRkI*HmQ7(ccGOm7!sPKhd_R8~3E_OaZ`QK2pM^&5bZBxI4rh3IOdAT!v=0aieJI!V-Lu`fWT5DNt8Cpj{L z3)y2v#a>2D&4e+IRRutqjQsJyOZ%0l_ohsd1${Mbot;@8fe09*%a&7Q#Ydps+A>uv zkB2=-gM%YaH8x-SCs3W-40PT%w`{a?atZ|dYBVO*q84VaFwhEOr*qA7=2JBeE zyb{_CwOsOx4g}RIEeT))` zy?Rp-_8w$qak4dt>~O9v4-D#KXJt)zGiWf`7}IBCf6in{qZwIT#O83b6r~YKjUB@$ zcoL%K2M-p;z8!>ju^*M-)mjlszYorF;h8&9YoVp_4L^N!#75jEwlz%P3Y? z2vjtIRSe7x5i^rwd!f*?w3@%_Oby6e278xPUSY<3>>v#^0-2Zh&fawacSx#eCyL0v zkKNB(C_aLust3tWoJSh?zm^MXeC*$!U&Nr04BQ$p!4Q~ZriZQc2QIAwwwW_cs~L89 z0;>jl;5~xCf|+BDl6|}M=rv#)064nuZ6D3h@aBZSukT;}%M1)RgMdTu`T6?5BKmdrQ()~1j8$N= zef;8u#;K>9I+-3!0*w~8*Z*h-p1`|%%U{R{bV3t@!eWps1A(JTz`+S%X&oCSx)(Uw z1k7KHfkmtm=zQ6S*PA=&TLm6mU z2I$^OV564zII!>lc5Q$|p@oHoiH8{S4$D`03IT^jKsO!$+qN}6z?M1CJHR0p;J|ak zn*VRaKQSG6o(LQn0=A#mhh#7wcnx&e(@G#W0P5A*_#7 n-CNT@&wWOq={DdRSf2m(>-RX#%MiL158`{e`njxgN@xNAQV~$D literal 0 HcmV?d00001 diff --git a/resources/meshes/ultimaker_sketch_sprint_platform.obj b/resources/meshes/ultimaker_sketch_sprint_platform.obj new file mode 100644 index 0000000000..5fb441a89a --- /dev/null +++ b/resources/meshes/ultimaker_sketch_sprint_platform.obj @@ -0,0 +1,3576 @@ +# Blender 4.2.2 LTS +# www.blender.org +o UMS5_Sketch_Sprint_Print_Bed +v 118.354355 -110.073631 -15.743723 +v 114.068901 -119.722466 -20.180752 +v 114.739487 -119.531227 -20.297832 +v 118.222610 111.787270 -1.131916 +v 118.105339 112.000687 -0.992550 +v 114.372559 -120.408913 -1.567927 +v 115.075256 -120.310265 -1.497774 +v 114.623497 -120.192039 -1.310158 +v 114.343330 -120.358589 -1.426195 +v 115.554459 -120.107918 -1.370563 +v 116.561562 -119.835945 -1.523540 +v 116.733383 -119.639137 -1.368384 +v 116.043571 -119.849419 -1.310039 +v 117.248619 -119.459877 -1.522878 +v 118.072464 -118.823708 -1.548119 +v 117.566948 -119.092918 -1.349142 +v 118.491196 -118.370094 -1.471268 +v 118.148705 -118.456383 -1.307186 +v 119.063904 -117.618919 -1.496015 +v 118.898308 -117.518639 -1.309204 +v 119.545059 -116.684624 -1.501333 +v 119.368965 -116.693657 -1.327548 +v 119.979317 -114.791542 -1.546383 +v 119.872765 -114.779594 -1.359550 +v 119.666153 -115.628761 -1.308561 +v 114.330254 -119.769600 -20.014763 +v 114.783730 -119.664619 -20.188385 +v 115.452164 -119.587349 -20.015186 +v 115.687637 -119.464653 -20.162823 +v 116.668396 -119.071022 -20.032841 +v 116.353371 -119.145027 -20.220768 +v 117.369240 -118.588310 -20.017700 +v 117.326752 -118.499260 -20.236143 +v 118.061874 -117.663261 -20.275997 +v 118.048515 -117.928963 -20.015171 +v 118.031891 -117.887001 -20.156723 +v 118.578491 -117.092583 -20.185804 +v 118.996643 -116.220100 -20.174244 +v 118.741119 -116.933876 -20.016710 +v 119.189331 -115.750694 -20.018013 +v 119.139214 -115.462776 -20.248945 +v 119.320786 -114.889366 -20.096825 +v 119.135612 -114.846748 -20.292850 +v -118.105087 112.111557 -0.909167 +v -119.795189 112.455376 -0.397305 +v -118.101974 112.512970 -0.341256 +v -114.381645 -120.408150 -1.560503 +v -114.337540 -120.353432 -1.417629 +v -115.075378 -120.307335 -1.484245 +v -114.369156 -120.190910 -1.306561 +v -115.421761 -120.125435 -1.356490 +v -115.842773 -120.127281 -1.528017 +v -116.801514 -119.722115 -1.529080 +v -116.721581 -119.672783 -1.389816 +v -116.096489 -119.869316 -1.328052 +v -117.660309 -119.174797 -1.581673 +v -117.731583 -119.034370 -1.396146 +v -118.395699 -118.498619 -1.537017 +v -118.816689 -117.842995 -1.374323 +v -119.059280 -117.637291 -1.538954 +v -119.347755 -117.138710 -1.600169 +v -119.466316 -116.738152 -1.418668 +v -119.614754 -116.515724 -1.573597 +v -119.790253 -115.740837 -1.411599 +v -119.446068 -116.415977 -1.311712 +v -119.851295 -115.738640 -1.607210 +v -119.984589 -114.772270 -1.549996 +v -119.760483 -114.956902 -1.308025 +v -114.288513 -119.768730 -20.062492 +v -114.807518 -119.655586 -20.193531 +v -114.054405 -119.653221 -20.249153 +v -114.479156 -119.513466 -20.300648 +v -115.314285 -119.617699 -20.019558 +v -115.577896 -119.446388 -20.233921 +v -116.598450 -119.075127 -20.136566 +v -115.648697 -119.281960 -20.300369 +v -117.359421 -118.595436 -20.016453 +v -116.676758 -118.845695 -20.293957 +v -117.344505 -118.538933 -20.178831 +v -117.667435 -118.141136 -20.254490 +v -118.071205 -117.812065 -20.193687 +v -118.174393 -117.411293 -20.300415 +v -118.596100 -117.170021 -20.014229 +v -118.457596 -117.328346 -20.146744 +v -118.785400 -116.747444 -20.154697 +v -119.074623 -116.153236 -20.014324 +v -119.129585 -115.797600 -20.177170 +v -118.782196 -116.350227 -20.297047 +v -119.229736 -114.967064 -20.227985 +v -117.562439 -119.004112 -1.307592 +v -118.768143 -117.685417 -1.307635 +v -118.202690 -114.999275 -1.308108 +v 118.175125 -114.557808 -1.315975 +v -102.527359 117.855774 -0.138946 +v -102.927872 117.810875 0.040637 +v -100.471260 117.820648 -1.295707 +v -100.992523 117.774666 -1.188597 +v -101.818733 117.807976 -0.728868 +v 102.324310 117.848808 -0.270049 +v 111.261032 117.771225 0.172250 +v -114.251167 -118.497536 -1.384607 +v -114.607948 -118.624672 -1.307536 +v -115.169846 -118.403404 -1.343528 +v -115.564735 -118.176643 -1.402450 +v -114.882591 -118.327950 -1.505968 +v -116.304878 -117.701027 -1.532479 +v -116.415077 -117.902229 -1.307010 +v -116.187958 -117.852654 -1.399496 +v -116.757812 -117.427696 -1.390290 +v -116.949265 -117.129433 -1.518570 +v -117.307846 -117.091057 -1.305937 +v -117.345657 -116.773384 -1.381246 +v -117.830345 -116.205086 -1.307549 +v -117.762093 -116.003441 -1.388687 +v -117.908432 -115.308769 -1.486655 +v 114.410706 -118.572090 -1.331387 +v 114.401733 -118.467690 -1.417562 +v 114.372513 -118.411201 -1.544248 +v 114.761902 -118.637306 -1.305193 +v 115.234459 -118.232216 -1.501876 +v 115.472389 -118.235603 -1.388150 +v 115.867188 -117.962715 -1.521942 +v 116.139709 -118.068581 -1.307957 +v 116.223412 -117.772270 -1.448457 +v 116.695084 -117.382805 -1.517065 +v 116.893127 -117.280663 -1.406013 +v 117.270126 -116.842323 -1.395114 +v 117.167587 -116.863258 -1.548399 +v 117.143982 -117.279213 -1.306540 +v 117.758835 -116.284264 -1.313323 +v 117.546371 -116.291313 -1.483035 +v 117.753342 -115.811241 -1.484184 +v 117.992233 -115.474098 -1.349338 +v 117.893784 -115.324654 -1.532196 +v -118.435722 -114.474144 -20.263554 +v -119.107986 -114.652489 -20.292091 +v -119.174210 -113.204521 -19.937145 +v -119.171562 -110.927956 -18.133074 +v -119.226143 -110.495995 -17.358353 +v -118.358910 -110.157631 -16.292042 +v -118.367775 -110.068810 -15.701704 +v 116.520187 -118.885094 -20.302149 +v -117.216118 -117.523552 -20.299286 +v 118.461922 -116.962868 -20.301010 +v 119.134209 -113.038582 -19.875046 +v 118.441986 -112.293785 -19.469849 +v 119.199783 -111.768379 -19.063721 +v 119.220894 -110.489204 -17.346588 +v 119.298531 -110.073555 -15.688443 +v 119.774773 111.181702 -1.307418 +v 119.901337 111.240204 -1.382926 +v 119.768761 111.412079 -1.271702 +v 119.909409 111.583611 -1.303199 +v 119.752731 111.747925 -1.147991 +v 119.761627 112.046616 -0.944462 +v 119.950867 111.999252 -1.151342 +v 119.872047 111.945747 -1.088641 +v 119.812729 112.230949 -0.769009 +v 119.807709 112.379074 -0.552409 +v 119.996223 111.991684 -1.300517 +v 119.792519 112.509766 -0.255070 +v 120.016357 112.556053 -0.746094 +v 119.969116 112.416672 -0.729568 +v 119.933853 112.561646 -0.318709 +v 115.859978 -120.120552 -1.519124 +v 119.850487 -115.699898 -1.498012 +v 119.334488 -114.421516 -20.080494 +v 119.118271 -114.445030 -20.263668 +v 119.260567 -114.185707 -20.150454 +v 119.151794 -113.650291 -20.097752 +v 119.317360 -113.145576 -19.784416 +v 119.184242 -112.493034 -19.588074 +v 119.362602 -112.287315 -19.258556 +v 119.383240 -111.707222 -18.742699 +v 119.177887 -111.304573 -18.606194 +v 119.423111 -110.913338 -17.714638 +v 119.324661 -111.208443 -18.370628 +v 119.356911 -110.794914 -17.743835 +v 119.168114 -110.893318 -18.084221 +v 119.396790 -110.438011 -16.939049 +v 119.482597 -110.337410 -16.039661 +v 119.239334 -110.201347 -16.518208 +v 119.426453 -110.188942 -15.950785 +v 119.720940 -110.140907 -9.095851 +v 100.478218 119.323578 -1.298494 +v 100.982079 119.310349 -1.184925 +v 101.352829 119.356827 -1.035607 +v 100.915642 119.437042 -1.252488 +v 101.744217 119.373672 -0.792277 +v 101.453491 119.486572 -1.074362 +v 100.470589 119.464737 -1.367908 +v 100.855423 119.531769 -1.387284 +v 101.885551 119.515541 -0.794309 +v 100.646645 119.560753 -1.522308 +v 101.673973 119.571487 -1.117961 +v 102.845520 119.395126 0.015541 +v 102.163635 119.375435 -0.398611 +v 102.472847 119.423157 -0.187944 +v 103.097450 119.568367 -0.033295 +v 102.213242 119.545952 -0.507428 +v 102.731453 119.601128 -0.234933 +v 103.488472 119.419319 0.177415 +v 103.541191 119.602989 0.006516 +v 111.997025 119.590935 0.055396 +v 111.999817 119.378288 0.193342 +v 112.029739 119.696396 2.196742 +v 114.688354 112.618401 2.196835 +v 120.092644 114.405334 2.196840 +v 112.301201 114.327972 2.196850 +v 112.050560 115.165657 2.196846 +v -112.038719 115.298553 2.196821 +v -112.000046 117.673386 0.196847 +v -112.029953 119.696396 2.196742 +v -112.000137 119.382225 0.192862 +v -111.998138 119.596565 0.039043 +v -102.519218 119.370659 -0.145335 +v -103.496948 119.392380 0.183690 +v -102.903625 119.382584 0.036514 +v -103.364662 119.518753 0.100306 +v -102.225067 119.534798 -0.480723 +v -102.628830 119.543793 -0.196373 +v -101.341583 119.313904 -1.041625 +v -101.815208 119.348564 -0.728368 +v -100.774269 119.339378 -1.247840 +v -102.167564 119.381317 -0.397538 +v -100.411278 119.427612 -1.343687 +v -101.098648 119.449120 -1.209586 +v -101.748756 119.478783 -0.866033 +v -100.674942 119.531944 -1.442206 +v -102.003891 119.584351 -0.855435 +v -101.438965 119.542778 -1.164819 +v -100.891144 119.563461 -1.508193 +v -100.345688 119.312752 -1.302954 +v -120.077667 114.552368 2.196845 +v -118.765244 117.459824 2.196823 +v -112.891495 113.458054 2.196839 +v -119.739502 111.199829 -1.301922 +v -119.869804 111.209549 -1.354849 +v -119.947899 111.338959 -1.424778 +v -119.775185 111.496338 -1.250343 +v -119.882454 111.734093 -1.215482 +v -119.732979 111.828209 -1.100300 +v -119.990753 111.619453 -1.504891 +v -119.948074 111.869217 -1.227029 +v -119.792702 111.970375 -1.015708 +v -119.784363 112.205727 -0.789988 +v -119.916168 112.246925 -0.854147 +v -119.810181 112.345894 -0.606545 +v -119.993370 112.217445 -1.075817 +v -119.939140 112.402214 -0.675772 +v -119.940781 112.562508 -0.345459 +v -120.015823 112.558044 -0.692129 +v -119.902252 -114.754082 -1.392995 +v -116.286118 -119.274895 -20.014675 +v -118.021980 -117.960091 -20.015705 +v -119.340454 -114.783348 -20.052229 +v -119.274757 -114.534630 -20.181122 +v -119.161011 -113.723274 -20.117863 +v -119.340775 -113.526985 -19.884106 +v -119.338287 -112.604042 -19.494438 +v -119.152519 -112.475212 -19.585819 +v -119.239815 -111.889656 -19.145163 +v -119.394661 -111.493965 -18.532047 +v -119.156212 -111.468712 -18.791908 +v -119.321434 -111.065666 -18.214077 +v -119.432602 -110.601891 -17.191814 +v -119.410721 -110.281731 -16.412001 +v -119.256668 -110.210915 -16.549660 +v -119.715919 -110.121147 -9.112874 +v -119.493843 -110.264641 -15.542349 +v -119.408600 -110.151344 -15.743717 +v -119.278488 -110.070000 -15.690532 +v -114.543411 112.614906 1.349953 +v -114.569489 112.626572 2.196847 +v -113.733543 112.884850 2.196838 +v -113.587433 112.932289 1.244109 +v -112.872269 113.469612 1.065033 +v -112.329155 114.199677 0.821682 +v -112.262863 114.402695 2.196827 +v -120.122360 112.609085 2.196848 +v -118.093246 112.594391 1.356766 +v -119.828186 112.563057 -0.067145 +v -118.076958 -114.826668 -1.373410 +v 117.984924 -114.751640 -1.532428 +v 118.021835 -114.473595 -1.456665 +v -111.256271 117.643867 0.041915 +v -102.529915 117.607796 -0.400170 +v -103.459129 117.631706 0.001673 +v -102.225235 117.660789 -0.480160 +v -102.700783 117.677444 -0.145190 +v -103.480064 117.730530 0.126026 +v -102.186890 117.827904 -0.378828 +v -103.497665 117.837036 0.183593 +v -100.942566 117.572754 -1.483343 +v -100.806305 117.616570 -1.366738 +v -101.309052 117.657494 -1.141263 +v -101.793945 117.616234 -0.944767 +v -101.892303 117.666786 -0.778254 +v -101.453026 117.826424 -0.978206 +v -100.472275 117.660339 -1.365890 +v 100.882896 117.577080 -1.446531 +v 100.498810 117.597534 -1.449834 +v 101.071053 117.676590 -1.224912 +v 100.471420 117.683937 -1.349202 +v 100.547012 117.824173 -1.290285 +v 101.593864 117.805428 -0.892159 +v 101.209450 117.828842 -1.102154 +v 102.499138 117.609131 -0.410048 +v 101.835945 117.594933 -0.977214 +v 102.186714 117.697548 -0.460242 +v 102.625229 117.695549 -0.169644 +v 103.693855 117.700951 0.114221 +v 102.824951 117.820709 0.006576 +v 101.728447 117.682243 -0.897449 +v 103.347092 117.783714 0.135642 +v 101.882988 117.826164 -0.665322 +v 103.286613 117.627090 -0.033287 +v 111.255653 117.641045 0.026235 +v 103.505989 117.879341 0.190411 +v 120.122147 112.609085 2.196848 +v 119.808662 112.570107 0.025552 +v 118.100433 112.559685 -0.076114 +v 118.093033 112.594391 1.356766 +v 113.833527 112.833344 2.196856 +v 112.876434 113.473206 2.196854 +v 112.466660 113.969559 0.898365 +v -114.220016 -118.415413 -1.547977 +v -115.551888 -118.108620 -1.539505 +v -116.838486 -116.964348 -7.303140 +v -117.462646 -116.437065 -1.539392 +v -117.799347 -115.665260 -1.538208 +v 117.314270 -116.331474 -7.303148 +v -118.021492 -110.084679 -9.303223 +v -118.248695 -114.779701 -20.143921 +v -118.341934 -114.082909 -20.156818 +v -118.343941 -113.331734 -19.948383 +v -118.228622 -113.755836 -19.923151 +v -118.491402 -113.690300 -20.118561 +v -118.281517 -112.643852 -19.587807 +v -118.479012 -112.848610 -19.797264 +v -118.212761 -112.312386 -19.234253 +v -118.274643 -111.907295 -19.075558 +v -118.455978 -112.123207 -19.357275 +v -118.390884 -111.464455 -18.778084 +v -118.200592 -111.281166 -18.305042 +v -118.386139 -111.056160 -18.293694 +v -118.267181 -110.736427 -17.689960 +v -118.428482 -110.690086 -17.755833 +v -118.173897 -110.573433 -17.063393 +v -118.338127 -110.325630 -16.908865 +v -118.152855 -110.318230 -16.209049 +v -118.189339 -110.177757 -15.727283 +v -118.410713 -115.219551 -20.302952 +v -118.226944 -115.403053 -20.232327 +v -118.219284 -114.775841 -20.057152 +v -114.604118 -118.850975 -20.296379 +v -114.230171 -118.712608 -20.195004 +v -114.980797 -118.633812 -20.225323 +v -114.237946 -118.650871 -20.060497 +v -114.956863 -118.546791 -20.066837 +v -115.717819 -118.408028 -20.240318 +v -115.509010 -118.375328 -20.088526 +v -116.214821 -118.281883 -20.294716 +v -116.010811 -118.144814 -20.050991 +v -116.361855 -117.990349 -20.172852 +v -116.965950 -117.539345 -20.208710 +v -116.630165 -117.735298 -20.024979 +v -117.168457 -117.223122 -20.032042 +v -117.447517 -116.952980 -20.175629 +v -117.608551 -116.630058 -20.013947 +v -117.832123 -116.307945 -20.169655 +v -117.909012 -116.562126 -20.297523 +v -118.081764 -115.600945 -20.114307 +v -118.009041 -115.791924 -20.013166 +v 114.271744 -118.705406 -20.190266 +v 114.526398 -118.850563 -20.295614 +v 115.021896 -118.660896 -20.255703 +v 114.974297 -118.539452 -20.071819 +v 115.735191 -118.383827 -20.227646 +v 116.189018 -118.264778 -20.286884 +v 116.995476 -117.707527 -20.293533 +v 116.921356 -117.479561 -20.022989 +v 116.834862 -117.645073 -20.182430 +v 117.519600 -116.977455 -20.251139 +v 117.444305 -116.916878 -20.123848 +v 117.935783 -116.140450 -20.192577 +v 118.064545 -116.262779 -20.296566 +v 118.265579 -115.387825 -20.260635 +v 118.433533 -114.635353 -20.284817 +v 118.174767 -115.215004 -20.125328 +v 118.149712 -115.242363 -20.009632 +v 118.228859 -114.644630 -20.073273 +v 118.301346 -114.051491 -20.114054 +v 118.232056 -113.448189 -19.854517 +v 118.443710 -113.676445 -20.109741 +v 118.412544 -112.917137 -19.818989 +v 118.295586 -112.562767 -19.546116 +v 118.216263 -112.365685 -19.277149 +v 118.473877 -111.751152 -19.065567 +v 118.298096 -111.838142 -19.049175 +v 118.195251 -111.426582 -18.428768 +v 118.276863 -111.240913 -18.415600 +v 118.415070 -111.165672 -18.449110 +v 118.379578 -110.677071 -17.717506 +v 118.190681 -110.821678 -17.642542 +v 118.388199 -110.328514 -16.943991 +v 118.333221 -110.165306 -16.307453 +v 118.217369 -110.375160 -16.767643 +v 118.220291 -110.135368 -15.607149 +v 118.006775 -110.143120 -9.303148 +v 118.142166 -110.323936 -15.964083 +v 118.153137 -109.950203 -9.303262 +v 119.986130 111.431015 -1.503579 +v 119.465630 115.315529 -9.028265 +v 119.471832 116.382378 2.196841 +v 118.360519 117.892685 2.196843 +v 116.898895 118.999329 2.196837 +v 114.897308 119.658577 2.196846 +v -114.310127 119.295677 -9.074251 +v -103.318733 119.609589 -0.043122 +v -119.723175 113.894119 -9.058847 +v -119.617691 116.017387 2.196841 +v -118.951599 116.432686 -9.115363 +v -117.866882 117.796654 -9.103250 +v -117.375725 118.697189 2.196835 +v -116.220100 119.283691 2.196840 +v -116.204552 118.856842 -9.108430 +v -114.791077 119.664810 2.196843 +v -118.085884 114.103027 0.853909 +v -112.051407 115.021782 0.546198 +v -117.688515 115.388397 0.423667 +v -111.996468 116.239250 0.213361 +v -116.938034 116.475845 0.201359 +v -115.611305 117.363991 0.196848 +v -111.261223 117.779091 0.175505 +v -118.007248 111.205269 -1.476730 +v -118.181023 111.212807 -1.309203 +v -118.204781 111.546188 -1.238338 +v -118.049149 111.539536 -1.355915 +v -118.016716 111.782684 -1.317988 +v -117.989693 -114.646675 -1.547508 +v -117.790543 111.574188 -7.303152 +v -117.770966 -114.941475 -7.303138 +v 117.790359 111.574188 -7.303152 +v 118.007660 111.359886 -1.467657 +v 118.132286 111.265457 -1.334937 +v 118.254005 111.239197 -1.298580 +v 118.232063 111.581589 -1.221109 +v 118.005493 111.781433 -1.364465 +v 118.103584 111.786919 -1.196506 +v -111.000137 117.364594 -7.303152 +v 114.463310 112.623199 1.347155 +v 113.255150 113.120026 1.181562 +v 111.999832 117.673386 0.196847 +v 116.048340 117.139496 0.195217 +v 112.058876 114.923340 0.576346 +v 117.780670 115.214111 0.480134 +v 111.997513 116.287979 0.213857 +v 117.019211 116.373627 0.214768 +v -114.575195 111.587540 -7.303152 +v -117.460663 -115.993248 -7.303137 +v -115.758873 -117.806511 -7.303141 +v -113.249184 111.944473 -7.303152 +v -114.517075 -118.196587 -7.303135 +v 114.858284 -118.155693 -7.303150 +v 116.282097 -117.474159 -7.303140 +v 117.766136 -114.965294 -7.303137 +v -111.015915 115.157600 -7.303152 +v 112.592667 112.356422 -7.303152 +v -114.694916 -118.398705 -9.303130 +v -115.851013 -117.975945 -9.303134 +v -116.843689 -117.281914 -9.303128 +v -117.710106 -115.971046 -9.303130 +v -117.987144 -114.826180 -9.303135 +v 114.251518 -118.645699 -20.031158 +v 115.756523 -118.271217 -20.049349 +v 116.342628 -117.943626 -20.019886 +v 116.575775 -117.499138 -9.303133 +v 117.525543 -116.771294 -20.015816 +v 117.941772 -115.949471 -20.020895 +v 117.971428 -115.014107 -9.303133 +v 119.724571 113.897469 -9.037800 +v 119.662277 113.886078 -9.194232 +v 119.511459 114.710922 -9.239280 +v 119.644234 114.548500 -9.063739 +v 119.414192 115.280792 -9.192760 +v 119.486115 114.208084 -9.299525 +v 119.197311 115.983597 -9.052945 +v 119.015770 116.188271 -9.214231 +v 118.532333 116.957756 -9.220325 +v 118.856323 116.623253 -9.047137 +v 118.794510 116.322868 -9.302412 +v 118.195679 117.463333 -9.121444 +v 117.678635 117.949295 -9.119531 +v 117.737122 117.715118 -9.270576 +v 116.968620 118.229507 -9.299239 +v 117.066910 118.400398 -9.133297 +v 116.097443 118.764076 -9.259552 +v 115.271828 119.074493 -9.228440 +v 116.195343 118.859680 -9.115139 +v 115.194016 118.961502 -9.302776 +v 115.201538 119.175812 -9.086905 +v 114.349159 119.179108 -9.248654 +v 114.290710 119.295265 -9.081699 +v -114.294373 119.220024 -9.209818 +v -119.466911 114.472115 -9.296109 +v -119.636940 113.925682 -9.223064 +v -119.577560 114.824707 -9.135602 +v -119.210777 115.722191 -9.231278 +v -119.294563 115.760719 -9.090490 +v -118.910774 116.103325 -9.299093 +v -118.567177 116.849304 -9.251998 +v -118.550682 117.050499 -9.098422 +v -117.764481 117.662971 -9.291227 +v -117.008949 118.288445 -9.260771 +v -117.070122 118.399796 -9.128285 +v -116.066216 118.735298 -9.291529 +v -114.900818 119.057205 -9.293808 +v -115.217964 119.163567 -9.123396 +v -119.559166 -109.946861 -9.286360 +v -118.149033 111.504288 -9.303151 +v -118.145325 111.787430 -1.157948 +v -118.146606 113.956833 -9.303151 +v -117.741333 115.440353 -9.303147 +v -114.458145 117.655617 0.196847 +v -114.559723 117.701035 -9.303152 +v -110.930252 117.723083 -9.303152 +v 118.103348 112.366615 -0.619465 +v 114.719315 117.636887 0.196848 +v 118.089966 113.938210 0.908866 +v 114.463875 117.705055 -9.303152 +v -114.583672 111.589951 -9.303151 +v 114.551651 -118.405678 -9.303135 +v -113.507935 111.842911 -9.303152 +v 115.694908 -118.059959 -9.303133 +v 117.487122 -116.446327 -9.303127 +v -112.188461 112.687088 -9.303152 +v -110.965225 117.364594 -9.303050 +v -117.790550 111.550911 -9.303093 +v -118.222229 -109.931847 -9.303203 +v 119.569618 -109.949059 -9.283147 +v 118.148880 111.504288 -9.303151 +v 111.483582 113.605560 -9.303152 +v 118.145561 113.947037 -9.303149 +v 111.027687 114.999153 -9.303152 +v 117.836464 115.200005 -9.303152 +v -116.775146 116.683022 -9.303147 +v 116.974548 116.507736 -9.303149 +v 110.930069 117.723083 -9.303152 +v 110.976608 117.364594 -9.302747 +v -115.703613 117.368263 -9.303152 +v 115.630531 117.410057 -9.303151 +v 110.999832 117.364594 -7.303152 +v 114.575012 111.587540 -9.303151 +v 113.586540 111.821754 -9.303152 +v 114.090614 111.640953 -7.303152 +v 112.513763 112.416969 -9.303152 +v 111.637863 113.373016 -7.303152 +v 111.041344 114.815544 -7.303152 +v 117.790367 111.539261 -9.303115 +v -111.307175 113.989441 -9.303152 +v -112.004547 112.895470 -7.303152 +v -111.013504 115.149124 -9.303152 +v -111.269112 114.081352 -7.303152 +v -19.787857 -128.898560 -0.003129 +v 3.791261 -129.875824 -0.003129 +v 24.018154 -130.925842 -0.003129 +v 37.218113 -129.875824 -0.003129 +v 51.827042 -130.344208 -0.003129 +v -52.515575 -129.622467 -0.003129 +v -46.827885 -128.586487 -0.003129 +v -0.865442 -128.717773 -0.003129 +v -1.687130 -128.287933 -0.003129 +v 1.172104 -128.586487 -0.003129 +v 2.048102 -128.011169 -0.003129 +v 47.134560 -128.717773 -0.003129 +v 46.008858 -128.065826 -0.003129 +v -50.091888 -127.982689 -0.003129 +v -50.710430 -126.978249 -0.003129 +v 50.693977 -127.037041 -0.003129 +v 52.580395 -129.496490 -0.003129 +v -45.077415 -125.886391 -0.003130 +v 45.305794 -124.814720 -0.003130 +v 2.563610 -124.499855 -0.003130 +v 50.563610 -124.499855 -0.003130 +v 45.867809 -123.939171 -0.003130 +v 0.495702 -123.054695 -0.003119 +v -19.825306 -117.420433 -0.003128 +v 56.905453 -119.375435 -0.003130 +v -57.001270 -119.208733 -0.003130 +v -58.083355 -118.235634 -0.003130 +v -59.166183 -117.938484 -0.003096 +v 58.770206 -117.975914 -0.003121 +v -113.385384 -117.880409 -0.003130 +v -115.146996 -117.195107 -0.003130 +v 117.065689 -114.993492 -0.003130 +v 117.465057 -113.645073 -0.003130 +v -117.448318 -113.873650 -0.003130 +v 15.711704 -114.453835 -0.003130 +v -117.465271 112.793373 -0.003146 +v 116.702469 114.825691 -0.003147 +v 115.335022 116.237984 -0.003147 +v -115.054428 116.386589 -0.003147 +v 113.426025 117.018105 -0.003147 +v -47.701908 -128.824799 -0.003129 +v -48.865448 -128.717773 -0.003129 +v -46.888092 -128.612213 -0.803129 +v -45.951878 -128.011139 -0.003129 +v -45.335190 -127.105263 -0.803129 +v -45.306046 -127.037086 -0.003129 +v -50.922802 -125.965294 -0.003130 +v -45.077415 -125.965340 -0.803129 +v -50.694225 -124.814751 -0.003130 +v -45.436405 -124.499840 -0.003130 +v -50.563824 -124.499855 -0.803129 +v -50.132195 -123.939171 -0.003130 +v -45.868023 -123.939171 -0.803129 +v -49.407265 -123.381599 -0.003130 +v -46.422649 -123.465111 -0.003130 +v -46.815056 -123.253899 -0.803129 +v -47.504299 -123.054695 -0.003119 +v -48.532536 -123.058678 -0.003117 +v 0.298098 -128.824799 -0.003129 +v -2.425719 -127.575844 -0.003129 +v -2.694181 -127.037056 -0.803129 +v 2.693967 -127.037056 -0.003129 +v -2.928645 -126.098259 -0.003130 +v 2.928431 -126.098259 -0.803129 +v 2.922588 -125.886406 -0.003130 +v -2.694218 -124.814735 -0.003130 +v 2.694004 -124.814735 -0.803129 +v -2.132176 -123.939156 -0.003130 +v -1.407283 -123.381615 -0.003130 +v 1.407069 -123.381615 -0.803129 +v 1.577361 -123.465111 -0.003130 +v -0.532529 -123.058678 -0.003118 +v -0.447260 -123.043343 -0.803127 +v 48.298092 -128.824799 -0.003129 +v 46.827671 -128.586487 -0.803129 +v 49.172123 -128.586487 -0.003129 +v 45.951664 -128.011139 -0.803129 +v 50.048126 -128.011139 -0.003129 +v 45.334976 -127.105263 -0.003129 +v 45.305832 -127.037086 -0.803129 +v 50.710217 -126.978249 -0.803129 +v 45.077202 -125.965340 -0.003130 +v 45.077202 -125.886391 -0.803129 +v 50.922588 -125.965294 -0.803129 +v 50.922588 -125.886421 -0.003130 +v 45.436192 -124.499840 -0.803129 +v 50.210964 -124.037865 -0.803129 +v 49.526669 -123.443565 -0.803129 +v 46.592731 -123.381599 -0.003130 +v 46.422436 -123.465111 -0.803129 +v 49.577354 -123.465111 -0.003130 +v 48.495705 -123.054695 -0.003119 +v 47.467472 -123.058678 -0.003118 +v 50.543003 -130.901367 -0.803129 +v 50.624214 -130.885345 -0.003129 +v 51.645302 -130.459686 -0.803129 +v 52.515362 -129.622467 -0.803129 +v 57.573318 -118.597160 -0.003130 +v 113.488632 -117.862587 -0.003130 +v 113.385170 -117.880409 -0.803130 +v 115.054192 -117.238304 -0.003130 +v 115.146767 -117.195122 -0.803130 +v 116.245628 -116.272743 -0.003130 +v 116.588020 -115.869102 -0.803130 +v 117.461884 112.972755 -0.003146 +v 116.769157 114.721024 -0.803147 +v -117.448318 113.021957 -0.803147 +v -117.065941 114.141716 -0.003147 +v -116.245857 115.421028 -0.003147 +v -115.146980 116.343414 -0.803147 +v -113.398720 117.036133 -0.003114 +v -113.385368 117.028725 -0.803148 +v -113.488846 -117.862587 -0.803130 +v -116.588234 -115.869102 -0.003130 +v -58.770420 -117.975914 -0.803130 +v -56.905666 -119.375435 -0.803130 +v -57.573532 -118.597160 -0.803130 +v -50.521194 -130.907288 -0.003129 +v -50.558754 -130.904358 -0.803129 +v -51.645515 -130.459686 -0.003129 +v -0.940402 -128.693420 -0.803129 +v -2.048316 -128.011169 -0.803129 +v 50.091675 -127.982689 -0.803129 +v 48.865234 -128.717773 -0.803129 +v 47.701694 -128.824799 -0.803129 +v -48.940411 -128.693420 -0.803129 +v -51.827255 -130.344208 -0.803129 +v -50.048340 -128.011139 -0.803129 +v -52.580608 -129.496490 -0.803129 +v -50.694191 -127.037041 -0.803129 +v -1.577575 -123.465111 -0.803129 +v -2.563823 -124.499855 -0.803129 +v -2.922801 -125.886406 -0.803129 +v -47.775795 -128.831451 -0.803129 +v 0.224211 -128.831451 -0.803129 +v 57.970268 -118.329140 -0.803130 +v 1.350205 -128.518188 -0.803129 +v -46.009071 -128.065826 -0.803129 +v 2.425506 -127.575844 -0.803129 +v -50.922802 -125.886421 -0.803129 +v 57.069794 -119.094872 -0.803130 +v -45.306007 -124.814720 -0.803129 +v 50.694012 -124.814751 -0.803129 +v 2.131962 -123.939156 -0.803129 +v -49.577568 -123.465111 -0.803129 +v 47.384830 -123.084160 -0.803130 +v 0.574773 -123.069633 -0.803130 +v -48.227192 -123.003090 -0.803135 +v 48.417694 -123.031471 -0.803128 +v -116.588211 115.017433 -0.803147 +v -117.444061 -113.851982 -0.803130 +v 58.914619 -117.961693 -0.803130 +v -115.443382 -117.013954 -0.803130 +v -116.769394 -115.572701 -0.803130 +v 117.448105 -113.873634 -0.803130 +v 117.454475 112.959404 -0.803147 +v 113.447708 117.022362 -0.803148 +v 115.443161 116.162262 -0.803147 +v -62.599171 -132.473022 -5.251470 +v -61.084202 -134.336731 -5.250704 +v -61.927765 -133.794037 -5.234065 +v -61.413071 -134.433472 -5.130083 +v -62.810913 -132.268616 -5.188111 +v -62.512043 -133.304321 -5.126971 +v -62.989403 -132.001984 -5.045174 +v -62.259815 -133.757385 -5.076136 +v -60.728928 -134.793945 -5.079785 +v -62.990475 -132.486694 -4.886776 +v -62.778763 -132.972198 -4.999070 +v -61.837406 -134.318054 -4.906031 +v -61.408154 -134.580536 -4.947596 +v -62.563820 -133.510559 -4.820692 +v -63.075256 -131.933716 -4.812207 +v -61.153618 -134.754578 -4.816858 +v -62.826405 -133.007965 -4.781913 +v -60.497292 -134.973419 -4.813125 +v -62.212803 -133.969818 -4.837237 +v 61.415157 -134.195282 -5.245730 +v 62.624371 -132.258148 -5.251293 +v 60.288685 -134.614532 -5.249719 +v 62.208233 -133.283417 -5.251501 +v 62.614449 -132.991364 -5.163921 +v 60.659607 -134.705414 -5.176629 +v 61.223797 -134.551392 -5.109446 +v 62.247849 -133.613892 -5.169331 +v 62.920506 -132.185699 -5.109763 +v 59.873363 -134.850006 -5.165756 +v 60.723160 -134.835541 -5.028454 +v 61.807644 -134.237518 -5.048467 +v 62.826767 -132.993286 -4.891047 +v 60.053406 -134.988342 -4.999704 +v 62.561386 -133.507294 -4.890453 +v 62.998104 -132.468567 -4.833063 +v 62.198444 -133.977264 -4.905097 +v 63.034019 -131.925964 -4.963964 +v 60.079563 -135.046509 -4.816742 +v 61.241802 -134.702667 -4.881860 +v 60.743134 -134.907166 -4.771103 +v 61.768909 -134.375732 -4.839029 +v 62.789181 -132.189545 -5.201136 +v 62.370220 -125.859978 -5.251946 +v 62.670925 -126.289726 -5.247623 +v 61.945690 -125.575813 -5.244761 +v 62.866707 -126.347862 -5.161260 +v 62.220135 -125.525993 -5.184912 +v 62.585991 -125.752266 -5.161261 +v 62.800095 -125.992180 -5.126022 +v 62.315517 -125.370338 -4.993575 +v 63.000904 -126.354546 -5.021907 +v 62.990021 -126.096260 -4.914006 +v -62.751270 -126.365364 -5.224683 +v -62.529827 -126.016365 -5.251668 +v -62.734982 -125.960701 -5.159594 +v -62.330677 -125.644310 -5.211176 +v -61.945305 -125.508492 -5.224631 +v -62.955479 -126.321007 -5.082900 +v -62.338913 -125.444328 -5.074628 +v -62.796169 -125.831459 -5.027400 +v -62.702877 -125.622704 -4.914423 +v -61.934273 -125.222878 -4.911747 +v -61.934303 -132.024994 -5.253129 +v -61.042862 -133.521423 -5.253125 +v 60.065979 -133.906647 -5.253129 +v 60.744240 -133.695374 -5.253128 +v -60.404114 -134.616089 -5.248155 +v -59.991501 -134.851959 -5.162792 +v -60.069202 -134.996796 -4.988307 +v -59.920784 -135.053375 -4.802408 +v 63.076515 -131.911987 -4.786819 +v 60.782104 -132.160370 -0.003115 +v 60.152294 -132.766449 -0.003119 +v 62.464901 -125.393898 -4.788422 +v 62.780857 -125.684776 -4.863102 +v 63.076771 -126.403130 -4.801388 +v -56.921116 -121.250648 -0.003126 +v 56.358704 -121.103615 -0.003130 +v 56.511997 -121.111382 -0.003134 +v 56.891109 -121.232780 -0.003126 +v 57.230110 -121.522545 -0.003125 +v 57.452896 -121.951912 -0.003107 +v -60.856499 -125.403572 -0.003130 +v -60.479137 -132.541504 -0.003128 +v -60.801395 -132.081604 -0.003122 +v -60.906845 -131.933136 -3.503132 +v -60.034172 -132.792969 -0.003126 +v -60.080845 -132.863159 -3.503125 +v 60.905151 -131.947632 -3.503133 +v 61.873306 -132.016693 -3.503129 +v 61.939976 -125.324593 -5.078502 +v 61.884880 -125.256828 -3.503125 +v 60.244820 -133.827454 -3.503121 +v 61.558098 -133.029541 -5.253113 +v 61.928558 -132.066925 -5.253129 +v -60.166397 -133.899200 -5.253126 +v -61.680592 -132.806885 -5.253125 +v -61.034702 -133.443542 -3.503128 +v -60.235451 -133.825195 -3.503124 +v -63.074604 -126.395546 -4.840712 +v -62.986717 -126.026619 -4.830535 +v -62.774971 -125.663261 -4.769271 +v -62.463909 -125.401466 -4.811271 +v 62.800034 -126.383171 1.490644 +v 62.703907 -126.072609 1.547437 +v 62.749302 -126.346748 1.645571 +v 62.298828 -125.628532 1.701200 +v 62.536472 -125.831993 1.639080 +v 62.567268 -125.968376 1.764716 +v 62.618229 -126.246452 1.804716 +v 62.286373 -125.711571 1.904059 +v 62.129612 -125.606773 1.946889 +v 62.136662 -125.773643 2.103454 +v 62.279903 -125.908043 2.043824 +v 62.794617 -131.938873 1.538564 +v 62.689457 -132.023804 1.741504 +v 60.917374 -125.250771 -3.503130 +v 60.856285 -125.403572 -0.003130 +v 61.933613 -125.199455 -4.787926 +v 62.984138 -126.015495 -4.757130 +v 61.945004 -125.501060 1.856440 +v 57.392586 -123.016838 1.685586 +v 57.193584 -122.988884 1.962851 +v 57.511974 -123.939461 2.314674 +v 57.493599 -123.607201 1.945314 +v 57.391308 -123.484612 2.067187 +v 57.259708 -123.758430 2.354782 +v 57.404518 -122.118324 1.297876 +v 57.306881 -122.966576 1.834582 +v 56.966507 -121.816643 1.548190 +v 56.957523 -121.337242 1.073774 +v 57.363857 -121.870293 1.195192 +v 56.477127 -121.158073 1.044793 +v 56.717522 -121.224510 1.107329 +v 57.168652 -121.534660 1.138083 +v 56.953354 -121.410866 1.244386 +v 56.472786 -121.261742 1.257481 +v 56.692745 -121.415352 1.368227 +v 57.250168 -121.753746 1.326669 +v 57.033508 -121.567680 1.369386 +v 57.310726 -122.016304 1.433174 +v 57.156296 -121.910179 1.528691 +v -56.659985 -121.194649 1.047971 +v -57.255051 -121.642708 1.107327 +v -56.413494 -121.159889 1.071838 +v -57.134811 -121.496941 1.137324 +v -56.862743 -121.289070 1.116894 +v -56.507332 -121.250008 1.234624 +v -57.400719 -121.999382 1.222870 +v -56.691826 -121.401741 1.362789 +v -57.229542 -121.722527 1.328488 +v -57.009281 -121.478264 1.286593 +v -57.152767 -121.922935 1.536769 +v -57.319134 -122.001945 1.417100 +v -57.399544 -122.942741 1.602983 +v -57.374317 -123.123329 1.815862 +v -57.299934 -123.022255 1.877604 +v -57.453014 -123.478798 1.942594 +v -57.565842 -123.836189 2.111749 +v -57.057690 -122.923439 2.010927 +v -57.276470 -123.585793 2.252303 +v -57.846867 -124.186501 -0.003137 +v -57.464516 -122.054543 -0.003127 +v -57.306164 -121.618111 -0.003119 +v -56.508854 -121.109398 -0.003127 +v 56.349892 -121.103584 -0.003130 +v -61.868141 -132.057434 -3.503129 +v -60.917587 -125.250771 -3.503130 +v -61.598648 -132.825684 -3.503125 +v -60.668365 -132.474945 -3.503124 +v 61.154076 -133.355255 -3.503125 +v 60.154240 -132.851044 -3.503117 +v 61.664593 -132.692596 -3.503128 +v 60.704475 -132.413055 -3.503128 +v -62.197918 -125.267876 -4.817050 +v -61.884895 -125.255394 -3.503121 +v -62.793270 -126.402412 1.554578 +v -62.693062 -126.054649 1.581854 +v -62.502602 -125.801277 1.678448 +v -62.285252 -125.627647 1.733950 +v -61.960251 -125.497597 1.817321 +v -62.477978 -125.951790 1.870732 +v -62.224606 -125.667854 1.926569 +v -61.956051 -125.570183 2.031533 +v -62.143570 -125.765892 2.094570 +v -61.258629 -134.395935 1.325644 +v -62.798374 -131.928375 1.521958 +v -62.594208 -132.859650 1.495113 +v -61.759399 -134.032104 1.440126 +v -62.129131 -133.645874 1.482792 +v -62.401806 -133.237030 1.521610 +v -62.700214 -132.549988 1.519861 +v -62.735481 -132.067444 1.667900 +v -62.189346 -133.452209 1.662257 +v -62.582253 -132.404694 1.786067 +v -61.474712 -134.129150 1.612606 +v -62.491879 -132.935883 1.677983 +v -61.841415 -133.781830 1.703676 +v -62.645245 -131.868195 1.787625 +v -62.408833 -132.779968 1.826466 +v 59.961536 -134.791626 1.116870 +v -60.000526 -134.782745 1.159636 +v -60.600849 -134.680969 1.202185 +v 60.387451 -134.725067 1.196395 +v 61.665260 -134.115875 1.392851 +v 61.213604 -134.407288 1.393788 +v 62.325844 -133.383606 1.480771 +v 60.853313 -134.575409 1.324696 +v 60.165642 -134.694550 1.325154 +v 62.019306 -133.767242 1.491730 +v 61.677105 -134.037201 1.552083 +v 62.038361 -133.672363 1.620319 +v 60.894684 -134.425354 1.536089 +v 62.562656 -132.892639 1.580469 +v 62.353493 -133.241211 1.634532 +v 62.712376 -132.435364 1.578735 +v 61.780006 -133.767822 1.741356 +v 62.226082 -133.239563 1.783108 +v 61.163151 -125.513268 2.374749 +v 61.327946 -125.610146 2.510981 +v 61.353367 -125.744011 2.631788 +v 61.068619 -125.578758 2.560845 +v 61.399044 -125.933678 2.679237 +v 61.065407 -125.724358 2.706916 +v 61.221794 -125.907356 2.749128 +v 61.008144 -125.899498 2.788625 +v 57.488174 -123.180473 -0.003113 +v 57.732376 -123.983025 -0.003139 +v 58.291897 -124.727455 -0.003138 +v 59.049015 -125.214394 -0.003135 +v 59.788223 -125.395958 -0.003126 +v 57.706276 -124.131767 2.219935 +v 57.950787 -124.501122 2.338021 +v 57.914490 -124.534752 2.487773 +v 57.693027 -124.441154 2.602659 +v 57.515778 -124.420219 2.656693 +v 58.334568 -125.148338 2.700096 +v 57.721241 -124.731911 2.741918 +v -56.918106 -121.638741 1.469390 +v 57.019352 -123.174065 2.126452 +v -59.528442 -125.386757 -0.003153 +v -58.455891 -124.867180 -0.003137 +v -57.502419 -123.306114 -0.003121 +v -57.700428 -124.110313 2.176940 +v -57.861614 -124.392738 2.344745 +v -57.569347 -124.026146 2.336455 +v -57.470795 -124.331123 2.622421 +v -57.464329 -124.115913 2.500546 +v -57.685360 -124.645195 2.718096 +v -61.055187 -125.513741 2.403316 +v -61.292290 -125.578484 2.488572 +v -61.316193 -125.723991 2.637849 +v -61.027122 -125.700935 2.695480 +v -61.111855 -125.905556 2.780598 +v -62.274925 -125.955360 2.055054 +v -62.660831 -126.278358 1.766799 +v -60.482677 -134.619476 1.401205 +v -61.051006 -134.412262 1.502295 +v -62.258228 -133.210266 1.770248 +v 61.414219 -134.140808 1.625886 +v 60.481274 -132.802246 2.697409 +v 62.529896 -132.575073 1.794130 +v 61.338074 -131.423889 2.706214 +v 59.341866 -125.412575 2.339022 +v 58.318672 -124.883781 2.398046 +v 59.836704 -125.504387 2.399870 +v 58.807377 -125.207878 2.403452 +v 58.302227 -124.968651 2.580062 +v 59.216427 -125.430504 2.518768 +v 58.777634 -125.433388 2.715315 +v 59.687065 -125.615959 2.632817 +v 59.777348 -125.755959 2.740818 +v 57.965588 -125.098686 2.791255 +v 58.595875 -125.590904 2.793981 +v -58.810997 -125.209953 2.389272 +v -59.336941 -125.410393 2.374557 +v -58.297619 -124.870171 2.405314 +v -58.371368 -125.031105 2.582873 +v -59.819504 -125.575706 2.567834 +v -58.871983 -125.325310 2.583967 +v -58.278862 -125.059746 2.673058 +v -59.288353 -125.562691 2.679748 +v -58.835030 -125.525261 2.748727 +v -57.914692 -125.049919 2.788228 +v -59.830070 -125.501411 2.377525 +v -61.069519 -125.588356 2.570231 +v -59.843292 -125.739754 2.731394 +v -61.413918 -125.913353 2.668041 +v -60.618896 -132.694733 2.695544 +v -59.090858 -133.223785 2.709266 +v -61.353123 -131.464661 2.694452 +v -60.911930 -132.203125 2.753325 +v -61.067871 -131.358948 2.789929 +v -60.085434 -132.936859 2.734118 +v -60.251774 -132.551514 2.796059 +v -59.288734 -133.380859 2.613290 +v -59.569672 -132.938263 2.786357 +v 59.147224 -133.413300 2.591535 +v 59.013474 -133.174103 2.730366 +v 59.756893 -133.124756 2.701897 +v 60.982693 -132.178040 2.731918 +v 59.679306 -132.834839 2.794274 +v 60.599369 -132.344818 2.791023 +v 61.056393 -131.270050 2.790972 +v -59.207817 -125.861320 2.793934 +v 59.561317 -125.881966 2.792308 +v 1.009265 -125.511131 -5.253131 +v 60.064846 -132.657715 -0.503127 +v 60.698875 -131.945190 -0.503130 +v 60.756817 -131.918671 -3.503130 +v -59.911755 -132.684570 -0.503130 +v -60.690269 -131.999237 -0.503129 +v -60.730717 -132.078217 -3.503122 +v -60.369400 -132.484894 -0.503126 +v 56.647533 -120.970055 -3.535604 +v 60.767353 -125.250771 -3.503131 +v 60.714985 -125.381752 -0.503132 +v -61.373013 -132.894287 -3.503126 +v -60.727161 -133.470673 -3.503126 +v -60.160641 -132.692505 -3.503115 +v -60.036026 -133.696899 -3.503130 +v 60.210030 -133.679718 -3.503123 +v 60.015305 -132.722931 -3.503128 +v 60.531811 -132.400574 -3.503127 +v -60.767567 -125.250771 -3.503131 +v -60.715199 -125.381752 -0.503132 +v -59.454121 -125.341301 -0.503151 +v -57.926945 -124.260109 -0.503134 +v -57.513344 -123.327522 -0.503150 +v -57.246933 -121.507729 -0.503129 +v 57.260761 -121.525917 -0.503130 +v 57.473972 -121.955177 -0.503124 +v 57.503975 -123.167168 -0.503137 +v 60.502861 -132.341034 -0.503130 +v 59.679684 -125.363701 -0.503135 +v 57.475719 -121.514015 -4.641313 +v 57.136456 -121.179283 -4.167931 +v 56.765976 -121.130943 -0.503099 +v 57.699539 -122.447563 -5.196062 +v -57.470043 -121.940819 -0.503123 +v -57.679825 -122.027122 -5.023061 +v -57.556648 -121.649193 -4.769513 +v -57.179962 -121.196938 -4.222813 +v -56.732906 -121.118340 -0.503103 +v -56.598572 -120.966499 -3.480700 +v 57.828594 -124.128883 -0.503142 +v 58.683777 -125.019493 -0.503152 +v 58.740093 -124.806511 -5.253150 +v 59.712776 -125.162056 -5.253135 +v 61.795921 -125.174385 -5.253131 +v 61.734814 -125.250771 -3.503131 +v 61.194118 -133.130707 -3.503115 +v 61.322250 -133.082642 -5.253106 +v 61.701687 -132.176971 -3.503125 +v -61.714481 -132.102081 -3.503127 +v -60.804138 -133.497345 -5.253124 +v -61.796135 -125.174385 -5.253131 +v -61.735027 -125.250771 -3.503131 +v -59.739876 -125.163811 -5.253134 +v -58.453651 -124.837196 -0.503138 +v -58.178078 -124.286705 -5.253152 +v 57.707520 -123.079460 -5.258518 +v -57.699478 -122.533836 -5.220407 +v 57.668495 -121.954689 -4.985293 +v -61.781857 -132.020447 -5.253130 +v -61.509552 -132.813416 -5.253121 +v -60.052338 -133.759033 -5.253130 +v -58.980675 -124.929131 -5.253136 +v -57.740059 -123.317055 -5.254315 +v 57.977913 -123.968819 -5.253142 +v 61.774746 -132.113647 -5.253125 +v 60.301826 -133.723877 -5.253124 +v 115.093307 117.036186 -0.803149 +v -115.031479 117.046875 -0.803149 +v 116.913719 115.878944 -0.803149 +v -117.021667 115.725090 -0.803149 +v 117.458076 114.730423 -0.803149 +v -115.093613 -117.887871 -0.803131 +v 114.908409 -117.909554 -0.803131 +v 115.976784 -117.562920 -0.803131 +v -117.483826 -115.334312 -0.803133 +v 117.461929 -115.519279 -0.803132 +v -116.265976 -117.378792 -0.803131 +v 116.952866 -116.691689 -0.803132 +v -117.137154 -116.402763 -0.803132 +v 116.150826 116.595711 -0.803149 +v -116.201126 116.572510 -0.803149 +v -117.462143 114.667557 -0.803149 +v 115.156166 117.032333 -2.303150 +v 117.021461 115.725075 -2.303149 +v -115.093521 117.036186 -2.303149 +v 117.461929 114.667564 -2.303149 +v -115.156464 -117.884010 -2.303131 +v 114.965919 -117.901970 -2.303131 +v 116.045540 -117.523216 -2.303131 +v 117.458076 -115.582100 -2.303132 +v -117.462143 -115.519264 -2.303132 +v 116.913742 -116.730614 -2.303132 +v -117.021667 -116.576790 -2.303132 +v -116.304993 -117.339592 -2.303131 +v 116.304688 116.487968 -2.303149 +v -116.151039 116.595711 -2.303149 +v -116.913933 115.878944 -2.303149 +v -117.458290 114.730431 -2.303149 +vt 0.647387 0.000318 +vt 0.647387 0.000318 +vt 0.647387 0.000318 +vt 0.647387 0.000318 +vt 0.647387 0.000318 +vt 0.647387 0.000318 +vt 0.415797 0.008175 +vt 0.276695 0.005359 +vt 0.285054 0.000259 +vt 0.602205 0.000000 +vt 0.516133 0.004234 +vt 0.566859 0.066420 +vt 0.715385 0.000329 +vt 0.720418 0.002497 +vt 0.658375 0.004234 +vt 0.280302 0.001981 +vt 0.297002 0.008587 +vt 0.292118 0.009079 +vt 0.287043 0.012060 +vt 0.709218 0.009491 +vt 0.705512 0.008587 +vt 0.712833 0.011885 +vt 0.723667 0.005809 +vt 0.300707 0.009491 +vt 0.307096 0.015725 +vt 0.304323 0.011885 +vt 0.307983 0.020321 +vt 0.415637 0.054457 +vt 0.501257 0.008587 +vt 0.496373 0.009079 +vt 0.492835 0.010655 +vt 0.489921 0.013657 +vt 0.487827 0.019476 +vt 0.504963 0.009491 +vt 0.508578 0.011885 +vt 0.512238 0.020321 +vt 0.511352 0.015725 +vt 0.700629 0.009079 +vt 0.695919 0.011667 +vt 0.693027 0.015452 +vt 0.692012 0.020006 +vt 0.715607 0.015725 +vt 0.284270 0.015940 +vt 0.283501 0.020007 +vt 0.257290 0.047150 +vt 0.742240 0.046524 +vt 0.716493 0.020321 +vt 0.284393 0.024597 +vt 0.306405 0.025780 +vt 0.488648 0.024597 +vt 0.510660 0.025780 +vt 0.692904 0.024597 +vt 0.714915 0.025780 +vt 0.286761 0.028093 +vt 0.491016 0.028093 +vt 0.695271 0.028093 +vt 0.302347 0.029927 +vt 0.506602 0.029927 +vt 0.710858 0.029927 +vt 0.289787 0.030369 +vt 0.494042 0.030369 +vt 0.698298 0.030369 +vt 0.293503 0.031599 +vt 0.297834 0.031629 +vt 0.497759 0.031599 +vt 0.502089 0.031629 +vt 0.702014 0.031599 +vt 0.706345 0.031629 +vt 0.745073 0.049619 +vt 0.252692 0.050921 +vt 0.750156 0.051949 +vt 0.248224 0.052326 +vt 0.010119 0.055526 +vt 0.017556 0.052860 +vt 0.989540 0.055275 +vt 0.982878 0.052941 +vt 0.994515 0.059212 +vt 0.004135 0.060890 +vt 0.998059 0.064283 +vt 0.000526 0.068811 +vt 0.999708 0.069700 +vt 0.999505 0.983407 +vt 0.000292 0.982720 +vt 0.017511 0.999531 +vt 0.001941 0.988136 +vt 0.996440 0.990831 +vt 0.005485 0.993208 +vt 0.990601 0.996377 +vt 0.010459 0.997145 +vt 0.982620 0.999538 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647395 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647400 0.000319 +vt 0.647401 0.000319 +vt 0.647400 0.000319 +vt 0.647401 0.000319 +vt 0.647400 0.000319 +vt 0.647401 0.000319 +vt 0.647400 0.000319 +vt 0.647401 0.000319 +vt 0.647400 0.000319 +vt 0.647400 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647400 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647401 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647406 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647407 0.000319 +vt 0.647406 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647407 0.000319 +vt 0.647406 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647407 0.000319 +vt 0.647406 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647407 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647407 0.000319 +vt 0.647406 0.000319 +vt 0.647406 0.000319 +vt 0.647406 0.000319 +vt 0.647407 0.000319 +vt 0.647407 0.000319 +vt 0.647407 0.000318 +vt 0.647407 0.000318 +vt 0.647407 0.000318 +vt 0.647407 0.000318 +vt 0.647407 0.000318 +vt 0.647407 0.000318 +vt 0.647408 0.000320 +vt 0.647408 0.000320 +vt 0.647408 0.000320 +vt 0.647408 0.000320 +vt 0.647408 0.000320 +vt 0.647408 0.000320 +vt 0.647414 0.000320 +vt 0.647414 0.000320 +vt 0.647415 0.000320 +vt 0.647415 0.000320 +vt 0.647415 0.000320 +vt 0.647415 0.000320 +vt 0.647415 0.000320 +vt 0.647415 0.000320 +vt 0.647415 0.000320 +vt 0.647415 0.000346 +vt 0.647415 0.000346 +vt 0.647415 0.000346 +vt 0.647415 0.000346 +vt 0.647415 0.000346 +vt 0.647415 0.000346 +vt 0.647414 0.000346 +vt 0.647414 0.000346 +vt 0.647387 0.000346 +vt 0.647387 0.000346 +vt 0.647387 0.000346 +vt 0.647387 0.000346 +vt 0.647387 0.000346 +vt 0.647387 0.000346 +vt 0.647387 0.000346 +vt 0.647387 0.000346 +vt 0.647387 0.000346 +vt 0.647387 0.000320 +vt 0.647387 0.000320 +vt 0.647387 0.000320 +vt 0.647387 0.000320 +vt 0.647387 0.000320 +vt 0.647387 0.000320 +vt 0.647387 0.000320 +vt 0.647387 0.000320 +vt 0.647394 0.000320 +vt 0.647394 0.000320 +vt 0.647394 0.000320 +vt 0.647394 0.000320 +vt 0.647394 0.000320 +vt 0.647394 0.000320 +vt 0.647395 0.000318 +vt 0.647394 0.000318 +vt 0.647395 0.000318 +vt 0.647395 0.000318 +vt 0.647395 0.000318 +vt 0.647395 0.000318 +vt 0.647404 0.000318 +vt 0.647387 0.000318 +s 0 +f 1/1 541/1 149/2 +f 412/1 541/1 1/1 +f 9/1 48/1 47/1 +f 6/1 9/1 47/1 +f 8/3 50/1 48/1 +f 9/1 8/3 48/1 +f 2/1 26/1 69/1 +f 71/1 2/1 69/1 +f 3/1 2/1 71/1 +f 72/1 3/1 71/1 +f 152/1 447/1 150/1 +f 448/1 447/1 152/1 +f 154/1 448/1 152/1 +f 154/1 4/1 448/1 +f 4/1 5/1 450/4 +f 154/1 5/1 4/1 +f 155/1 5/1 154/1 +f 528/1 5/1 155/1 +f 158/1 528/1 155/1 +f 159/1 528/1 158/1 +f 161/1 528/1 159/1 +f 322/1 528/1 161/1 +f 321/5 322/1 161/1 +f 7/1 9/1 6/1 +f 7/1 8/3 9/1 +f 165/1 10/1 7/1 +f 10/1 8/3 7/1 +f 165/1 13/1 10/1 +f 10/1 13/1 8/3 +f 11/1 12/1 165/1 +f 12/1 13/1 165/1 +f 14/1 12/1 11/1 +f 16/1 13/1 12/1 +f 16/1 12/1 14/1 +f 18/1 13/1 16/1 +f 15/1 16/1 14/1 +f 17/1 16/1 15/1 +f 17/1 18/1 16/1 +f 19/1 20/1 17/1 +f 20/1 18/1 17/1 +f 21/1 22/1 19/1 +f 22/1 20/1 19/1 +f 25/1 22/1 21/1 +f 166/1 25/1 21/1 +f 25/1 20/1 22/1 +f 23/1 24/1 166/1 +f 24/1 25/1 166/1 +f 27/1 26/1 2/1 +f 27/1 28/1 26/1 +f 27/1 29/1 28/1 +f 3/1 27/1 2/1 +f 3/1 29/1 27/1 +f 3/1 31/1 29/1 +f 29/1 30/1 28/1 +f 31/1 30/1 29/1 +f 142/1 31/1 3/1 +f 33/1 32/1 30/1 +f 31/1 33/1 30/1 +f 142/1 33/1 31/1 +f 36/1 35/1 32/1 +f 33/1 36/1 32/1 +f 34/1 36/1 33/1 +f 142/1 34/1 33/1 +f 144/1 34/1 142/1 +f 36/1 39/1 35/1 +f 37/1 39/1 36/1 +f 34/1 37/1 36/1 +f 144/1 37/1 34/1 +f 38/1 39/1 37/1 +f 144/1 38/1 37/1 +f 38/1 40/1 39/1 +f 144/1 41/1 38/1 +f 43/1 41/1 144/1 +f 41/1 40/1 38/1 +f 41/1 42/1 40/1 +f 43/1 42/1 41/1 +f 43/1 167/1 42/1 +f 169/1 167/1 43/1 +f 168/1 169/1 43/1 +f 437/1 240/1 237/1 +f 438/1 240/1 437/1 +f 438/1 242/1 240/1 +f 522/1 242/1 438/1 +f 44/1 242/1 522/1 +f 44/1 245/1 242/1 +f 44/1 246/1 245/1 +f 44/1 248/1 246/1 +f 46/1 248/1 44/1 +f 46/1 45/1 248/1 +f 46/1 282/1 45/1 +f 69/1 6/1 47/1 +f 69/1 26/1 6/1 +f 48/1 49/1 47/1 +f 51/1 52/1 49/1 +f 51/1 49/1 48/1 +f 50/1 51/1 48/1 +f 55/1 52/1 51/1 +f 55/1 51/1 50/1 +f 54/1 53/1 52/1 +f 55/1 54/1 52/1 +f 50/1 90/1 55/1 +f 90/1 54/1 55/1 +f 57/1 56/1 53/1 +f 54/1 57/1 53/1 +f 90/1 57/1 54/1 +f 57/1 58/1 56/1 +f 57/1 59/1 58/1 +f 90/1 59/1 57/1 +f 91/1 59/1 90/1 +f 59/1 60/1 58/1 +f 62/1 61/1 60/1 +f 59/1 62/1 60/1 +f 65/1 62/1 59/1 +f 91/1 65/1 59/1 +f 62/1 63/1 61/1 +f 64/1 66/1 63/1 +f 62/1 64/1 63/1 +f 65/1 64/1 62/1 +f 68/1 64/1 65/1 +f 64/1 67/1 66/1 +f 253/1 67/1 64/1 +f 68/1 253/1 64/1 +f 73/1 70/1 69/1 +f 70/1 71/1 69/1 +f 73/1 74/1 70/1 +f 70/1 72/1 71/1 +f 74/1 72/1 70/1 +f 74/1 76/1 72/1 +f 254/1 74/1 73/1 +f 75/1 74/1 254/1 +f 75/1 78/1 74/1 +f 78/1 76/1 74/1 +f 77/1 75/1 254/1 +f 77/1 79/1 75/1 +f 79/1 78/1 75/1 +f 80/1 78/1 79/1 +f 255/1 79/1 77/1 +f 255/1 81/1 79/1 +f 81/1 80/1 79/1 +f 80/1 82/1 78/1 +f 81/1 82/1 80/1 +f 83/1 84/1 255/1 +f 84/1 81/1 255/1 +f 84/1 82/1 81/1 +f 85/1 84/1 83/1 +f 88/1 82/1 84/1 +f 85/1 88/1 84/1 +f 86/1 85/1 83/1 +f 87/1 85/1 86/1 +f 87/1 88/1 85/1 +f 256/1 87/1 86/1 +f 256/1 89/1 87/1 +f 89/1 88/1 87/1 +f 89/1 136/1 88/1 +f 257/1 89/1 256/1 +f 257/1 136/1 89/1 +f 119/1 102/1 50/1 +f 8/3 119/1 50/1 +f 13/1 119/1 8/3 +f 102/1 90/1 50/1 +f 123/1 119/1 13/1 +f 102/1 107/1 90/1 +f 18/1 123/1 13/1 +f 129/1 123/1 18/1 +f 111/1 91/1 90/1 +f 107/1 111/1 90/1 +f 20/1 129/1 18/1 +f 111/1 65/1 91/1 +f 130/1 129/1 20/1 +f 111/1 113/1 65/1 +f 113/1 68/1 65/1 +f 25/1 130/1 20/1 +f 93/1 130/1 25/1 +f 92/1 68/1 113/1 +f 92/1 237/1 68/1 +f 437/1 237/1 92/1 +f 25/1 447/1 93/1 +f 150/1 447/1 25/1 +f 435/1 214/1 212/1 +f 217/1 435/1 293/1 +f 217/1 214/1 435/1 +f 223/1 292/1 98/1 +f 223/1 225/1 292/1 +f 225/1 94/1 292/1 +f 225/1 216/1 94/1 +f 216/1 95/1 94/1 +f 216/1 218/1 95/1 +f 218/1 293/1 95/1 +f 218/1 217/1 293/1 +f 233/1 224/1 96/1 +f 224/1 97/1 96/1 +f 224/1 222/1 97/1 +f 222/1 299/1 97/1 +f 222/1 223/1 299/1 +f 223/1 98/1 299/1 +f 305/1 185/1 96/1 +f 185/1 233/1 96/1 +f 186/1 185/1 305/1 +f 307/1 186/1 305/1 +f 187/1 186/1 307/1 +f 306/1 189/1 307/1 +f 189/1 187/1 307/1 +f 316/1 189/1 306/1 +f 197/1 189/1 316/1 +f 99/1 197/1 316/1 +f 198/1 197/1 99/1 +f 313/1 198/1 99/1 +f 196/1 198/1 313/1 +f 319/1 196/1 313/1 +f 202/1 196/1 319/1 +f 205/1 100/1 454/1 +f 100/1 205/1 319/1 +f 205/1 202/1 319/1 +f 103/1 102/1 101/1 +f 105/1 103/1 101/1 +f 327/1 105/1 101/1 +f 103/1 107/1 102/1 +f 105/1 104/1 103/1 +f 328/1 104/1 105/1 +f 104/1 107/1 103/1 +f 108/1 107/1 104/1 +f 328/1 108/1 104/1 +f 106/1 108/1 328/1 +f 109/1 107/1 108/1 +f 106/1 109/1 108/1 +f 109/1 111/1 107/1 +f 110/1 109/1 106/1 +f 109/1 112/1 111/1 +f 110/1 112/1 109/1 +f 330/1 112/1 110/1 +f 112/1 113/1 111/1 +f 114/1 113/1 112/1 +f 330/1 114/1 112/1 +f 331/1 114/1 330/1 +f 114/1 92/1 113/1 +f 115/1 92/1 114/1 +f 331/1 115/1 114/1 +f 115/1 283/1 92/1 +f 441/1 283/1 115/1 +f 119/1 101/1 102/1 +f 116/1 101/1 119/1 +f 117/1 101/1 116/1 +f 117/1 327/1 101/1 +f 118/1 327/1 117/1 +f 119/1 121/1 116/1 +f 121/1 120/1 116/1 +f 120/1 117/1 116/1 +f 120/1 118/1 117/1 +f 123/1 121/1 119/1 +f 121/1 122/1 120/1 +f 123/1 124/1 121/1 +f 124/1 122/1 121/1 +f 129/1 126/1 123/1 +f 126/1 124/1 123/1 +f 126/1 125/1 124/1 +f 127/1 126/1 129/1 +f 128/1 125/1 126/1 +f 127/1 128/1 126/1 +f 130/1 127/1 129/1 +f 130/1 131/1 127/1 +f 131/1 128/1 127/1 +f 133/1 132/1 130/1 +f 132/1 131/1 130/1 +f 133/1 134/1 132/1 +f 93/1 133/1 130/1 +f 284/1 134/1 133/1 +f 93/1 284/1 133/1 +f 285/1 284/1 93/1 +f 540/1 141/1 272/1 +f 520/1 540/1 272/1 +f 136/1 135/1 353/6 +f 136/1 338/1 135/1 +f 258/1 338/1 136/1 +f 258/1 340/1 338/1 +f 137/1 340/1 258/1 +f 261/1 340/1 137/1 +f 261/1 343/1 340/1 +f 262/1 343/1 261/1 +f 264/1 344/1 262/1 +f 344/1 343/1 262/1 +f 346/1 344/1 264/1 +f 138/1 346/1 264/1 +f 138/1 348/1 346/1 +f 139/1 348/1 138/1 +f 350/1 348/1 139/1 +f 268/1 350/1 139/1 +f 140/1 350/1 268/1 +f 141/1 140/1 268/1 +f 272/1 141/1 268/1 +f 356/1 3/1 72/1 +f 356/1 376/1 3/1 +f 76/1 356/1 72/1 +f 363/1 356/1 76/1 +f 376/1 142/1 3/1 +f 78/1 363/1 76/1 +f 376/1 380/1 142/1 +f 143/1 363/1 78/1 +f 82/1 143/1 78/1 +f 380/1 381/1 142/1 +f 381/1 144/1 142/1 +f 372/1 143/1 82/1 +f 387/1 144/1 381/1 +f 88/1 372/1 82/1 +f 353/6 372/1 88/1 +f 387/1 43/1 144/1 +f 136/1 353/6 88/1 +f 389/1 43/1 387/1 +f 389/1 168/1 43/1 +f 170/1 168/1 389/1 +f 395/1 170/1 389/1 +f 395/1 145/1 170/1 +f 396/1 145/1 395/1 +f 396/1 172/1 145/1 +f 146/1 172/1 396/1 +f 146/1 147/1 172/1 +f 399/1 147/1 146/1 +f 399/1 175/1 147/1 +f 403/1 175/1 399/1 +f 179/1 175/1 403/1 +f 404/1 179/1 403/1 +f 148/1 179/1 404/1 +f 406/1 148/1 404/1 +f 182/1 148/1 406/1 +f 407/1 182/1 406/1 +f 149/2 182/1 407/1 +f 1/1 149/2 407/1 +f 151/1 152/1 150/1 +f 413/1 153/1 151/1 +f 151/1 153/1 152/1 +f 153/1 154/1 152/1 +f 413/1 160/1 153/1 +f 153/1 157/1 154/1 +f 160/1 156/1 153/1 +f 156/1 157/1 153/1 +f 157/1 155/1 154/1 +f 158/1 155/1 157/1 +f 157/1 163/1 158/1 +f 160/1 162/1 156/1 +f 156/1 163/1 157/1 +f 162/1 163/1 156/1 +f 158/1 164/1 159/1 +f 164/1 161/1 159/1 +f 163/1 164/1 158/1 +f 162/1 164/1 163/1 +f 164/1 321/5 161/1 +f 413/1 24/1 23/1 +f 413/1 151/1 24/1 +f 151/1 150/1 24/1 +f 150/1 25/1 24/1 +f 26/1 7/1 6/1 +f 28/1 165/1 7/1 +f 26/1 28/1 7/1 +f 28/1 11/1 165/1 +f 30/1 14/1 11/1 +f 28/1 30/1 11/1 +f 32/1 15/1 14/1 +f 30/1 32/1 14/1 +f 35/1 17/1 15/1 +f 32/1 35/1 15/1 +f 35/1 19/1 17/1 +f 35/1 39/1 19/1 +f 39/1 21/1 19/1 +f 40/1 21/1 39/1 +f 40/1 166/1 21/1 +f 42/1 166/1 40/1 +f 42/1 23/1 166/1 +f 167/1 23/1 42/1 +f 170/1 169/1 168/1 +f 169/1 171/1 167/1 +f 170/1 171/1 169/1 +f 171/1 173/1 167/1 +f 145/1 171/1 170/1 +f 145/1 172/1 171/1 +f 172/1 173/1 171/1 +f 147/1 173/1 172/1 +f 147/1 174/1 173/1 +f 147/1 177/1 174/1 +f 175/1 177/1 147/1 +f 177/1 176/1 174/1 +f 179/1 177/1 175/1 +f 177/1 178/1 176/1 +f 179/1 178/1 177/1 +f 179/1 148/1 178/1 +f 180/1 176/1 178/1 +f 148/1 180/1 178/1 +f 180/1 181/1 176/1 +f 148/1 182/1 180/1 +f 183/1 181/1 180/1 +f 182/1 183/1 180/1 +f 149/2 183/1 182/1 +f 183/1 184/1 181/1 +f 541/1 184/1 183/1 +f 149/2 541/1 183/1 +f 186/1 188/1 185/1 +f 187/1 188/1 186/1 +f 188/1 191/1 185/1 +f 189/1 190/1 187/1 +f 200/1 189/1 197/1 +f 187/1 190/1 188/1 +f 200/1 193/1 189/1 +f 193/1 190/1 189/1 +f 188/1 192/1 191/1 +f 195/1 192/1 188/1 +f 190/1 195/1 188/1 +f 192/1 194/2 191/1 +f 193/1 195/1 190/1 +f 200/1 195/1 193/1 +f 195/1 194/2 192/1 +f 198/1 200/1 197/1 +f 196/1 201/1 198/1 +f 199/1 201/1 196/1 +f 202/1 199/1 196/1 +f 203/1 199/1 202/1 +f 198/1 201/1 200/1 +f 200/1 201/1 195/1 +f 203/1 201/1 199/1 +f 204/1 202/1 205/1 +f 204/1 203/1 202/1 +f 206/1 205/1 210/1 +f 205/1 458/1 210/1 +f 205/1 454/1 458/1 +f 206/1 204/1 205/1 +f 320/1 208/1 207/1 +f 208/1 325/1 207/1 +f 325/1 324/1 207/1 +f 208/1 415/1 325/1 +f 415/1 209/1 325/1 +f 415/1 210/1 209/1 +f 418/1 206/1 210/1 +f 415/1 416/1 210/1 +f 417/1 418/1 210/1 +f 416/1 417/1 210/1 +f 432/1 213/1 211/1 +f 212/1 213/1 432/1 +f 214/1 213/1 212/1 +f 215/1 213/1 214/1 +f 217/1 215/1 214/1 +f 219/1 215/1 217/1 +f 420/1 215/1 219/1 +f 219/1 217/1 218/1 +f 225/1 221/1 216/1 +f 221/1 218/1 216/1 +f 220/1 221/1 225/1 +f 221/1 219/1 218/1 +f 221/1 420/1 219/1 +f 230/1 221/1 220/1 +f 230/1 420/1 221/1 +f 233/1 226/1 224/1 +f 227/1 222/1 224/1 +f 227/1 228/1 222/1 +f 228/1 223/1 222/1 +f 228/1 225/1 223/1 +f 226/1 227/1 224/1 +f 220/1 225/1 228/1 +f 231/1 228/1 227/1 +f 229/1 227/1 226/1 +f 229/1 231/1 227/1 +f 230/1 220/1 228/1 +f 231/1 230/1 228/1 +f 229/1 232/1 231/1 +f 232/1 230/1 231/1 +f 185/1 226/1 233/1 +f 191/1 226/1 185/1 +f 191/1 229/1 226/1 +f 191/1 194/2 229/1 +f 194/2 232/1 229/1 +f 274/1 234/1 280/1 +f 235/1 422/1 274/1 +f 422/1 234/1 274/1 +f 425/1 235/1 274/1 +f 428/1 426/1 274/1 +f 426/1 425/1 274/1 +f 275/1 428/1 274/1 +f 211/1 428/1 275/1 +f 236/1 279/1 275/1 +f 279/1 211/1 275/1 +f 213/1 428/1 211/1 +f 240/1 238/1 237/1 +f 240/1 239/1 238/1 +f 241/1 239/1 240/1 +f 241/1 244/1 239/1 +f 244/1 243/1 239/1 +f 242/1 241/1 240/1 +f 245/1 241/1 242/1 +f 244/1 241/1 245/1 +f 249/1 243/1 244/1 +f 247/1 244/1 245/1 +f 246/1 247/1 245/1 +f 247/1 249/1 244/1 +f 249/1 252/1 243/1 +f 250/1 249/1 247/1 +f 248/1 247/1 246/1 +f 250/1 247/1 248/1 +f 45/1 250/1 248/1 +f 252/1 249/1 250/1 +f 45/1 251/1 250/1 +f 282/1 251/1 45/1 +f 251/1 252/1 250/1 +f 239/1 243/1 67/1 +f 253/1 239/1 67/1 +f 238/1 239/1 253/1 +f 68/1 238/1 253/1 +f 237/1 238/1 68/1 +f 49/1 73/1 47/1 +f 73/1 69/1 47/1 +f 52/1 73/1 49/1 +f 254/1 73/1 52/1 +f 53/1 254/1 52/1 +f 56/1 254/1 53/1 +f 77/1 254/1 56/1 +f 58/1 77/1 56/1 +f 255/1 77/1 58/1 +f 60/1 255/1 58/1 +f 83/1 255/1 60/1 +f 61/1 83/1 60/1 +f 86/1 83/1 61/1 +f 63/1 86/1 61/1 +f 66/1 86/1 63/1 +f 66/1 256/1 86/1 +f 67/1 256/1 66/1 +f 259/1 257/1 256/1 +f 259/1 258/1 257/1 +f 258/1 136/1 257/1 +f 259/1 137/1 258/1 +f 260/1 137/1 259/1 +f 260/1 261/1 137/1 +f 263/1 260/1 259/1 +f 263/1 262/1 260/1 +f 262/1 261/1 260/1 +f 263/1 265/1 262/1 +f 265/1 264/1 262/1 +f 138/1 264/1 265/1 +f 266/1 265/1 263/1 +f 266/1 139/1 265/1 +f 139/1 138/1 265/1 +f 267/1 268/1 266/1 +f 268/1 139/1 266/1 +f 270/1 267/1 266/1 +f 270/1 271/1 267/1 +f 271/1 272/1 267/1 +f 272/1 268/1 267/1 +f 269/1 271/1 270/1 +f 269/1 520/1 271/1 +f 520/1 272/1 271/1 +f 276/1 275/1 273/1 +f 275/1 274/1 273/1 +f 236/1 275/1 276/1 +f 277/1 236/1 276/1 +f 278/1 236/1 277/1 +f 279/1 236/1 278/1 +f 430/1 279/1 278/1 +f 211/1 279/1 430/1 +f 432/1 211/1 430/1 +f 251/1 280/1 252/1 +f 282/1 280/1 251/1 +f 46/1 281/1 282/1 +f 281/1 280/1 282/1 +f 273/1 274/1 281/1 +f 274/1 280/1 281/1 +f 436/1 283/1 441/1 +f 436/1 437/1 283/1 +f 437/1 92/1 283/1 +f 285/1 445/1 284/1 +f 446/1 445/1 285/1 +f 93/1 446/1 285/1 +f 447/1 446/1 93/1 +f 291/1 286/1 288/1 +f 291/1 435/1 286/1 +f 293/1 435/1 291/1 +f 297/1 289/1 287/1 +f 290/1 288/1 287/1 +f 298/1 289/1 297/1 +f 289/1 290/1 287/1 +f 95/1 288/1 290/1 +f 95/1 291/1 288/1 +f 98/1 289/1 298/1 +f 292/1 290/1 289/1 +f 98/1 292/1 289/1 +f 292/1 94/1 290/1 +f 94/1 95/1 290/1 +f 95/1 293/1 291/1 +f 300/1 295/1 294/1 +f 297/1 287/1 294/1 +f 295/1 296/1 294/1 +f 296/1 297/1 294/1 +f 295/1 97/1 296/1 +f 98/1 298/1 297/1 +f 300/1 97/1 295/1 +f 296/1 98/1 297/1 +f 97/1 299/1 296/1 +f 96/1 97/1 300/1 +f 299/1 98/1 296/1 +f 302/1 294/1 301/1 +f 302/1 300/1 294/1 +f 304/1 300/1 302/1 +f 304/1 96/1 300/1 +f 305/1 96/1 304/1 +f 301/1 303/1 302/1 +f 314/1 303/1 301/1 +f 309/1 314/1 301/1 +f 303/1 304/1 302/1 +f 310/1 314/1 309/1 +f 314/1 306/1 303/1 +f 316/1 306/1 314/1 +f 303/1 305/1 304/1 +f 307/1 305/1 303/1 +f 306/1 307/1 303/1 +f 308/1 310/1 309/1 +f 311/1 310/1 308/1 +f 317/1 311/1 308/1 +f 317/1 313/1 311/1 +f 315/1 313/1 317/1 +f 312/1 315/1 317/1 +f 311/1 99/1 310/1 +f 313/1 99/1 311/1 +f 310/1 316/1 314/1 +f 312/1 319/1 315/1 +f 99/1 316/1 310/1 +f 315/1 319/1 313/1 +f 318/1 312/1 317/1 +f 100/1 312/1 318/1 +f 100/1 319/1 312/1 +f 320/1 164/1 162/1 +f 320/1 321/5 164/1 +f 320/1 322/1 321/5 +f 320/1 323/1 322/1 +f 320/1 207/1 452/1 +f 323/1 320/1 452/1 +f 324/1 452/1 207/1 +f 324/1 453/1 452/1 +f 325/1 453/1 324/1 +f 325/1 326/1 453/1 +f 209/1 326/1 325/1 +f 209/1 456/1 326/1 +f 210/1 456/1 209/1 +f 210/1 458/1 456/1 +f 464/1 105/1 327/1 +f 464/1 462/1 105/1 +f 462/1 328/1 105/1 +f 462/1 106/1 328/1 +f 329/1 106/1 462/1 +f 329/1 110/1 106/1 +f 329/1 330/1 110/1 +f 461/1 330/1 329/1 +f 461/1 331/1 330/1 +f 443/1 331/1 461/1 +f 443/1 115/1 331/1 +f 443/1 441/1 115/1 +f 465/1 464/1 118/1 +f 464/1 327/1 118/1 +f 120/1 465/1 118/1 +f 122/1 465/1 120/1 +f 466/1 465/1 122/1 +f 124/1 466/1 122/1 +f 125/1 466/1 124/1 +f 128/1 332/1 125/1 +f 332/1 466/1 125/1 +f 131/1 332/1 128/1 +f 132/1 332/1 131/1 +f 134/1 332/1 132/1 +f 134/1 467/1 332/1 +f 284/1 467/1 134/1 +f 352/1 333/1 351/1 +f 540/1 333/1 352/1 +f 141/1 540/1 352/1 +f 334/1 337/1 355/1 +f 335/1 337/1 334/1 +f 338/1 335/1 135/1 +f 336/1 337/1 335/1 +f 338/1 336/1 335/1 +f 336/1 339/1 337/1 +f 338/1 340/1 336/1 +f 339/1 341/1 337/1 +f 340/1 339/1 336/1 +f 343/1 339/1 340/1 +f 339/1 342/1 341/1 +f 343/1 342/1 339/1 +f 343/1 344/1 342/1 +f 342/1 345/1 341/1 +f 344/1 345/1 342/1 +f 346/1 345/1 344/1 +f 346/1 347/1 345/1 +f 348/1 347/1 346/1 +f 347/1 349/1 345/1 +f 350/1 349/1 347/1 +f 348/1 350/1 347/1 +f 350/1 351/1 349/1 +f 140/1 351/1 350/1 +f 140/1 352/1 351/1 +f 141/1 352/1 140/1 +f 135/1 354/1 353/6 +f 135/1 335/1 354/1 +f 334/1 354/1 335/1 +f 358/1 357/1 356/1 +f 363/1 361/1 356/1 +f 358/1 360/1 357/1 +f 360/1 359/1 357/1 +f 361/1 358/1 356/1 +f 361/1 362/1 358/1 +f 362/1 360/1 358/1 +f 361/1 364/1 362/1 +f 363/1 365/1 361/1 +f 365/1 364/1 361/1 +f 365/1 367/1 364/1 +f 143/1 366/1 363/1 +f 366/1 365/1 363/1 +f 366/1 367/1 365/1 +f 368/1 367/1 366/1 +f 143/1 369/1 366/1 +f 369/1 368/1 366/1 +f 372/1 369/1 143/1 +f 369/1 370/1 368/1 +f 371/1 369/1 372/1 +f 371/1 370/1 369/1 +f 374/1 370/1 371/1 +f 353/6 354/1 372/1 +f 354/1 371/1 372/1 +f 354/1 373/1 371/1 +f 373/1 374/1 371/1 +f 334/1 373/1 354/1 +f 334/1 355/1 373/1 +f 355/1 374/1 373/1 +f 357/1 376/1 356/1 +f 357/1 375/1 376/1 +f 359/1 375/1 357/1 +f 475/1 375/1 359/1 +f 375/1 377/1 376/1 +f 377/1 380/1 376/1 +f 378/1 377/1 375/1 +f 475/1 378/1 375/1 +f 379/1 380/1 377/1 +f 378/1 379/1 377/1 +f 476/2 379/1 378/1 +f 476/2 380/1 379/1 +f 383/1 380/1 476/2 +f 477/1 383/1 476/2 +f 383/1 381/1 380/1 +f 477/1 382/1 383/1 +f 383/1 384/1 381/1 +f 385/1 384/1 383/1 +f 382/1 385/1 383/1 +f 479/1 385/1 382/1 +f 384/1 387/1 381/1 +f 386/1 387/1 384/1 +f 385/1 386/1 384/1 +f 479/1 386/1 385/1 +f 480/2 386/1 479/1 +f 386/1 388/1 387/1 +f 390/1 388/1 386/1 +f 480/2 390/1 386/1 +f 391/1 390/1 480/2 +f 388/1 389/1 387/1 +f 391/1 392/1 390/1 +f 392/1 393/1 390/1 +f 393/1 388/1 390/1 +f 393/1 389/1 388/1 +f 394/1 393/1 392/1 +f 393/1 395/1 389/1 +f 394/1 395/1 393/1 +f 396/1 395/1 394/1 +f 398/1 397/1 394/1 +f 397/1 396/1 394/1 +f 146/1 396/1 397/1 +f 398/1 400/1 397/1 +f 400/1 146/1 397/1 +f 400/1 399/1 146/1 +f 401/1 400/1 398/1 +f 401/1 402/1 400/1 +f 402/1 403/1 400/1 +f 403/1 399/1 400/1 +f 405/1 402/1 401/1 +f 405/1 404/1 402/1 +f 404/1 403/1 402/1 +f 408/1 404/1 405/1 +f 408/1 406/1 404/1 +f 411/1 408/1 405/1 +f 411/1 409/1 408/1 +f 407/1 406/1 408/1 +f 409/1 407/1 408/1 +f 409/1 1/1 407/1 +f 410/1 409/1 411/1 +f 410/1 412/1 409/1 +f 412/1 1/1 409/1 +f 181/1 23/1 167/1 +f 184/1 413/1 23/1 +f 181/1 184/1 23/1 +f 173/1 181/1 167/1 +f 176/1 181/1 173/1 +f 174/1 176/1 173/1 +f 482/1 413/1 184/1 +f 482/1 160/1 413/1 +f 482/1 162/1 160/1 +f 482/1 208/1 162/1 +f 208/1 320/1 162/1 +f 485/1 208/1 482/1 +f 414/1 208/1 485/1 +f 415/1 208/1 414/1 +f 488/1 415/1 414/1 +f 491/1 415/1 488/1 +f 416/1 415/1 491/1 +f 493/1 416/1 491/1 +f 494/1 416/1 493/1 +f 417/1 416/1 494/1 +f 497/1 417/1 494/1 +f 500/1 417/1 497/1 +f 502/1 418/1 500/1 +f 418/1 417/1 500/1 +f 504/1 418/1 502/1 +f 230/1 232/1 419/1 +f 428/1 215/1 419/1 +f 215/1 420/1 419/1 +f 420/1 230/1 419/1 +f 232/1 504/1 419/1 +f 204/1 418/1 504/1 +f 203/1 204/1 504/1 +f 194/2 195/1 504/1 +f 195/1 201/1 504/1 +f 201/1 203/1 504/1 +f 232/1 194/2 504/1 +f 428/1 213/1 215/1 +f 206/1 418/1 204/1 +f 234/1 508/1 421/1 +f 234/1 510/1 508/1 +f 422/1 510/1 234/1 +f 422/1 423/1 510/1 +f 235/1 423/1 422/1 +f 235/1 513/1 423/1 +f 235/1 424/1 513/1 +f 425/1 424/1 235/1 +f 425/1 516/1 424/1 +f 425/1 427/1 516/1 +f 425/1 426/1 427/1 +f 426/1 519/1 427/1 +f 426/1 428/1 519/1 +f 428/1 419/1 519/1 +f 270/1 259/1 256/1 +f 269/1 270/1 256/1 +f 67/1 269/1 256/1 +f 421/1 269/1 67/1 +f 243/1 421/1 67/1 +f 270/1 266/1 259/1 +f 266/1 263/1 259/1 +f 252/1 421/1 243/1 +f 280/1 234/1 252/1 +f 234/1 421/1 252/1 +f 429/1 273/1 281/1 +f 429/1 277/1 273/1 +f 277/1 276/1 273/1 +f 429/1 431/1 277/1 +f 431/1 278/1 277/1 +f 431/1 430/1 278/1 +f 431/1 432/1 430/1 +f 431/1 433/1 432/1 +f 525/1 212/1 432/1 +f 433/1 434/1 432/1 +f 434/1 525/1 432/1 +f 439/1 438/1 437/1 +f 436/1 439/1 437/1 +f 440/1 439/1 436/1 +f 439/1 522/1 438/1 +f 440/1 522/1 439/1 +f 436/1 441/1 443/1 +f 442/1 436/1 443/1 +f 442/1 440/1 436/1 +f 284/1 444/1 467/1 +f 445/1 444/1 284/1 +f 445/1 449/2 444/1 +f 448/1 446/1 447/1 +f 4/1 446/1 448/1 +f 4/1 445/1 446/1 +f 450/4 445/1 4/1 +f 450/4 449/2 445/1 +f 288/1 286/1 451/1 +f 553/1 301/1 451/1 +f 301/1 294/1 451/1 +f 287/1 288/1 451/1 +f 294/1 287/1 451/1 +f 309/1 301/1 553/1 +f 308/1 309/1 553/1 +f 318/1 317/1 553/1 +f 317/1 308/1 553/1 +f 530/1 323/1 452/1 +f 453/1 530/1 452/1 +f 457/1 530/1 453/1 +f 326/1 457/1 453/1 +f 456/1 457/1 326/1 +f 454/1 529/1 458/1 +f 529/1 455/1 458/1 +f 458/1 457/1 456/1 +f 459/1 457/1 458/1 +f 455/1 459/1 458/1 +f 463/1 460/1 464/1 +f 461/1 329/1 464/1 +f 460/1 443/1 464/1 +f 443/1 461/1 464/1 +f 465/1 463/1 464/1 +f 329/1 462/1 464/1 +f 562/1 463/1 465/1 +f 466/1 562/1 465/1 +f 332/1 562/1 466/1 +f 564/1 562/1 332/1 +f 467/1 564/1 332/1 +f 460/1 442/1 443/1 +f 444/1 556/1 467/1 +f 556/1 564/1 467/1 +f 468/1 564/1 556/1 +f 451/1 468/1 556/1 +f 469/1 451/1 556/1 +f 558/1 451/1 469/1 +f 559/1 451/1 558/1 +f 553/1 451/1 559/1 +f 351/1 333/1 474/1 +f 355/1 351/1 474/1 +f 337/1 351/1 355/1 +f 345/1 349/1 337/1 +f 349/1 351/1 337/1 +f 341/1 345/1 337/1 +f 360/1 470/1 359/1 +f 362/1 470/1 360/1 +f 471/1 470/1 362/1 +f 364/1 471/1 362/1 +f 472/1 471/1 364/1 +f 367/1 472/1 364/1 +f 368/1 472/1 367/1 +f 370/1 472/1 368/1 +f 473/1 472/1 370/1 +f 374/1 473/1 370/1 +f 374/1 474/1 473/1 +f 355/1 474/1 374/1 +f 359/1 470/1 475/1 +f 470/1 533/1 475/1 +f 533/1 378/1 475/1 +f 533/1 535/1 378/1 +f 535/1 476/2 378/1 +f 535/1 477/1 476/2 +f 535/1 478/1 477/1 +f 478/1 382/1 477/1 +f 478/1 536/1 382/1 +f 536/1 479/1 382/1 +f 536/1 480/2 479/1 +f 481/1 480/2 536/1 +f 481/1 391/1 480/2 +f 481/1 392/1 391/1 +f 481/1 410/1 392/1 +f 410/1 411/1 392/1 +f 411/1 394/1 392/1 +f 411/1 405/1 394/1 +f 405/1 401/1 394/1 +f 401/1 398/1 394/1 +f 483/1 482/1 184/1 +f 541/1 483/1 184/1 +f 487/1 483/1 541/1 +f 484/1 483/1 487/1 +f 484/1 485/1 483/1 +f 485/1 482/1 483/1 +f 486/1 485/1 484/1 +f 486/1 414/1 485/1 +f 492/1 484/1 487/1 +f 492/1 486/1 484/1 +f 489/1 486/1 492/1 +f 489/1 488/1 486/1 +f 488/1 414/1 486/1 +f 491/1 488/1 489/1 +f 492/1 490/1 489/1 +f 490/1 491/1 489/1 +f 493/1 491/1 490/1 +f 495/1 490/1 492/1 +f 495/1 493/1 490/1 +f 496/1 495/1 492/1 +f 495/1 494/1 493/1 +f 496/1 497/1 495/1 +f 497/1 494/1 495/1 +f 501/1 498/1 496/1 +f 498/1 497/1 496/1 +f 498/1 500/1 497/1 +f 501/1 499/1 498/1 +f 499/1 500/1 498/1 +f 499/1 502/1 500/1 +f 503/1 499/1 501/1 +f 503/1 502/1 499/1 +f 503/1 504/1 502/1 +f 503/1 501/1 518/1 +f 505/1 503/1 518/1 +f 504/1 503/1 505/1 +f 419/1 504/1 505/1 +f 508/1 506/1 507/1 +f 421/1 508/1 507/1 +f 509/1 511/1 506/1 +f 508/1 509/1 506/1 +f 510/1 509/1 508/1 +f 509/1 512/1 511/1 +f 423/1 512/1 509/1 +f 510/1 423/1 509/1 +f 513/1 512/1 423/1 +f 512/1 514/1 511/1 +f 424/1 514/1 512/1 +f 513/1 424/1 512/1 +f 516/1 515/1 514/1 +f 424/1 516/1 514/1 +f 515/1 517/1 514/1 +f 516/1 517/1 515/1 +f 427/1 517/1 516/1 +f 519/1 518/1 517/1 +f 427/1 519/1 517/1 +f 519/1 505/1 518/1 +f 419/1 505/1 519/1 +f 421/1 507/1 269/1 +f 507/1 520/1 269/1 +f 507/1 506/1 520/1 +f 523/1 522/1 521/1 +f 523/1 44/1 522/1 +f 523/1 46/1 44/1 +f 523/1 429/1 46/1 +f 429/1 281/1 46/1 +f 524/1 429/1 523/1 +f 431/1 429/1 524/1 +f 433/1 431/1 524/1 +f 547/1 433/1 524/1 +f 547/1 434/1 433/1 +f 551/1 434/1 547/1 +f 526/1 434/1 551/1 +f 526/1 525/1 434/1 +f 526/1 212/1 525/1 +f 286/1 435/1 212/1 +f 526/1 527/1 212/1 +f 527/1 286/1 212/1 +f 451/1 527/1 538/1 +f 286/1 527/1 451/1 +f 442/1 539/1 521/1 +f 522/1 442/1 521/1 +f 522/1 440/1 442/1 +f 5/1 544/1 542/1 +f 450/4 5/1 542/1 +f 528/1 544/1 5/1 +f 530/1 544/1 528/1 +f 322/1 530/1 528/1 +f 323/1 530/1 322/1 +f 444/1 542/1 560/1 +f 449/2 450/4 542/1 +f 444/1 449/2 542/1 +f 549/1 553/1 550/1 +f 549/1 318/1 553/1 +f 318/1 454/1 100/1 +f 549/1 529/1 454/1 +f 318/1 549/1 454/1 +f 549/1 531/1 529/1 +f 457/1 544/1 530/1 +f 457/1 546/1 544/1 +f 457/1 548/1 546/1 +f 459/1 548/1 457/1 +f 455/1 548/1 459/1 +f 552/1 548/1 455/1 +f 529/1 552/1 455/1 +f 531/1 552/1 529/1 +f 333/1 533/1 470/1 +f 474/1 333/1 470/1 +f 539/1 532/1 533/1 +f 532/1 534/1 533/1 +f 333/1 539/1 533/1 +f 472/1 473/1 470/1 +f 473/1 474/1 470/1 +f 534/1 535/1 533/1 +f 471/1 472/1 470/1 +f 534/1 478/1 535/1 +f 534/1 536/1 478/1 +f 534/1 537/1 536/1 +f 537/1 481/1 536/1 +f 537/1 410/1 481/1 +f 561/1 563/1 410/1 +f 563/1 538/1 410/1 +f 554/1 560/1 410/1 +f 537/1 561/1 410/1 +f 538/1 543/1 410/1 +f 557/1 555/1 410/1 +f 555/1 554/1 410/1 +f 543/1 557/1 410/1 +f 560/1 412/1 410/1 +f 540/1 539/1 333/1 +f 521/1 539/1 540/1 +f 506/1 521/1 520/1 +f 521/1 540/1 520/1 +f 560/1 541/1 412/1 +f 542/1 487/1 541/1 +f 560/1 542/1 541/1 +f 506/1 523/1 521/1 +f 544/1 487/1 542/1 +f 538/1 545/1 543/1 +f 506/1 524/1 523/1 +f 546/1 487/1 544/1 +f 511/1 524/1 506/1 +f 492/1 487/1 546/1 +f 538/1 550/1 545/1 +f 548/1 492/1 546/1 +f 511/1 547/1 524/1 +f 511/1 514/1 547/1 +f 496/1 492/1 548/1 +f 517/1 551/1 547/1 +f 514/1 517/1 547/1 +f 552/1 496/1 548/1 +f 501/1 496/1 552/1 +f 549/1 550/1 538/1 +f 527/1 549/1 538/1 +f 517/1 526/1 551/1 +f 531/1 501/1 552/1 +f 517/1 518/1 526/1 +f 518/1 527/1 526/1 +f 518/1 549/1 527/1 +f 518/1 501/1 549/1 +f 501/1 531/1 549/1 +f 550/1 559/1 545/1 +f 550/1 553/1 559/1 +f 555/1 556/1 554/1 +f 557/1 469/1 555/1 +f 469/1 556/1 555/1 +f 543/1 558/1 557/1 +f 558/1 469/1 557/1 +f 559/1 558/1 543/1 +f 545/1 559/1 543/1 +f 556/1 444/1 554/1 +f 444/1 560/1 554/1 +f 442/1 460/1 539/1 +f 460/1 532/1 539/1 +f 460/1 534/1 532/1 +f 463/1 534/1 460/1 +f 463/1 537/1 534/1 +f 562/1 537/1 463/1 +f 562/1 561/1 537/1 +f 564/1 561/1 562/1 +f 564/1 563/1 561/1 +f 468/1 563/1 564/1 +f 468/1 451/1 563/1 +f 451/1 538/1 563/1 +f 565/7 570/8 682/9 +f 567/10 565/7 682/9 +f 566/11 565/7 567/10 +f 599/12 566/11 567/10 +f 659/13 569/14 567/10 +f 568/15 599/12 567/10 +f 569/14 568/15 567/10 +f 570/8 684/16 682/9 +f 565/7 605/17 570/8 +f 605/17 606/18 570/8 +f 606/18 578/19 570/8 +f 640/20 638/21 569/14 +f 642/22 640/20 569/14 +f 581/23 642/22 569/14 +f 638/21 568/15 569/14 +f 571/24 605/17 565/7 +f 610/25 608/26 565/7 +f 608/26 571/24 565/7 +f 582/27 610/25 565/7 +f 588/28 582/27 565/7 +f 566/11 623/29 565/7 +f 623/29 572/30 565/7 +f 572/30 573/31 565/7 +f 573/31 624/32 565/7 +f 624/32 627/33 565/7 +f 627/33 588/28 565/7 +f 574/34 623/29 566/11 +f 575/35 574/34 566/11 +f 629/36 626/37 566/11 +f 599/12 629/36 566/11 +f 626/37 575/35 566/11 +f 638/21 576/38 568/15 +f 576/38 577/39 568/15 +f 577/39 643/40 568/15 +f 643/40 646/41 568/15 +f 646/41 599/12 568/15 +f 580/42 642/22 581/23 +f 578/19 579/43 570/8 +f 611/44 590/45 570/8 +f 579/43 611/44 570/8 +f 589/46 649/47 581/23 +f 649/47 580/42 581/23 +f 613/48 590/45 611/44 +f 588/28 614/49 582/27 +f 630/50 588/28 627/33 +f 599/12 584/51 629/36 +f 583/52 599/12 646/41 +f 589/46 585/53 649/47 +f 616/54 590/45 613/48 +f 632/55 588/28 630/50 +f 586/56 599/12 583/52 +f 588/28 619/57 614/49 +f 599/12 635/58 584/51 +f 589/46 655/59 585/53 +f 618/60 590/45 616/54 +f 633/61 588/28 632/55 +f 653/62 599/12 586/56 +f 622/63 590/45 618/60 +f 588/28 621/64 619/57 +f 636/65 588/28 633/61 +f 599/12 587/66 635/58 +f 657/67 599/12 653/62 +f 589/46 656/68 655/59 +f 588/28 590/45 621/64 +f 621/64 590/45 622/63 +f 599/12 588/28 636/65 +f 587/66 599/12 636/65 +f 589/46 599/12 657/67 +f 656/68 589/46 657/67 +f 662/69 599/12 589/46 +f 588/28 591/70 590/45 +f 593/71 599/12 662/69 +f 588/28 592/72 591/70 +f 592/72 595/73 594/74 +f 665/75 593/71 663/76 +f 667/77 593/71 665/75 +f 592/72 678/78 595/73 +f 596/79 593/71 667/77 +f 592/72 598/80 678/78 +f 597/81 593/71 596/79 +f 669/82 593/71 597/81 +f 599/12 592/72 588/28 +f 592/72 600/83 598/80 +f 675/84 592/72 599/12 +f 593/71 675/84 599/12 +f 675/84 593/71 669/82 +f 672/85 600/83 592/72 +f 669/82 601/86 675/84 +f 673/87 672/85 592/72 +f 601/86 602/88 675/84 +f 603/89 673/87 592/72 +f 675/84 603/89 592/72 +f 602/88 604/90 675/84 +f 690/91 606/92 698/93 +f 606/92 605/94 698/93 +f 605/94 607/95 698/93 +f 571/96 607/95 605/94 +f 692/97 578/98 690/91 +f 578/98 606/92 690/91 +f 571/96 702/99 607/95 +f 608/100 702/99 571/96 +f 694/101 578/98 692/97 +f 608/100 609/102 702/99 +f 610/103 609/102 608/100 +f 579/104 578/98 694/101 +f 704/105 611/106 694/101 +f 611/106 579/104 694/101 +f 610/103 612/107 609/102 +f 582/108 612/107 610/103 +f 613/109 611/106 704/105 +f 615/110 613/109 704/105 +f 582/108 706/111 612/107 +f 614/112 706/111 582/108 +f 616/113 613/109 615/110 +f 614/112 617/114 706/111 +f 709/115 616/113 615/110 +f 619/116 617/114 614/112 +f 618/117 616/113 709/115 +f 619/116 620/118 617/114 +f 622/119 618/117 709/115 +f 712/120 622/119 709/115 +f 621/121 620/118 619/116 +f 621/121 712/120 620/118 +f 712/120 621/121 622/119 +f 685/122 572/123 699/124 +f 572/123 623/125 699/124 +f 623/125 701/126 699/124 +f 574/127 701/126 623/125 +f 686/128 573/129 685/122 +f 573/129 572/123 685/122 +f 575/130 701/126 574/127 +f 624/131 573/129 686/128 +f 575/130 703/132 701/126 +f 625/133 624/131 686/128 +f 626/134 703/132 575/130 +f 627/135 624/131 625/133 +f 626/134 628/136 703/132 +f 697/137 627/135 625/133 +f 629/138 628/136 626/134 +f 630/139 627/135 697/137 +f 696/140 630/139 697/137 +f 629/138 631/141 628/136 +f 584/142 631/141 629/138 +f 632/143 630/139 696/140 +f 584/142 708/144 631/141 +f 695/145 632/143 696/140 +f 635/146 708/144 584/142 +f 633/147 632/143 695/145 +f 635/146 634/148 708/144 +f 636/149 633/147 695/145 +f 637/150 636/149 695/145 +f 635/146 711/151 634/148 +f 587/152 711/151 635/146 +f 587/152 637/150 711/151 +f 637/150 587/152 636/149 +f 576/153 638/154 689/155 +f 638/154 688/156 689/155 +f 639/157 576/153 689/155 +f 640/158 688/156 638/154 +f 641/159 577/160 639/157 +f 577/160 576/153 639/157 +f 640/158 687/161 688/156 +f 642/162 687/161 640/158 +f 644/163 643/164 641/159 +f 643/164 577/160 641/159 +f 580/165 687/161 642/162 +f 580/165 645/166 687/161 +f 647/167 646/168 644/163 +f 646/168 643/164 644/163 +f 580/165 648/169 645/166 +f 649/170 648/169 580/165 +f 583/171 646/168 647/167 +f 650/172 583/171 647/167 +f 649/170 707/173 648/169 +f 585/174 707/173 649/170 +f 586/175 583/171 650/172 +f 585/174 651/176 707/173 +f 654/177 586/175 650/172 +f 655/178 651/176 585/174 +f 655/178 652/179 651/176 +f 653/180 586/175 654/177 +f 657/181 653/180 654/177 +f 710/182 657/181 654/177 +f 655/178 713/183 652/179 +f 656/184 713/183 655/178 +f 713/183 657/181 710/182 +f 713/183 656/184 657/181 +f 660/185 659/186 658/187 +f 660/185 569/188 659/186 +f 661/189 569/188 660/185 +f 661/189 581/190 569/188 +f 662/191 589/192 705/193 +f 700/194 662/191 705/193 +f 593/195 662/191 700/194 +f 716/196 593/195 700/194 +f 664/197 593/195 716/196 +f 663/198 593/195 664/197 +f 666/199 663/198 664/197 +f 666/199 665/200 663/198 +f 666/199 667/201 665/200 +f 668/202 667/201 666/199 +f 668/202 596/203 667/201 +f 719/204 596/203 668/202 +f 719/204 597/205 596/203 +f 720/206 669/207 719/204 +f 669/207 597/205 719/204 +f 670/208 669/207 720/206 +f 670/208 601/209 669/207 +f 722/210 601/209 670/208 +f 722/210 602/211 601/209 +f 721/212 602/211 722/210 +f 721/212 604/213 602/211 +f 675/214 721/212 676/215 +f 675/214 604/213 721/212 +f 600/216 672/217 671/218 +f 672/217 714/219 671/218 +f 672/217 673/220 714/219 +f 673/220 674/221 714/219 +f 673/220 603/222 674/221 +f 603/222 675/214 674/221 +f 675/214 676/215 674/221 +f 598/223 671/218 715/224 +f 600/216 671/218 598/223 +f 594/225 595/226 677/227 +f 595/226 717/228 677/227 +f 595/226 678/229 717/228 +f 678/229 718/230 717/228 +f 678/229 598/223 718/230 +f 598/223 715/224 718/230 +f 679/231 594/225 677/227 +f 592/232 594/225 679/231 +f 590/233 681/234 680/235 +f 591/236 681/234 590/233 +f 591/236 679/231 681/234 +f 592/232 679/231 591/236 +f 570/237 680/235 693/238 +f 590/233 680/235 570/237 +f 682/239 684/240 683/241 +f 684/240 691/242 683/241 +f 684/240 570/237 691/242 +f 570/237 693/238 691/242 +f 658/187 567/243 683/241 +f 567/243 682/239 683/241 +f 659/186 567/243 658/187 +f 705/193 589/192 661/189 +f 589/192 581/190 661/189 +f 639/157 658/187 683/241 +f 686/128 685/122 683/241 +f 641/159 639/157 683/241 +f 625/133 686/128 683/241 +f 644/163 641/159 683/241 +f 690/91 698/93 683/241 +f 698/93 697/137 683/241 +f 697/137 625/133 683/241 +f 685/122 699/124 683/241 +f 699/124 644/163 683/241 +f 687/161 705/193 658/187 +f 688/156 687/161 658/187 +f 689/155 688/156 658/187 +f 639/157 689/155 658/187 +f 692/97 690/91 683/241 +f 691/242 692/97 683/241 +f 705/193 660/185 658/187 +f 705/193 661/189 660/185 +f 693/238 692/97 691/242 +f 694/101 692/97 693/238 +f 680/235 704/105 693/238 +f 704/105 694/101 693/238 +f 647/167 644/163 699/124 +f 637/150 695/145 698/93 +f 695/145 696/140 698/93 +f 696/140 697/137 698/93 +f 607/95 637/150 698/93 +f 654/177 650/172 699/124 +f 710/182 654/177 699/124 +f 700/194 710/182 699/124 +f 716/196 700/194 699/124 +f 701/126 716/196 699/124 +f 650/172 647/167 699/124 +f 702/99 637/150 607/95 +f 703/132 716/196 701/126 +f 609/102 637/150 702/99 +f 645/166 705/193 687/161 +f 628/136 716/196 703/132 +f 612/107 637/150 609/102 +f 648/169 705/193 645/166 +f 716/196 637/150 612/107 +f 680/235 615/110 704/105 +f 706/111 716/196 612/107 +f 631/141 716/196 628/136 +f 707/173 705/193 648/169 +f 617/114 716/196 706/111 +f 708/144 716/196 631/141 +f 651/176 705/193 707/173 +f 700/194 705/193 651/176 +f 680/235 709/115 615/110 +f 652/179 700/194 651/176 +f 620/118 716/196 617/114 +f 634/148 716/196 708/144 +f 680/235 712/120 709/115 +f 711/151 716/196 634/148 +f 713/183 700/194 652/179 +f 680/235 716/196 620/118 +f 712/120 680/235 620/118 +f 700/194 713/183 710/182 +f 637/150 716/196 711/151 +f 681/234 716/196 680/235 +f 676/215 716/196 681/234 +f 679/231 676/215 681/234 +f 714/219 674/221 679/231 +f 671/218 714/219 679/231 +f 674/221 676/215 679/231 +f 715/224 671/218 679/231 +f 718/230 715/224 679/231 +f 676/215 721/212 716/196 +f 677/227 717/228 679/231 +f 717/228 718/230 679/231 +f 721/212 664/197 716/196 +f 721/212 720/206 664/197 +f 720/206 719/204 664/197 +f 719/204 666/199 664/197 +f 719/204 668/202 666/199 +f 721/212 670/208 720/206 +f 721/212 722/210 670/208 +f 724/1 725/1 723/1 +f 725/1 728/1 723/1 +f 728/1 727/1 723/1 +f 724/1 726/1 725/1 +f 789/1 726/1 724/1 +f 725/1 730/1 728/1 +f 726/1 730/1 725/1 +f 789/1 731/1 726/1 +f 790/1 731/1 789/1 +f 728/1 733/1 727/1 +f 790/1 791/1 731/1 +f 727/1 732/1 729/1 +f 733/1 732/1 727/1 +f 726/1 734/1 730/1 +f 726/1 735/1 734/1 +f 731/1 735/1 726/1 +f 734/1 741/1 730/1 +f 732/1 737/1 729/1 +f 728/1 736/1 733/1 +f 730/1 736/1 728/1 +f 731/1 738/1 735/1 +f 740/1 738/1 731/1 +f 791/1 740/1 731/1 +f 741/1 736/1 730/1 +f 733/1 739/1 732/1 +f 736/1 739/1 733/1 +f 738/1 734/1 735/1 +f 791/1 792/1 740/1 +f 742/1 747/1 744/1 +f 745/1 749/1 742/1 +f 746/1 749/1 745/1 +f 743/1 746/1 745/1 +f 764/1 746/1 743/1 +f 744/1 747/1 751/1 +f 742/1 748/1 747/1 +f 749/1 753/1 742/1 +f 748/1 752/1 747/1 +f 742/1 753/1 748/1 +f 764/1 750/1 746/1 +f 747/1 755/1 751/1 +f 752/1 755/1 747/1 +f 749/1 758/1 753/1 +f 746/1 756/1 749/1 +f 750/1 754/1 746/1 +f 753/1 761/1 748/1 +f 748/1 761/1 752/1 +f 749/1 756/1 758/1 +f 746/1 754/1 756/1 +f 753/1 763/1 761/1 +f 750/1 757/1 754/1 +f 752/1 760/1 755/1 +f 759/1 757/1 750/1 +f 752/1 762/1 760/1 +f 761/1 762/1 752/1 +f 758/1 763/1 753/1 +f 759/1 793/1 757/1 +f 766/1 764/1 743/1 +f 768/1 764/1 766/1 +f 768/1 750/1 764/1 +f 773/1 750/1 768/1 +f 773/1 759/1 750/1 +f 798/1 759/1 773/1 +f 798/1 793/1 759/1 +f 767/1 769/1 765/1 +f 769/1 770/1 765/1 +f 770/1 766/1 765/1 +f 770/1 771/1 766/1 +f 771/1 768/1 766/1 +f 813/1 769/1 767/1 +f 771/1 773/1 768/1 +f 772/1 770/1 769/1 +f 813/1 772/1 769/1 +f 772/1 797/1 770/1 +f 797/1 771/1 770/1 +f 797/1 774/1 771/1 +f 774/1 773/1 771/1 +f 841/1 772/1 813/1 +f 796/1 797/1 772/1 +f 774/1 798/1 773/1 +f 841/1 796/1 772/1 +f 797/1 842/1 774/1 +f 842/1 798/1 774/1 +f 778/1 779/1 776/1 +f 777/1 776/1 775/1 +f 777/1 778/1 776/1 +f 780/1 777/1 775/1 +f 777/1 781/1 778/1 +f 781/1 779/1 778/1 +f 780/1 782/1 777/1 +f 782/1 781/1 777/1 +f 781/1 784/1 779/1 +f 782/1 783/1 781/1 +f 823/1 782/1 780/1 +f 897/1 784/1 781/1 +f 822/1 823/1 780/1 +f 783/1 825/1 781/1 +f 825/1 897/1 781/1 +f 823/1 783/1 782/1 +f 824/1 825/1 783/1 +f 824/1 783/1 823/1 +f 779/1 785/1 723/1 +f 776/1 779/1 723/1 +f 785/1 819/1 723/1 +f 819/1 724/1 723/1 +f 819/1 786/1 724/1 +f 786/1 818/1 724/1 +f 818/1 789/1 724/1 +f 787/1 789/1 818/1 +f 787/1 744/1 789/1 +f 788/1 742/1 787/1 +f 742/1 744/1 787/1 +f 816/1 742/1 788/1 +f 745/1 742/1 816/1 +f 743/1 745/1 816/1 +f 817/1 743/1 816/1 +f 767/1 766/1 817/1 +f 766/1 743/1 817/1 +f 765/1 766/1 767/1 +f 775/1 776/1 723/1 +f 727/1 775/1 723/1 +f 780/1 775/1 727/1 +f 729/1 780/1 727/1 +f 822/1 780/1 729/1 +f 737/1 822/1 729/1 +f 751/1 790/1 789/1 +f 744/1 751/1 789/1 +f 751/1 755/1 790/1 +f 755/1 791/1 790/1 +f 760/1 792/1 791/1 +f 755/1 760/1 791/1 +f 798/1 837/1 793/1 +f 826/1 837/1 798/1 +f 871/1 886/1 885/1 +f 871/1 866/1 886/1 +f 866/1 868/1 886/1 +f 868/1 799/1 886/1 +f 868/1 869/1 799/1 +f 869/1 865/1 799/1 +f 865/1 887/1 799/1 +f 865/1 867/1 887/1 +f 867/1 855/1 887/1 +f 855/1 888/1 887/1 +f 855/1 800/1 888/1 +f 855/1 801/1 800/1 +f 856/1 802/1 801/1 +f 855/1 856/1 801/1 +f 856/1 853/1 802/1 +f 853/1 803/1 802/1 +f 853/1 857/1 803/1 +f 857/1 854/1 803/1 +f 854/1 804/1 803/1 +f 854/1 850/1 804/1 +f 807/1 892/1 808/1 +f 807/1 806/1 892/1 +f 806/1 810/1 892/1 +f 806/1 809/1 810/1 +f 809/1 894/1 810/1 +f 809/1 795/1 894/1 +f 795/1 896/1 894/1 +f 795/1 794/1 896/1 +f 794/1 811/1 896/1 +f 812/1 767/1 817/1 +f 812/1 814/2 767/1 +f 814/2 813/1 767/1 +f 814/2 841/1 813/1 +f 815/1 788/1 787/1 +f 815/1 893/1 788/1 +f 893/1 816/1 788/1 +f 893/1 895/1 816/1 +f 895/1 817/1 816/1 +f 895/1 812/1 817/1 +f 815/1 787/1 818/1 +f 821/1 815/1 818/1 +f 889/1 819/1 785/1 +f 889/1 891/1 819/1 +f 891/1 786/1 819/1 +f 891/1 820/1 786/1 +f 821/1 818/1 786/1 +f 820/1 821/1 786/1 +f 898/1 889/1 785/1 +f 779/1 898/1 785/1 +f 784/1 898/1 779/1 +f 909/1 899/1 737/1 +f 899/1 822/1 737/1 +f 923/1 924/1 792/1 +f 760/1 923/1 792/1 +f 732/1 909/1 737/1 +f 914/1 909/1 732/1 +f 910/1 914/1 732/1 +f 739/1 910/1 732/1 +f 736/1 910/1 739/1 +f 913/1 910/1 736/1 +f 912/1 913/1 736/1 +f 741/1 912/1 736/1 +f 911/1 912/1 741/1 +f 734/1 911/1 741/1 +f 738/1 908/1 734/1 +f 908/1 911/1 734/1 +f 925/1 908/1 738/1 +f 740/1 925/1 738/1 +f 924/1 925/1 740/1 +f 792/1 924/1 740/1 +f 762/1 926/1 760/1 +f 926/1 923/1 760/1 +f 930/1 926/1 762/1 +f 761/1 930/1 762/1 +f 928/1 930/1 761/1 +f 763/1 928/1 761/1 +f 927/1 928/1 763/1 +f 758/1 927/1 763/1 +f 932/1 927/1 758/1 +f 756/1 929/1 758/1 +f 929/1 932/1 758/1 +f 754/1 929/1 756/1 +f 936/1 929/1 754/1 +f 757/1 938/1 754/1 +f 938/1 936/1 754/1 +f 837/1 938/1 757/1 +f 793/1 837/1 757/1 +f 827/1 828/1 826/1 +f 830/1 831/1 827/1 +f 831/1 828/1 827/1 +f 829/1 833/1 830/1 +f 831/1 832/1 828/1 +f 843/1 834/1 829/1 +f 834/1 833/1 829/1 +f 833/1 831/1 830/1 +f 836/1 832/1 831/1 +f 833/1 836/1 831/1 +f 835/1 836/1 833/1 +f 834/1 835/1 833/1 +f 828/1 837/1 826/1 +f 828/1 838/1 837/1 +f 832/1 838/1 828/1 +f 840/1 839/1 811/1 +f 794/1 840/1 811/1 +f 814/2 843/1 841/1 +f 829/1 796/1 841/1 +f 843/1 829/1 841/1 +f 829/1 830/1 796/1 +f 830/1 797/1 796/1 +f 830/1 827/1 797/1 +f 827/1 842/1 797/1 +f 827/1 826/1 842/1 +f 826/1 798/1 842/1 +f 941/1 942/1 843/1 +f 942/1 834/1 843/1 +f 942/1 835/1 834/1 +f 942/1 943/1 835/1 +f 943/1 945/1 835/1 +f 945/1 836/1 835/1 +f 804/1 844/1 949/1 +f 850/1 844/1 804/1 +f 848/1 847/1 844/1 +f 851/1 848/1 844/1 +f 845/1 848/1 851/1 +f 849/1 848/1 845/1 +f 846/1 847/1 848/1 +f 962/1 849/1 845/1 +f 849/1 846/1 848/1 +f 846/1 954/1 847/1 +f 849/1 957/1 846/1 +f 958/1 957/1 849/1 +f 962/1 958/1 849/1 +f 851/1 844/1 850/1 +f 863/1 851/1 850/1 +f 845/1 851/1 863/1 +f 864/1 845/1 863/1 +f 962/1 845/1 864/1 +f 852/1 962/1 864/1 +f 858/1 857/1 853/1 +f 859/1 856/1 855/1 +f 856/1 858/1 853/1 +f 857/1 861/1 854/1 +f 858/1 862/1 857/1 +f 860/1 858/1 856/1 +f 859/1 860/1 856/1 +f 862/1 861/1 857/1 +f 863/1 850/1 854/1 +f 861/1 863/1 854/1 +f 860/1 862/1 858/1 +f 864/1 861/1 862/1 +f 860/1 852/1 862/1 +f 864/1 863/1 861/1 +f 852/1 864/1 862/1 +f 867/1 859/1 855/1 +f 870/1 859/1 867/1 +f 872/1 859/1 870/1 +f 872/1 860/1 859/1 +f 865/1 870/1 867/1 +f 869/1 870/1 865/1 +f 871/1 873/1 866/1 +f 873/1 868/1 866/1 +f 868/1 874/1 869/1 +f 869/1 872/1 870/1 +f 873/1 874/1 868/1 +f 874/1 872/1 869/1 +f 876/1 873/1 871/1 +f 961/1 872/1 874/1 +f 873/1 961/1 874/1 +f 876/1 875/1 873/1 +f 875/1 961/1 873/1 +f 877/1 879/1 871/1 +f 879/1 876/1 871/1 +f 879/1 875/1 876/1 +f 879/1 882/1 875/1 +f 882/1 961/1 875/1 +f 877/1 871/1 965/1 +f 871/1 885/1 965/1 +f 878/1 879/1 877/1 +f 880/1 878/1 877/1 +f 878/1 883/1 879/1 +f 880/1 883/1 878/1 +f 883/1 882/1 879/1 +f 881/1 883/1 880/1 +f 966/1 968/1 881/1 +f 968/1 883/1 881/1 +f 967/1 968/1 966/1 +f 968/1 970/1 883/1 +f 970/1 882/1 883/1 +f 970/1 969/1 882/1 +f 805/1 807/1 808/1 +f 890/1 805/1 808/1 +f 898/1 808/1 889/1 +f 808/1 891/1 889/1 +f 890/1 808/1 898/1 +f 808/1 892/1 891/1 +f 892/1 820/1 891/1 +f 892/1 810/1 820/1 +f 810/1 821/1 820/1 +f 810/1 815/1 821/1 +f 894/1 815/1 810/1 +f 893/1 815/1 894/1 +f 896/1 893/1 894/1 +f 895/1 893/1 896/1 +f 811/1 895/1 896/1 +f 812/1 895/1 811/1 +f 839/1 812/1 811/1 +f 814/2 812/1 839/1 +f 899/1 823/1 822/1 +f 899/1 900/1 823/1 +f 900/1 824/1 823/1 +f 900/1 901/1 824/1 +f 901/1 825/1 824/1 +f 901/1 902/1 825/1 +f 902/1 897/1 825/1 +f 902/1 903/1 897/1 +f 898/1 784/1 897/1 +f 903/1 898/1 897/1 +f 978/1 900/1 899/1 +f 978/1 904/1 900/1 +f 904/1 901/1 900/1 +f 905/1 902/1 901/1 +f 904/1 905/1 901/1 +f 905/1 903/1 902/1 +f 977/1 904/1 978/1 +f 905/1 906/1 903/1 +f 907/1 905/1 904/1 +f 977/1 907/1 904/1 +f 907/1 906/1 905/1 +f 973/1 972/1 903/1 +f 906/1 973/1 903/1 +f 974/1 973/1 906/1 +f 907/1 974/1 906/1 +f 1010/1 974/1 907/1 +f 977/1 1010/1 907/1 +f 915/1 899/1 909/1 +f 978/1 899/1 915/1 +f 921/1 978/1 915/1 +f 924/1 979/1 925/1 +f 925/1 980/1 908/1 +f 979/1 980/1 925/1 +f 918/1 911/1 908/1 +f 980/1 918/1 908/1 +f 914/1 915/1 909/1 +f 913/1 919/1 910/1 +f 920/1 912/1 911/1 +f 919/1 914/1 910/1 +f 918/1 920/1 911/1 +f 916/1 913/1 912/1 +f 920/1 916/1 912/1 +f 916/1 919/1 913/1 +f 917/1 915/1 914/1 +f 916/1 981/1 919/1 +f 919/1 917/1 914/1 +f 920/1 981/1 916/1 +f 919/1 922/1 917/1 +f 981/1 922/1 919/1 +f 917/1 921/1 915/1 +f 926/1 931/1 923/1 +f 931/1 924/1 923/1 +f 931/1 979/1 924/1 +f 930/1 931/1 926/1 +f 930/1 935/1 931/1 +f 933/1 928/1 927/1 +f 932/1 933/1 927/1 +f 928/1 935/1 930/1 +f 933/1 982/1 928/1 +f 929/1 936/1 937/1 +f 929/1 934/1 932/1 +f 932/1 934/1 933/1 +f 937/1 934/1 929/1 +f 982/1 935/1 928/1 +f 838/1 938/1 837/1 +f 933/1 939/1 982/1 +f 934/1 939/1 933/1 +f 937/1 940/1 934/1 +f 938/1 984/1 936/1 +f 940/1 939/1 934/1 +f 838/1 984/1 938/1 +f 936/1 940/1 937/1 +f 984/1 940/1 936/1 +f 945/1 985/1 838/1 +f 832/1 945/1 838/1 +f 836/1 945/1 832/1 +f 843/1 814/2 839/1 +f 840/1 843/1 839/1 +f 988/1 840/1 953/1 +f 988/1 941/1 840/1 +f 941/1 843/1 840/1 +f 944/1 942/1 941/1 +f 943/1 942/1 944/1 +f 946/1 943/1 944/1 +f 947/1 945/1 943/1 +f 946/1 947/1 943/1 +f 948/1 947/1 946/1 +f 844/1 847/1 949/1 +f 847/1 950/1 949/1 +f 847/1 954/1 950/1 +f 955/1 951/1 950/1 +f 954/1 955/1 950/1 +f 955/1 987/1 951/1 +f 987/1 952/1 951/1 +f 987/1 989/1 952/1 +f 989/1 986/1 952/1 +f 986/1 953/1 952/1 +f 986/1 988/1 953/1 +f 846/1 956/1 954/1 +f 956/1 955/1 954/1 +f 956/1 987/1 955/1 +f 990/1 987/1 956/1 +f 959/244 956/1 846/1 +f 957/1 959/244 846/1 +f 959/244 990/1 956/1 +f 960/1 959/244 957/1 +f 958/1 960/1 957/1 +f 962/1 860/1 872/1 +f 961/1 962/1 872/1 +f 962/1 852/1 860/1 +f 882/1 962/1 961/1 +f 958/1 962/1 882/1 +f 969/1 958/1 882/1 +f 1007/1 998/1 963/1 +f 998/1 997/1 963/1 +f 997/1 964/1 963/1 +f 997/1 999/1 964/1 +f 999/1 967/1 964/1 +f 967/1 884/1 964/1 +f 967/1 966/1 884/1 +f 966/1 881/1 884/1 +f 881/1 965/1 884/1 +f 881/1 880/1 965/1 +f 880/1 877/1 965/1 +f 1003/1 968/1 967/1 +f 999/1 1003/1 967/1 +f 1003/1 970/1 968/1 +f 1000/1 1003/1 999/1 +f 970/1 971/1 969/1 +f 1003/1 971/1 970/1 +f 1006/1 971/1 1003/1 +f 805/1 890/1 898/1 +f 903/1 805/1 898/1 +f 903/1 963/1 805/1 +f 903/1 972/1 963/1 +f 972/1 1007/1 963/1 +f 1008/1 972/1 973/1 +f 974/1 1008/1 973/1 +f 974/1 975/1 1008/1 +f 1010/1 976/1 974/1 +f 976/1 975/1 974/1 +f 977/1 978/1 921/1 +f 1013/1 1010/1 921/1 +f 1010/1 977/1 921/1 +f 1018/1 980/1 979/1 +f 1018/1 918/1 980/1 +f 1018/1 1016/1 918/1 +f 1016/1 1011/1 918/1 +f 1011/1 920/1 918/1 +f 1011/1 981/1 920/1 +f 1011/1 1014/1 981/1 +f 917/1 1013/1 921/1 +f 1014/1 922/1 981/1 +f 922/1 1013/1 917/1 +f 1014/1 1013/1 922/1 +f 1020/1 1018/1 979/1 +f 931/1 1020/1 979/1 +f 935/1 1020/1 931/1 +f 1022/1 1020/1 935/1 +f 982/1 1022/1 935/1 +f 983/1 1022/1 982/1 +f 939/1 983/1 982/1 +f 940/1 983/1 939/1 +f 1023/1 983/1 940/1 +f 985/1 984/1 838/1 +f 984/1 1023/1 940/1 +f 985/1 1023/1 984/1 +f 947/1 985/1 945/1 +f 947/1 1026/1 985/1 +f 947/1 948/1 1026/1 +f 944/1 941/1 988/1 +f 993/1 944/1 988/1 +f 994/1 946/1 993/1 +f 946/1 944/1 993/1 +f 948/1 946/1 994/1 +f 1028/3 948/1 994/1 +f 991/1 986/1 989/1 +f 991/1 988/1 986/1 +f 990/1 989/1 987/1 +f 991/1 993/1 988/1 +f 959/244 991/1 989/1 +f 990/1 959/244 989/1 +f 992/1 993/1 991/1 +f 959/244 992/1 991/1 +f 960/1 995/1 959/244 +f 995/1 992/1 959/244 +f 1028/3 994/1 993/1 +f 992/1 1028/3 993/1 +f 996/1 992/1 995/1 +f 996/1 1028/3 992/1 +f 971/1 960/1 969/1 +f 960/1 958/1 969/1 +f 1006/1 960/1 971/1 +f 995/1 960/1 1006/1 +f 998/1 1002/1 997/1 +f 1000/1 999/1 997/1 +f 1001/1 998/1 1007/1 +f 1001/1 1004/1 998/1 +f 1004/1 1002/1 998/1 +f 1002/1 1000/1 997/1 +f 1009/1 1004/1 1001/1 +f 1002/1 1003/1 1000/1 +f 1004/1 1005/1 1002/1 +f 1005/1 1003/1 1002/1 +f 1005/1 1006/1 1003/1 +f 1009/1 1027/6 1004/1 +f 1027/6 1005/1 1004/1 +f 1027/6 1006/1 1005/1 +f 1008/1 1007/1 972/1 +f 1008/1 1001/1 1007/1 +f 975/1 1001/1 1008/1 +f 975/1 1009/1 1001/1 +f 976/1 1009/1 975/1 +f 976/1 1027/6 1009/1 +f 976/1 1010/1 1013/1 +f 1015/1 976/1 1013/1 +f 1018/1 1019/1 1016/1 +f 1012/1 1019/1 1018/1 +f 1016/1 1014/1 1011/1 +f 1014/1 1015/1 1013/1 +f 1016/1 1017/1 1014/1 +f 1019/1 1017/1 1016/1 +f 1014/1 1017/1 1015/1 +f 1020/1 1012/1 1018/1 +f 1021/1 1012/1 1020/1 +f 1019/1 1012/1 1021/1 +f 1021/1 1024/1 1019/1 +f 1022/1 1021/1 1020/1 +f 1023/1 1025/1 983/1 +f 983/1 1024/1 1022/1 +f 1025/1 1024/1 983/1 +f 1022/1 1024/1 1021/1 +f 1026/1 1025/1 1023/1 +f 985/1 1026/1 1023/1 +f 1017/1 976/1 1015/1 +f 1017/1 1027/6 976/1 +f 1017/1 1019/1 1027/6 +f 1024/1 995/1 1019/1 +f 995/1 1006/1 1019/1 +f 1006/1 1027/6 1019/1 +f 1024/1 996/1 995/1 +f 1028/3 996/1 1024/1 +f 1026/1 1028/3 1024/1 +f 1026/1 948/1 1028/3 +f 1025/1 1026/1 1024/1 +f 1046/1 1030/1 1045/1 +f 1056/1 1030/1 1046/1 +f 1031/1 1056/1 1046/1 +f 1032/1 1031/1 1046/1 +f 1045/1 1033/1 1042/1 +f 1030/1 1033/1 1045/1 +f 1036/1 1034/1 1035/1 +f 1042/1 1036/1 1035/1 +f 1033/1 1036/1 1042/1 +f 1066/1 1037/1 1067/1 +f 1066/1 1060/1 1037/1 +f 1039/1 1031/1 1032/1 +f 1038/1 1039/1 1032/1 +f 1035/1 1080/1 1077/1 +f 1035/1 1047/1 1080/1 +f 1040/1 1035/1 1077/1 +f 1042/1 1035/1 1040/1 +f 1041/1 1042/1 1040/1 +f 1043/1 1042/1 1041/1 +f 1045/1 1042/1 1043/1 +f 1044/1 1045/1 1043/1 +f 1044/1 1074/1 1045/1 +f 1074/1 1046/1 1045/1 +f 1074/1 1076/1 1046/1 +f 1076/1 1032/1 1046/1 +f 1076/1 1038/1 1032/1 +f 1076/1 1073/1 1038/1 +f 1048/1 1047/1 1035/1 +f 1034/1 1048/1 1035/1 +f 1086/1 1054/1 1061/1 +f 1058/1 1054/1 1086/1 +f 1053/1 1054/1 1058/1 +f 1059/1 1053/1 1058/1 +f 1060/1 1053/1 1059/1 +f 1037/1 1060/1 1059/1 +f 1061/1 1055/1 1084/1 +f 1054/1 1055/1 1061/1 +f 1051/1 1062/1 1085/1 +f 1062/1 1063/1 1085/1 +f 1062/1 1064/1 1063/1 +f 1062/1 1052/1 1064/1 +f 1052/1 1065/1 1064/1 +f 1052/1 1066/1 1065/1 +f 1066/1 1067/1 1065/1 +f 1055/1 1092/1 1084/1 +f 1055/1 1068/1 1092/1 +f 1068/1 1070/1 1092/1 +f 1068/1 1069/1 1070/1 +f 1069/1 1071/1 1070/1 +f 1069/1 1057/1 1071/1 +f 1038/1 1072/1 1071/1 +f 1039/1 1038/1 1071/1 +f 1057/1 1039/1 1071/1 +f 1038/1 1073/1 1072/1 +f 1072/1 1073/1 1093/1 +f 1073/1 1076/1 1093/1 +f 1074/1 1044/1 1094/1 +f 1075/1 1074/1 1094/1 +f 1076/1 1074/1 1075/1 +f 1093/1 1076/1 1075/1 +f 1094/1 1044/1 1089/1 +f 1044/1 1043/1 1089/1 +f 1088/1 1077/1 1087/1 +f 1040/1 1077/1 1088/1 +f 1078/1 1040/1 1088/1 +f 1041/1 1040/1 1078/1 +f 1089/1 1041/1 1078/1 +f 1043/1 1041/1 1089/1 +f 1077/1 1079/1 1087/1 +f 1077/1 1080/1 1079/1 +f 1080/1 1081/1 1079/1 +f 1047/1 1049/1 1081/1 +f 1080/1 1047/1 1081/1 +f 1048/1 1049/1 1047/1 +f 1049/1 1090/1 1081/1 +f 1049/1 1082/1 1090/1 +f 1082/1 1083/1 1090/1 +f 1082/1 1050/1 1083/1 +f 1050/1 1051/1 1083/1 +f 1051/1 1091/1 1083/1 +f 1051/1 1085/1 1091/1 +f 1085/1 1029/1 1091/1 +f 1029/1 1061/1 1084/1 +f 1085/1 1061/1 1029/1 +f 1085/1 1063/1 1061/1 +f 1063/1 1086/1 1061/1 +f 1063/1 1064/1 1086/1 +f 1058/1 1086/1 1064/1 +f 1064/1 1065/1 1058/1 +f 1065/1 1059/1 1058/1 +f 1065/1 1037/1 1059/1 +f 1065/1 1067/1 1037/1 +f 1079/1 1081/1 1087/1 +f 1081/1 1089/1 1087/1 +f 1089/1 1088/1 1087/1 +f 1089/1 1078/1 1088/1 +f 1081/1 1090/1 1089/1 +f 1090/1 1029/1 1089/1 +f 1029/1 1094/1 1089/1 +f 1083/1 1029/1 1090/1 +f 1091/1 1029/1 1083/1 +f 1070/1 1094/1 1029/1 +f 1092/1 1070/1 1029/1 +f 1084/1 1092/1 1029/1 +f 1071/1 1094/1 1070/1 +f 1071/1 1072/1 1094/1 +f 1072/1 1093/1 1094/1 +f 1093/1 1075/1 1094/1 +f 1103/1 1096/1 1095/1 +f 1103/1 1095/1 1099/1 +f 1109/1 1096/1 1103/1 +f 1099/1 1095/1 1108/1 +f 1099/1 1108/1 1097/1 +f 1098/1 1109/1 1103/1 +f 1110/1 1098/1 1103/1 +f 1103/1 1099/1 1104/1 +f 1105/1 1103/1 1100/1 +f 1101/1 1103/1 1104/1 +f 1100/1 1103/1 1101/1 +f 1101/1 1104/1 1102/1 +f 1107/1 1103/1 1105/1 +f 1102/1 1104/1 1106/1 +f 1124/1 1111/1 1113/1 +f 1112/1 1123/1 1111/1 +f 1125/1 1111/1 1124/1 +f 1126/1 1111/1 1125/1 +f 1111/1 1114/1 1112/1 +f 1119/1 1111/1 1126/1 +f 1111/1 1118/1 1114/1 +f 1115/1 1111/1 1119/1 +f 1116/1 1118/1 1111/1 +f 1115/1 1116/1 1111/1 +f 1116/1 1117/1 1118/1 +f 1121/1 1115/1 1119/1 +f 1117/1 1120/1 1118/1 +f 1122/1 1115/1 1121/1 +f 1100/1 1115/1 1105/1 +f 1104/1 1118/1 1106/1 +f 1095/1 1111/1 1108/1 +f 1098/1 1125/1 1109/1 +f 1108/1 1123/1 1097/1 +f 1107/1 1119/1 1103/1 +f 1110/1 1126/1 1098/1 +f 1097/1 1112/1 1099/1 +f 803/1 804/1 949/1 950/1 951/1 952/1 953/1 840/1 794/1 795/1 809/1 806/1 807/1 805/1 963/1 964/1 884/1 965/1 885/1 886/1 799/1 887/1 888/1 801/1 802/1 +f 1030/1 1056/1 1031/1 1039/1 1057/1 1069/1 1068/1 1055/1 1054/1 1053/1 1060/1 1066/1 1052/1 1062/1 1051/1 1050/1 1082/1 1049/1 1048/1 1034/1 1036/1 1033/1 +f 1116/1 1101/1 1102/1 1117/1 +f 1113/1 1096/1 1109/1 1124/1 +f 1108/1 1111/1 1123/1 +f 1126/1 1110/1 1103/1 1119/1 +f 1097/1 1123/1 1112/1 +f 1109/1 1125/1 1124/1 +f 1099/1 1112/1 1114/1 +f 1098/1 1126/1 1125/1 +f 1111/1 1095/1 1096/1 1113/1 +f 1121/1 1107/1 1105/1 1122/1 +f 1107/1 1121/1 1119/1 +f 1118/1 1104/1 1099/1 1114/1 +f 1115/1 1100/1 1101/1 1116/1 +f 1117/1 1102/1 1106/1 1120/1 +f 1105/1 1115/1 1122/1 +f 1106/1 1118/1 1120/1 From 78be499aebe38679318faab52bc63149b27207cc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 3 Oct 2024 13:28:51 +0200 Subject: [PATCH 56/58] Fix issues pointed out by linter CURA-12167 --- resources/definitions/ultimaker_sketch_sprint.def.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index cda786f68a..98b6cbda4c 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -136,11 +136,7 @@ "enabled": false, "value": false }, - "jerk_travel_enabled": - { - "enabled": false, - "value": false - }, + "jerk_travel_enabled": { "enabled": false }, "layer_height_0": { "value": "layer_height if adhesion_type == 'raft' else layer_height * 1.25" }, "line_width": { "value": 0.42 }, "machine_center_is_zero": { "default_value": true }, @@ -368,7 +364,6 @@ "support_top_distance": { "value": "support_z_distance" }, "support_use_towers": { "value": false }, "support_xy_distance": { "value": 0.3 }, - "support_xy_distance_overhang": { "value": 0.2 }, "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, "support_z_distance": { "value": "layer_height if support_structure == 'tree' else 0.25" }, "top_bottom_thickness": { "value": "5 * layer_height" }, From e25c8f6bca94ed6248dd3109e72572fcb13107b8 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 3 Oct 2024 14:03:26 +0200 Subject: [PATCH 57/58] Fix incorrect definitions pointed out by unit test CURA-12167 --- resources/definitions/ultimaker_sketch_sprint.def.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index 98b6cbda4c..44cb8ee875 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -171,9 +171,7 @@ "maximum_value": 280, "maximum_value_warning": 240 }, - "min_bead_width": { "default_value": 0.3 }, - "min_thin_wall_line_width": { "default_value": 0.3 }, - "min_wall_line_width": { "default_value": 0.34 }, + "min_bead_width": { "value": 0.3 }, "multiple_mesh_overlap": { "value": "0" }, "raft_airgap": { "value": 0.35 }, "raft_base_acceleration": { "value": "acceleration_layer_0" }, From 1d28f7d77883e8614355ca103155dc6ce4ee0209 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 4 Oct 2024 11:56:17 +0200 Subject: [PATCH 58/58] Move scarf seam and acceleration/deceleration to experimental CURA-12077 --- resources/definitions/fdmprinter.def.json | 210 +++++++++++----------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a6c4ab02d9..50c47395b5 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1436,111 +1436,6 @@ "enabled": "z_seam_type == 'back'", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true - }, - "scarf_joint_seam_length": - { - "label": "Scarf Seam Length", - "description": "When greater than 0, a scarf joint will be created on the Z seam to make it less visible.", - "type": "float", - "default_value": 0, - "minimum_value": "0", - "unit": "mm", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_extruder": true, - "settable_per_mesh": true - }, - "scarf_joint_seam_start_height_ratio": - { - "label": "Scarf Seam Start Height", - "description": "This is the ratio over the total layer height where the scarf joint seam will start.", - "type": "float", - "default_value": 0, - "minimum_value": 0, - "maximum_value": 100.0, - "unit": "%", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_extruder": true, - "settable_per_mesh": true - }, - "scarf_split_distance": - { - "label": "Scarf Seam Split Distance", - "description": "This is the maximum length of an extrusion path when splitting a longer path to apply the scarf seam. A smaller distance will create a more precise but also more verbose G-Code.", - "type": "float", - "default_value": 1.0, - "minimum_value": 0.1, - "maximum_value": 100.0, - "unit": "mm", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_extruder": true, - "settable_per_mesh": true - }, - "wall_0_start_speed_ratio": - { - "label": "Outer Wall Start Speed Ratio", - "description": "This is the ratio of the top speed to start with when printing an outer wall.", - "type": "float", - "default_value": 100.0, - "minimum_value": 0.0, - "maximum_value": 100.0, - "unit": "%", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_extruder": true, - "settable_per_mesh": true - }, - "wall_0_acceleration": - { - "label": "Outer Wall Acceleration", - "description": "This is the acceleration with which to reach the top speed when printing an outer wall.", - "enabled": "wall_0_start_speed_ratio < 100.0", - "type": "float", - "default_value": 20.0, - "minimum_value": 1.0, - "maximum_value": 1000.0, - "unit": "mm/s\u00b2", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_extruder": true, - "settable_per_mesh": true - }, - "wall_0_end_speed_ratio": - { - "label": "Outer Wall End Speed Ratio", - "description": "This is the ratio of the top speed to end with when printing an outer wall.", - "type": "float", - "default_value": 100.0, - "minimum_value": 0.0, - "maximum_value": 100.0, - "unit": "%", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_extruder": true, - "settable_per_mesh": true - }, - "wall_0_deceleration": - { - "label": "Outer Wall Deceleration", - "description": "This is the deceleration with which to end printing an outer wall.", - "enabled": "wall_0_end_speed_ratio < 100.0", - "type": "float", - "default_value": 20.0, - "minimum_value": 1.0, - "maximum_value": 1000.0, - "unit": "mm/s\u00b2", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_extruder": true, - "settable_per_mesh": true - }, - "wall_0_speed_split_distance": - { - "label": "Outer Wall Speed Split Distance", - "description": "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code.", - "type": "float", - "default_value": 1.0, - "minimum_value": 0.1, - "maximum_value": 100.0, - "unit": "mm", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_extruder": true, - "settable_per_mesh": true } } }, @@ -9028,6 +8923,111 @@ "type": "bool", "default_value": true, "settable_per_mesh": true + }, + "scarf_joint_seam_length": + { + "label": "Scarf Seam Length", + "description": "When greater than 0, a scarf joint will be created on the Z seam to make it less visible.", + "type": "float", + "default_value": 0, + "minimum_value": "0", + "unit": "mm", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "scarf_joint_seam_start_height_ratio": + { + "label": "Scarf Seam Start Height", + "description": "This is the ratio over the total layer height where the scarf joint seam will start.", + "type": "float", + "default_value": 0, + "minimum_value": 0, + "maximum_value": 100.0, + "unit": "%", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "scarf_split_distance": + { + "label": "Scarf Seam Split Distance", + "description": "This is the maximum length of an extrusion path when splitting a longer path to apply the scarf seam. A smaller distance will create a more precise but also more verbose G-Code.", + "type": "float", + "default_value": 1.0, + "minimum_value": 0.1, + "maximum_value": 100.0, + "unit": "mm", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "wall_0_start_speed_ratio": + { + "label": "Outer Wall Start Speed Ratio", + "description": "This is the ratio of the top speed to start with when printing an outer wall.", + "type": "float", + "default_value": 100.0, + "minimum_value": 0.0, + "maximum_value": 100.0, + "unit": "%", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "wall_0_acceleration": + { + "label": "Outer Wall Acceleration", + "description": "This is the acceleration with which to reach the top speed when printing an outer wall.", + "enabled": "wall_0_start_speed_ratio < 100.0", + "type": "float", + "default_value": 20.0, + "minimum_value": 1.0, + "maximum_value": 1000.0, + "unit": "mm/s\u00b2", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "wall_0_end_speed_ratio": + { + "label": "Outer Wall End Speed Ratio", + "description": "This is the ratio of the top speed to end with when printing an outer wall.", + "type": "float", + "default_value": 100.0, + "minimum_value": 0.0, + "maximum_value": 100.0, + "unit": "%", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "wall_0_deceleration": + { + "label": "Outer Wall Deceleration", + "description": "This is the deceleration with which to end printing an outer wall.", + "enabled": "wall_0_end_speed_ratio < 100.0", + "type": "float", + "default_value": 20.0, + "minimum_value": 1.0, + "maximum_value": 1000.0, + "unit": "mm/s\u00b2", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true + }, + "wall_0_speed_split_distance": + { + "label": "Outer Wall Speed Split Distance", + "description": "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code.", + "type": "float", + "default_value": 1.0, + "minimum_value": 0.1, + "maximum_value": 100.0, + "unit": "mm", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_extruder": true, + "settable_per_mesh": true } } },