diff --git a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py index 1c68ecce92..ac924c684e 100644 --- a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py +++ b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py @@ -50,7 +50,8 @@ class ExtruderConfigurationModel(QObject): "mk14_hot_s":"2XA", "mk14_c":"1C", "mk14":"1A", - "mk14_s":"2A" + "mk14_s":"2A", + "mk14_e": "LABS" } if hotendId in _EXTRUDER_NAME_MAP: return _EXTRUDER_NAME_MAP[hotendId] diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 459ba6f0a0..915804944e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -354,7 +354,6 @@ "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_surface_fan_speed": { "value": 0 }, - "raft_surface_wall_count": { "value": "raft_wall_count" }, "raft_wall_count": { "value": 2 }, "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, @@ -365,7 +364,7 @@ "retraction_hop": { "value": 0.4 }, "retraction_hop_enabled": { "value": true }, "retraction_hop_only_when_collides": { "value": false }, - "retraction_min_travel": { "value": "0.6 if extruder_nr == support_extruder_nr else 5" }, + "retraction_min_travel": { "value": "0.6 if material_is_support_material else 5" }, "retraction_prime_speed": { "value": "retraction_speed" }, "retraction_speed": { "value": 5 }, "roofing_layer_count": { "value": 2 }, @@ -392,35 +391,34 @@ "speed_wall_0": { "value": "speed_wall * 30/40" }, "speed_wall_x": { "value": "speed_wall" }, "support_angle": { "value": 40 }, - "support_bottom_distance": { "value": "layer_height if extruder_nr == support_extruder_nr else support_z_distance" }, - "support_bottom_enable": { "value": "False if extruder_nr == support_extruder_nr else True" }, + "support_bottom_distance": { "value": "layer_height if material_is_support_material else support_z_distance" }, + "support_bottom_enable": { "value": "not(material_is_support_material)" }, "support_bottom_height": { "value": "2*support_infill_sparse_thickness" }, "support_bottom_material_flow": { "value": "material_flow" }, - "support_bottom_wall_count": { "value": "0 if extruder_nr == support_extruder_nr else support_wall_count" }, + "support_bottom_wall_count": { "value": "0 if material_is_support_material else support_wall_count" }, "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 if extruder_nr == support_extruder_nr else false" }, + "support_fan_enable": { "value": "material_is_support_material" }, "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 if extruder_nr == support_extruder_nr else 0.8" }, + "support_interface_offset": { "value": "1 if material_is_support_material else 0.8" }, "support_interface_pattern": { "value": "'lines'" }, - "support_interface_wall_count": { "value": "1 if extruder_nr == support_extruder_nr else 2" }, + "support_interface_wall_count": { "value": "1 if material_is_support_material else 2" }, "support_material_flow": { "value": "material_flow" }, - "support_offset": { "value": "1.8 if extruder_nr == support_extruder_nr else 0.8" }, + "support_offset": { "value": "1.8 if material_is_support_material else 0.8" }, "support_pattern": { "value": "'lines'" }, - "support_roof_height": { "value": "4*layer_height if extruder_nr == support_extruder_nr else 5*layer_height" }, + "support_roof_height": { "value": "4*layer_height if material_is_support_material else 5*layer_height" }, "support_roof_material_flow": { "value": "material_flow" }, "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_top_distance": { "value": 0.25 }, + "support_top_distance": { "value": "0.25 if material_is_support_material else support_z_distance" }, "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" }, - "support_xy_distance": { "value": "0.3 if extruder_nr == support_infill_extruder_nr else 0.2" }, - "support_xy_distance_overhang": { "value": "0.3 if extruder_nr == support_infill_extruder_nr else 0.2" }, - "support_z_distance": { "value": 0 }, + "support_xy_distance": { "value": "0.3 if material_is_support_material else 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" }, 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 3a1c0340fa..66464f600e 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 @@ -5,7 +5,6 @@ version = 4 [metadata] intent_category = solid -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 f4029c6c1d..c9f5024258 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 @@ -5,7 +5,6 @@ version = 4 [metadata] intent_category = solid -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 0a10d33053..6dbbce3d78 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 @@ -5,7 +5,6 @@ version = 4 [metadata] intent_category = solid -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 c0d0816b3d..6e5f8557c5 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 @@ -5,7 +5,6 @@ version = 4 [metadata] intent_category = solid -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 c0f3cce227..4d8abac231 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 @@ -5,7 +5,6 @@ version = 4 [metadata] intent_category = solid -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 bbad6fef50..984fa20ae1 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 @@ -5,7 +5,6 @@ version = 4 [metadata] intent_category = solid -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 6cf24c7b52..df002a46a2 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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +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.18 -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_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4 raft_base_thickness = 0.6 raft_interface_infill_overlap = 25 raft_interface_layers = 1 @@ -58,7 +60,6 @@ support_line_width = =line_width * 0.75 support_material_flow = =material_flow * 0.8 support_offset = 3 support_roof_density = =support_interface_density -support_roof_line_width = =line_width support_top_distance = =support_z_distance support_xy_distance = 0.3 support_xy_overrides_z = xy_overrides_z 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 389edf7dea..735c96dce3 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 @@ -16,10 +16,10 @@ cool_fan_enabled = False material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 -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_line_spacing = =3 if extruder_nr == support_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1 raft_base_speed = 10 -raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 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 55251be6ee..1fb9fe52c6 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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +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.18 -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_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4 raft_base_thickness = 0.6 raft_interface_infill_overlap = 25 raft_interface_layers = 1 @@ -58,7 +60,6 @@ support_line_width = =line_width * 0.75 support_material_flow = =material_flow * 0.8 support_offset = 3 support_roof_density = =support_interface_density -support_roof_line_width = =line_width support_top_distance = =support_z_distance support_xy_distance = 0.3 support_xy_overrides_z = xy_overrides_z 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 5914ed2631..8110479fad 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 @@ -16,10 +16,10 @@ cool_fan_enabled = False material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 -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_line_spacing = =3 if extruder_nr == support_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1 raft_base_speed = 10 -raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 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 8e27847b50..a101cda60a 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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +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.18 -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_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4 raft_base_thickness = 0.6 raft_interface_infill_overlap = 25 raft_interface_layers = 1 @@ -58,7 +60,6 @@ support_line_width = =line_width * 0.75 support_material_flow = =material_flow * 0.8 support_offset = 3 support_roof_density = =support_interface_density -support_roof_line_width = =line_width support_top_distance = =support_z_distance support_xy_distance = 0.3 support_xy_overrides_z = xy_overrides_z 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 18f1664cfc..adee1fb2c8 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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +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.18 -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_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4 raft_base_thickness = 0.6 raft_interface_infill_overlap = 25 raft_interface_layers = 1 @@ -58,7 +60,6 @@ support_line_width = =line_width * 0.75 support_material_flow = =material_flow * 0.8 support_offset = 3 support_roof_density = =support_interface_density -support_roof_line_width = =line_width support_top_distance = =support_z_distance support_xy_distance = 0.3 support_xy_overrides_z = xy_overrides_z 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 e7bb6d04a9..a6168049a0 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 @@ -48,7 +48,6 @@ support_interface_offset = 1.2 support_line_width = 0.35 support_material_flow = 90 support_roof_density = 82 -support_roof_line_width = 0.4 support_use_towers = True support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 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 ba00b5e258..40f28e2fc9 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 @@ -1,10 +1,9 @@ [general] definition = ultimaker_methodx -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 fb7b2f6407..c3b8af89c4 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 @@ -16,10 +16,10 @@ cool_fan_enabled = False material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 -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_line_spacing = =3 if extruder_nr == support_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1 raft_base_speed = 10 -raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 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 810e1b06b5..dcd5c5c37e 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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +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.18 -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_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4 raft_base_thickness = 0.6 raft_interface_infill_overlap = 25 raft_interface_layers = 1 @@ -58,7 +60,6 @@ support_line_width = =line_width * 0.75 support_material_flow = =material_flow * 0.8 support_offset = 3 support_roof_density = =support_interface_density -support_roof_line_width = =line_width support_top_distance = =support_z_distance support_xy_distance = 0.3 support_xy_overrides_z = xy_overrides_z 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 1b4b058205..c0e986cc63 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 @@ -1,10 +1,9 @@ [general] definition = ultimaker_methodx -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 23f00d8876..0ae75f38d3 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 @@ -1,10 +1,9 @@ [general] definition = ultimaker_methodx -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True material = ultimaker_sr30_175 quality_type = draft setting_version = 23 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 0d76434071..3404794777 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 @@ -48,7 +48,6 @@ support_interface_offset = 1.2 support_line_width = 0.35 support_material_flow = 90 support_roof_density = 82 -support_roof_line_width = 0.4 support_use_towers = True support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 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 cfdc7c6f73..02a32fa36f 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 @@ -1,10 +1,9 @@ [general] definition = ultimaker_methodx -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 2bac359e87..c61b20431a 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 @@ -16,10 +16,10 @@ cool_fan_enabled = False material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 -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_line_spacing = =3 if extruder_nr == support_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1 raft_base_speed = 10 -raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 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 cdda6c0121..14e3abc264 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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +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.18 -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_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4 raft_base_thickness = 0.6 raft_interface_infill_overlap = 25 raft_interface_layers = 1 @@ -58,7 +60,6 @@ support_line_width = =line_width * 0.75 support_material_flow = =material_flow * 0.8 support_offset = 3 support_roof_density = =support_interface_density -support_roof_line_width = =line_width support_top_distance = =support_z_distance support_xy_distance = 0.3 support_xy_overrides_z = xy_overrides_z 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 5b67fa2c15..d50d793924 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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +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.18 -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_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4 raft_base_thickness = 0.6 raft_interface_infill_overlap = 25 raft_interface_line_spacing = 0.75 @@ -56,7 +58,6 @@ support_line_width = =line_width * 0.75 support_material_flow = =material_flow * 0.8 support_offset = 3 support_roof_density = =support_interface_density -support_roof_line_width = =line_width support_top_distance = =support_z_distance support_xy_distance = 0.3 support_xy_overrides_z = xy_overrides_z 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 8c6f9160fb..2207927d8f 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 @@ -50,7 +50,6 @@ support_interface_offset = 1.2 support_line_width = 0.35 support_material_flow = 90 support_roof_density = 82 -support_roof_line_width = 0.4 support_use_towers = True support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 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 070a3442de..3a56746b55 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 @@ -1,10 +1,9 @@ [general] definition = ultimaker_methodxl -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 185ba248c3..d0d5d6f5e8 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 @@ -16,10 +16,10 @@ cool_fan_enabled = False material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 -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_line_spacing = =3 if extruder_nr == support_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1 raft_base_speed = 10 -raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 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 7c4cd17fbc..e3dbf7911c 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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +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.18 -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_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4 raft_base_thickness = 0.6 raft_interface_infill_overlap = 25 raft_interface_line_spacing = 0.75 @@ -56,7 +58,6 @@ support_line_width = =line_width * 0.75 support_material_flow = =material_flow * 0.8 support_offset = 3 support_roof_density = =support_interface_density -support_roof_line_width = =line_width support_top_distance = =support_z_distance support_xy_distance = 0.3 support_xy_overrides_z = xy_overrides_z 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 4136dc9fb6..ab299f64aa 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 @@ -1,10 +1,9 @@ [general] definition = ultimaker_methodxl -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 0eff093084..8791fa37e1 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 @@ -1,10 +1,9 @@ [general] definition = ultimaker_methodxl -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True material = ultimaker_sr30_175 quality_type = draft setting_version = 23 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 f37cc65f31..4b0d7cf1d1 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 @@ -50,7 +50,6 @@ support_interface_offset = 1.2 support_line_width = 0.35 support_material_flow = 90 support_roof_density = 82 -support_roof_line_width = 0.4 support_use_towers = True support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 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 9fc3cbc4eb..0dbe4410df 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 @@ -1,10 +1,9 @@ [general] definition = ultimaker_methodxl -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True material = ultimaker_asa_175 quality_type = draft setting_version = 23 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 ffc67dc4e8..a75c479cbd 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 @@ -16,10 +16,10 @@ cool_fan_enabled = False material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 -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_line_spacing = =3 if extruder_nr == support_extruder_nr else 2 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1 raft_base_speed = 10 -raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4 retraction_amount = 0.5 retraction_min_travel = 3.2 small_skin_width = 3.6 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 26b0ed2be0..55fee9f30f 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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10 cool_min_speed = 5 cool_min_temperature = 205 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +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.18 -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_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8 +raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4 raft_base_thickness = 0.6 raft_interface_infill_overlap = 25 raft_interface_line_spacing = 0.75 @@ -56,7 +58,6 @@ support_line_width = =line_width * 0.75 support_material_flow = =material_flow * 0.8 support_offset = 3 support_roof_density = =support_interface_density -support_roof_line_width = =line_width support_top_distance = =support_z_distance support_xy_distance = 0.3 support_xy_overrides_z = xy_overrides_z