From beac50d44f10a723061a3bf22fb3c5e19f7cb918 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 26 Feb 2025 13:02:41 +0100 Subject: [PATCH 01/72] Fix fallback for when a material was selected that didn't have the current intent. CURA-12406 --- cura/Machines/Models/ActiveIntentQualitiesModel.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cura/Machines/Models/ActiveIntentQualitiesModel.py b/cura/Machines/Models/ActiveIntentQualitiesModel.py index f9acb9a970..41119f2c10 100644 --- a/cura/Machines/Models/ActiveIntentQualitiesModel.py +++ b/cura/Machines/Models/ActiveIntentQualitiesModel.py @@ -72,6 +72,12 @@ class ActiveIntentQualitiesModel(ListModel): new_items.append(intent) added_quality_type_set.add(intent["quality_type"]) + # If there aren't any possibilities when the Intent is kept the same, set it 'back' to default. + if len(new_items) == 0 and self._intent_category != "default": + IntentManager.getInstance().selectIntent("default", global_stack.quality.getMetaDataEntry("quality_type")) + self._update() + return + new_items = sorted(new_items, key=lambda x: x["layer_height"]) self.setItems(new_items) From 4e7807b0fc729bcb93e07c08f926860b5ffd265c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 26 Feb 2025 13:25:02 +0100 Subject: [PATCH 02/72] Prevent crash when the quality-type is _actually_ not supported. part of CURA-12406 --- cura/Machines/Models/ActiveIntentQualitiesModel.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/Machines/Models/ActiveIntentQualitiesModel.py b/cura/Machines/Models/ActiveIntentQualitiesModel.py index 41119f2c10..ce0e958368 100644 --- a/cura/Machines/Models/ActiveIntentQualitiesModel.py +++ b/cura/Machines/Models/ActiveIntentQualitiesModel.py @@ -72,9 +72,10 @@ class ActiveIntentQualitiesModel(ListModel): new_items.append(intent) added_quality_type_set.add(intent["quality_type"]) - # If there aren't any possibilities when the Intent is kept the same, set it 'back' to default. - if len(new_items) == 0 and self._intent_category != "default": - IntentManager.getInstance().selectIntent("default", global_stack.quality.getMetaDataEntry("quality_type")) + # If there aren't any possibilities when the Intent is kept the same, attempt to set it 'back' to default. + current_quality_type = global_stack.quality.getMetaDataEntry("quality_type") + if len(new_items) == 0 and self._intent_category != "default" and current_quality_type != "not_supported": + IntentManager.getInstance().selectIntent("default", current_quality_type) self._update() return From f9b8bc20c256b7b00cd7242b0cc553b53ecd6f4a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 26 Feb 2025 15:02:06 +0100 Subject: [PATCH 03/72] Fix single-line statement processing CURA-12386 The regex was not specific enough and would catch the rest of the line, now we force stopping as soon as we see a { or } --- plugins/CuraEngineBackend/StartSliceJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 875bbe153b..b276469d09 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -76,7 +76,7 @@ class GcodeStartEndFormatter: # will be used. Alternatively, if the expression is formatted as "{[expression], [extruder_nr]}", # then the expression will be evaluated with the extruder stack of the specified extruder_nr. - _instruction_regex = re.compile(r"{(?Pif|else|elif|endif)?\s*(?P.*?)\s*(?:,\s*(?P.*))?\s*}(?P\n?)") + _instruction_regex = re.compile(r"{(?Pif|else|elif|endif)?\s*(?P[^{}]*?)\s*(?:,\s*(?P[^{}]*))?\s*}(?P\n?)") def __init__(self, all_extruder_settings: Dict[str, Dict[str, Any]], default_extruder_nr: int = -1) -> None: super().__init__() From 2f2a93b9d00fe0434efdb279f60e05ba57e2d9ea Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 26 Feb 2025 15:02:22 +0100 Subject: [PATCH 04/72] Add unit test for single-line statement CURA-12386 --- conandata.yml | 4 ++++ tests/Machines/TestStartEndGCode.py | 22 +++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/conandata.yml b/conandata.yml index 9ad6f889b5..5af5cdef64 100644 --- a/conandata.yml +++ b/conandata.yml @@ -265,6 +265,10 @@ pycharm_targets: module_name: Cura name: pytest in TestSettingVisibilityPresets.py script_name: tests/Settings/TestSettingVisibilityPresets.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestStartEndGCode.py + script_name: tests/Machines/TestStartEndGCode.py pip_requirements_core: any_os: diff --git a/tests/Machines/TestStartEndGCode.py b/tests/Machines/TestStartEndGCode.py index 13c14f5acc..611567bacd 100644 --- a/tests/Machines/TestStartEndGCode.py +++ b/tests/Machines/TestStartEndGCode.py @@ -7,12 +7,6 @@ from unittest.mock import MagicMock from plugins.CuraEngineBackend.StartSliceJob import GcodeStartEndFormatter -# def createMockedInstanceContainer(container_id): -# result = MagicMock() -# result.getId = MagicMock(return_value=container_id) -# result.getMetaDataEntry = MagicMock(side_effect=getMetadataEntrySideEffect) -# return result - class MockValueProvider: ## Creates a mock value provider. # @@ -259,7 +253,7 @@ Q2000 '' ), -( + ( 'Unexpected end character', None, '''{if material_temperature > 200, 0}} @@ -270,6 +264,20 @@ S2000 '''S2000 ''' ), + + ( + 'Multiple replaces on single line', + None, +'''BT={bed_temperature} IE={initial_extruder}''', +'''BT=50.0 IE=0''' + ), + + ( + 'Multiple extruder replaces on single line', + None, +'''MT0={material_temperature, 0} MT1={material_temperature, 1}''', +'''MT0=190.0 MT1=210.0''' + ), ] def pytest_generate_tests(metafunc): From 667a27e2d289a45496c82008611d7cc6da98b285 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 26 Feb 2025 16:49:29 +0100 Subject: [PATCH 05/72] change setting-version for base definitions as well (5.9 -> 5.10) part of CURA-12359 --- resources/definitions/fdmextruder.def.json | 2 +- resources/definitions/fdmprinter.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 684fff180b..5ba963bf71 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -7,7 +7,7 @@ "author": "Ultimaker", "manufacturer": "Unknown", "position": "0", - "setting_version": 24, + "setting_version": 25, "type": "extruder" }, "settings": diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 038d2de2f4..cee1c10e1f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6,7 +6,7 @@ "type": "machine", "author": "Unknown", "manufacturer": "Unknown", - "setting_version": 24, + "setting_version": 25, "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g", "visible": false, "has_materials": true, From 64cdb31252fd6844adc5f731776649ddde6d5c2b Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 26 Feb 2025 17:06:27 +0100 Subject: [PATCH 06/72] Due to collapsing pop-ups on scrollbar change fix, textfields also lost focus. CURA-12254 --- resources/qml/Settings/SettingItem.qml | 1 + resources/qml/Settings/SettingTextField.qml | 5 +++++ resources/qml/Settings/SettingView.qml | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index f46c59ff61..744ce8b197 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -53,6 +53,7 @@ Item signal showTooltip(string text) signal hideTooltip() signal showAllHiddenInheritedSettings(string category_id) + signal setScrollPositionChangeLoseFocus(bool lose_focus) function createTooltipText() { diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index f49b688c18..5259e5ea75 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -148,6 +148,11 @@ SettingItem if(activeFocus) { base.focusReceived(); + setScrollPositionChangeLoseFocus(false); + } + else + { + setScrollPositionChangeLoseFocus(true); } base.focusGainedByClick = false; } diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index c5fed795d5..9622998595 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -15,6 +15,7 @@ Item property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel() property bool findingSettings + property bool loseFocusOnScrollPositionChange: true Item { @@ -195,7 +196,7 @@ Item onPositionChanged: { // This removes focus from items when scrolling. // This fixes comboboxes staying open and scrolling container - if (!activeFocus && !filter.activeFocus) { + if (!activeFocus && !filter.activeFocus && loseFocusOnScrollPositionChange) { forceActiveFocus(); } } @@ -378,6 +379,10 @@ Item } } } + function onSetScrollPositionChangeLoseFocus(lose_focus) + { + loseFocusOnScrollPositionChange = lose_focus; + } } } From 8aacf63f4aa524472c715fd8b2978572c2a11492 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 27 Feb 2025 11:29:46 +0100 Subject: [PATCH 07/72] Improved self-support settings for the S8. Better release due to the horizontal expansion. More robustness due to brims, and larger build plate trunks and avoid travel over support. Faster printing due to higher support speeds and less tree branches.Improved part strength due to higher infill flow rates. Added 1 flooring layer to all Ultimaker machines to improve bottom part quality. Small bug fixes to the sketch/replicator profiles. Updated settings version def files. PP-580 PP-581 --- resources/definitions/ultimaker.def.json | 10 +++++++++ .../ultimaker_replicator_plus.def.json | 2 +- resources/definitions/ultimaker_s8.def.json | 21 +++++++++++++------ .../definitions/ultimaker_sketch.def.json | 5 +---- .../um_s8_bb0.4_pva_0.15mm.inst.cfg | 1 + .../um_s8_bb0.4_pva_0.1mm.inst.cfg | 1 + .../um_s8_bb0.4_pva_0.2mm.inst.cfg | 1 + .../um_s8_bb0.4_pva_0.3mm.inst.cfg | 1 + 8 files changed, 31 insertions(+), 11 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 65ceaf6f0f..97cb472f24 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -14,8 +14,11 @@ }, "overrides": { + "acceleration_flooring": { "value": "acceleration_roofing" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_travel_enabled": { "value": false }, + "acceleration_wall_0_flooring": { "value": "acceleration_wall_0_roofing" }, + "acceleration_wall_x_flooring": { "value": "acceleration_wall_x_roofing" }, "bottom_layers": { "value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))" }, "bridge_enable_more_layers": { "value": false }, "bridge_fan_speed": { "value": "cool_fan_speed_max" }, @@ -43,11 +46,13 @@ "cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" }, "cool_min_temperature": { "value": "max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15])" }, "extra_infill_lines_to_support_skins": { "value": "'none'" }, + "flooring_layer_count": { "value": "1" }, "gradual_support_infill_step_height": { "value": "4 * layer_height" }, "gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" }, "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, "infill_overlap": { "value": "0 if infill_sparse_density > 80 else 10" }, "inset_direction": { "value": "'outside_in'" }, + "jerk_flooring": { "value": "jerk_roofing" }, "jerk_infill": { "minimum_value_warning": 20 }, "jerk_prime_tower": { "minimum_value_warning": 20 }, "jerk_print": @@ -65,6 +70,8 @@ "jerk_travel_enabled": { "value": false }, "jerk_wall": { "minimum_value_warning": 20 }, "jerk_wall_0": { "minimum_value_warning": 20 }, + "jerk_wall_0_flooring": { "value": "jerk_wall_0_roofing" }, + "jerk_wall_x_flooring": { "value": "jerk_wall_x_roofing" }, "layer_height": { "value": 0.15 }, "layer_height_0": { "value": "max(0.2, layer_height)" }, "line_width": { "value": "machine_nozzle_size" }, @@ -116,9 +123,12 @@ "skin_monotonic": { "value": "roofing_layer_count == 0" }, "skin_overlap": { "value": "20" }, "speed_equalize_flow_width_factor": { "value": "110.0" }, + "speed_flooring": { "value": "speed_roofing" }, "speed_layer_0": { "value": "min(30, layer_height / layer_height_0 * speed_wall_0)" }, "speed_slowdown_layers": { "value": 1 }, "speed_travel_layer_0": { "value": "speed_travel" }, + "speed_wall_0_flooring": { "value": "speed_wall_0_roofing" }, + "speed_wall_x_flooring": { "value": "speed_wall_x_roofing" }, "support_infill_rate": { "value": "0 if support_structure == 'tree' else 80 if gradual_support_infill_steps != 0 else 15" }, "support_initial_layer_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "support_interface_height": { "value": "2 * layer_height" }, diff --git a/resources/definitions/ultimaker_replicator_plus.def.json b/resources/definitions/ultimaker_replicator_plus.def.json index 6616b98143..edfab6d962 100644 --- a/resources/definitions/ultimaker_replicator_plus.def.json +++ b/resources/definitions/ultimaker_replicator_plus.def.json @@ -65,7 +65,7 @@ "machine_extruder_trains": { "0": "ultimaker_replicator_extruder" }, "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "draft", - "preferred_variant_name": "ultimaker_replicator_smart_extruder_plus", + "preferred_variant_name": "Smart Extruder+", "reference_machine_id": "replicator_b", "supports_network_connection": true, "supports_usb_connection": false, diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index 6d71240c83..ff0e9b9bc4 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -69,8 +69,8 @@ "acceleration_wall_0_roofing": { "value": "acceleration_wall_0" }, "acceleration_wall_x": { "value": "acceleration_print" }, "acceleration_wall_x_roofing": { "value": "acceleration_wall" }, - "adhesion_type": { "value": "'skirt'" }, - "bottom_thickness": { "value": "3*layer_height if top_layers==4 else top_bottom_thickness" }, + "adhesion_type": { "value": "'brim' if support_enable and support_structure=='tree' else 'skirt'" }, + "bottom_thickness": { "value": "3*layer_height if top_layers==4 and not support_enable else top_bottom_thickness" }, "bridge_skin_material_flow": { "value": 200 }, "bridge_skin_speed": { @@ -94,6 +94,7 @@ "extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" }, "gradual_flow_enabled": { "value": false }, "hole_xy_offset": { "value": 0.075 }, + "infill_material_flow": { "value": "1.1*material_flow" }, "infill_overlap": { "value": 10 }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, "infill_sparse_density": { "value": 15 }, @@ -319,7 +320,7 @@ "speed_support": { "maximum_value_warning": 300, - "value": "speed_wall_0" + "value": "speed_print" }, "speed_support_bottom": { @@ -334,7 +335,7 @@ "speed_support_interface": { "maximum_value_warning": 300, - "value": 50 + "value": 80 }, "speed_support_roof": { @@ -381,14 +382,22 @@ "maximum_value_warning": 300, "value": "speed_wall" }, - "support_brim_line_count": { "value": 5 }, - "support_infill_rate": { "value": "80 if gradual_support_infill_steps != 0 else 15" }, + "support_angle": { "value": 60 }, + "support_bottom_offset": { "value": 0 }, + "support_brim_width": { "value": 10 }, "support_interface_enable": { "value": true }, + "support_interface_offset": { "value": "support_offset" }, + "support_offset": { "value": "1.2 if support_structure == 'tree' else 0.8" }, "support_pattern": { "value": "'gyroid' if support_structure == 'tree' else 'lines'" }, "support_structure": { "value": "'normal'" }, + "support_tree_bp_diameter": { "value": 15 }, + "support_tree_tip_diameter": { "value": 1.0 }, + "support_tree_top_rate": { "value": 20 }, + "support_xy_distance_overhang": { "value": "machine_nozzle_size" }, "support_z_distance": { "value": "0.4*material_shrinkage_percentage_z/100.0" }, "top_bottom_thickness": { "value": "round(4*layer_height, 2)" }, "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, "wall_0_acceleration": { "value": 1000 }, "wall_0_deceleration": { "value": 1000 }, "wall_0_end_speed_ratio": { "value": 100 }, diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index bcd3e3891b..a49dd432af 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -55,10 +55,6 @@ "basf_", "jabil_", "polymaker_", - "ultimaker_rapidrinse", - "ultimaker_sr30", - "ultimaker_petg", - "ultimaker_pva", "ultimaker_pc-abs", "ultimaker_pc-abs-fr" ], @@ -66,6 +62,7 @@ "has_materials": true, "has_variants": true, "machine_extruder_trains": { "0": "ultimaker_sketch_extruder" }, + "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "draft", "preferred_variant_name": "0.4mm", "reference_machine_id": "sketch", diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg index 9e1a57ffb5..9539bd42b1 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg @@ -23,6 +23,7 @@ retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) speed_prime_tower = 25 speed_support = 50 +support_angle = 45 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True support_z_distance = 0 diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg index ea171f4852..d5e6084c76 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg @@ -24,6 +24,7 @@ retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) speed_prime_tower = 25 speed_support = 50 +support_angle = 45 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True support_z_distance = 0 diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg index 475187c3bf..3c29ca8186 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg @@ -24,6 +24,7 @@ retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) speed_prime_tower = 25 speed_support = 50 +support_angle = 45 support_interface_enable = True support_z_distance = 0 diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg index 05cdcfcc8e..a49cea6817 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg @@ -24,6 +24,7 @@ retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) speed_prime_tower = 25 speed_support = 50 +support_angle = 45 support_infill_sparse_thickness = 0.3 support_interface_enable = True support_z_distance = 0 From f2098b570f52cc75f3f7947176040abb9aee4f4c Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:28:01 +0100 Subject: [PATCH 08/72] Moved flooring settings from ultimaker.def.json to the S8 only to reduce risk. Added support_wall_count is 2 (forgot this in the original commit). PP-580 --- resources/definitions/ultimaker.def.json | 10 ------ resources/definitions/ultimaker_s8.def.json | 35 +++++++++++++++++++++ 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 97cb472f24..65ceaf6f0f 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -14,11 +14,8 @@ }, "overrides": { - "acceleration_flooring": { "value": "acceleration_roofing" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_travel_enabled": { "value": false }, - "acceleration_wall_0_flooring": { "value": "acceleration_wall_0_roofing" }, - "acceleration_wall_x_flooring": { "value": "acceleration_wall_x_roofing" }, "bottom_layers": { "value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))" }, "bridge_enable_more_layers": { "value": false }, "bridge_fan_speed": { "value": "cool_fan_speed_max" }, @@ -46,13 +43,11 @@ "cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" }, "cool_min_temperature": { "value": "max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15])" }, "extra_infill_lines_to_support_skins": { "value": "'none'" }, - "flooring_layer_count": { "value": "1" }, "gradual_support_infill_step_height": { "value": "4 * layer_height" }, "gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" }, "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, "infill_overlap": { "value": "0 if infill_sparse_density > 80 else 10" }, "inset_direction": { "value": "'outside_in'" }, - "jerk_flooring": { "value": "jerk_roofing" }, "jerk_infill": { "minimum_value_warning": 20 }, "jerk_prime_tower": { "minimum_value_warning": 20 }, "jerk_print": @@ -70,8 +65,6 @@ "jerk_travel_enabled": { "value": false }, "jerk_wall": { "minimum_value_warning": 20 }, "jerk_wall_0": { "minimum_value_warning": 20 }, - "jerk_wall_0_flooring": { "value": "jerk_wall_0_roofing" }, - "jerk_wall_x_flooring": { "value": "jerk_wall_x_roofing" }, "layer_height": { "value": 0.15 }, "layer_height_0": { "value": "max(0.2, layer_height)" }, "line_width": { "value": "machine_nozzle_size" }, @@ -123,12 +116,9 @@ "skin_monotonic": { "value": "roofing_layer_count == 0" }, "skin_overlap": { "value": "20" }, "speed_equalize_flow_width_factor": { "value": "110.0" }, - "speed_flooring": { "value": "speed_roofing" }, "speed_layer_0": { "value": "min(30, layer_height / layer_height_0 * speed_wall_0)" }, "speed_slowdown_layers": { "value": 1 }, "speed_travel_layer_0": { "value": "speed_travel" }, - "speed_wall_0_flooring": { "value": "speed_wall_0_roofing" }, - "speed_wall_x_flooring": { "value": "speed_wall_x_roofing" }, "support_infill_rate": { "value": "0 if support_structure == 'tree' else 80 if gradual_support_infill_steps != 0 else 15" }, "support_initial_layer_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "support_interface_height": { "value": "2 * layer_height" }, diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index ff0e9b9bc4..cc9c97aebd 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -92,6 +92,7 @@ "cool_min_temperature": { "value": "material_print_temperature-15" }, "default_material_print_temperature": { "maximum_value_warning": 320 }, "extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" }, + "flooring_layer_count": { "value": "1" }, "gradual_flow_enabled": { "value": false }, "hole_xy_offset": { "value": 0.075 }, "infill_material_flow": { "value": "1.1*material_flow" }, @@ -100,6 +101,12 @@ "infill_sparse_density": { "value": 15 }, "infill_wall_line_count": { "value": "1 if infill_sparse_density > 80 else 0" }, "initial_bottom_layers": { "value": 2 }, + "jerk_flooring": + { + "maximum_value_warning": "machine_max_jerk_xy / 2", + "unit": "m/s\u00b3", + "value": "jerk_roofing" + }, "jerk_infill": { "maximum_value_warning": "machine_max_jerk_xy / 2", @@ -203,6 +210,12 @@ "unit": "m/s\u00b3", "value": "jerk_wall" }, + "jerk_wall_0_flooring": + { + "maximum_value_warning": "machine_max_jerk_xy / 2", + "unit": "m/s\u00b3", + "value": "jerk_wall_0_roofing" + }, "jerk_wall_0_roofing": { "maximum_value_warning": "machine_max_jerk_xy / 2", @@ -215,6 +228,12 @@ "unit": "m/s\u00b3", "value": "jerk_print" }, + "jerk_wall_x_flooring": + { + "maximum_value_warning": "machine_max_jerk_xy / 2", + "unit": "m/s\u00b3", + "value": "jerk_wall_x_roofing" + }, "jerk_wall_x_roofing": { "maximum_value_warning": "machine_max_jerk_xy / 2", @@ -282,6 +301,11 @@ "skirt_line_count": { "value": 5 }, "small_skin_on_surface": { "value": false }, "small_skin_width": { "value": 4 }, + "speed_flooring": + { + "maximum_value_warning": 300, + "value": "speed_roofing" + }, "speed_infill": { "maximum_value_warning": 300, @@ -367,6 +391,11 @@ "maximum_value_warning": 300, "value": "speed_wall" }, + "speed_wall_0_flooring": + { + "maximum_value_warning": 300, + "value": "speed_wall_0_roofing" + }, "speed_wall_0_roofing": { "maximum_value_warning": 300, @@ -377,6 +406,11 @@ "maximum_value_warning": 300, "value": "speed_print" }, + "speed_wall_x_flooring": + { + "maximum_value_warning": 300, + "value": "speed_wall_x_roofing" + }, "speed_wall_x_roofing": { "maximum_value_warning": 300, @@ -393,6 +427,7 @@ "support_tree_bp_diameter": { "value": 15 }, "support_tree_tip_diameter": { "value": 1.0 }, "support_tree_top_rate": { "value": 20 }, + "support_wall_count": { "value": 2 }, "support_xy_distance_overhang": { "value": "machine_nozzle_size" }, "support_z_distance": { "value": "0.4*material_shrinkage_percentage_z/100.0" }, "top_bottom_thickness": { "value": "round(4*layer_height, 2)" }, From 361af172128a5f580941d262b09fd80afdfa07d2 Mon Sep 17 00:00:00 2001 From: h1data Date: Sun, 2 Mar 2025 13:53:29 +0900 Subject: [PATCH 09/72] Updated ja translation for 5.10 --- resources/i18n/ja_JP/cura.po | 66 +++++------ resources/i18n/ja_JP/fdmextruder.def.json.po | 10 +- resources/i18n/ja_JP/fdmprinter.def.json.po | 118 +++++++++---------- 3 files changed, 97 insertions(+), 97 deletions(-) diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 15e8648179..5cc8e60267 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-02-21 15:37+0100\n" -"PO-Revision-Date: 2024-10-30 02:53+0000\n" +"PO-Revision-Date: 2025-03-02 04:30+0000\n" "Last-Translator: h1data \n" "Language-Team: Japanese \n" "Language: ja_JP\n" @@ -175,7 +175,7 @@ msgstr "3Dビュー" msgctxt "name" msgid "3DConnexion mouses" -msgstr "" +msgstr "3DConnexionマウス" msgctxt "@item:inlistbox" msgid "3MF File" @@ -474,7 +474,7 @@ msgstr "G-codeファイルの読み込み、表示を許可する。" msgctxt "description" msgid "Allows working with 3D mouses inside Cura." -msgstr "" +msgstr "Curaで3Dマウスの利用を許可します。" msgctxt "@option:discardOrKeep" msgid "Always ask me this" @@ -1063,7 +1063,7 @@ msgstr "{0}を保存できませんでした: {1}< #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" -msgstr "リムーバブルドライブ{0}に保存することができませんでした: {1}" +msgstr "リムーバブルドライブ{0}に保存できませんでした: {1}" msgctxt "@info:text" msgid "Could not upload the data to the printer." @@ -1461,7 +1461,7 @@ msgstr "リムーバブルデバイス{0}を取り出す" #, python-brace-format msgctxt "@info:status" msgid "Ejected {0}. You can now safely remove the drive." -msgstr "{0}取り出し完了。デバイスを安全に取り外せます。" +msgstr "{0}を取り出しました。デバイスを安全に取り外せます。" msgctxt "@label" msgid "Empty" @@ -1477,7 +1477,7 @@ msgstr "エクストルーダーを有効にする" msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards. Disabling it results in a skirt around object by default." -msgstr "縁またはラフトの印刷を有効にできます。これにより、オブジェクトの周囲または下に平らな部分が追加され、後で簡単に切り取ることができます。無効にすると、デフォルトでオブジェクトの周囲にスカートが形成されます。" +msgstr "ブリムまたはラフトの印刷を有効にできます。これにより、オブジェクトの周囲または下に平らな部分が追加され、後で簡単に切り取ることができます。無効にすると、デフォルトでオブジェクトの周囲にスカートが形成されます。" msgctxt "@label" msgid "Enabled" @@ -1594,7 +1594,7 @@ msgstr "エクストルーダー%1" msgctxt "@label" msgid "Extruder Change duration" -msgstr "" +msgstr "エクストルーダー切り替え時間" msgctxt "@title:label" msgid "Extruder End G-code" @@ -1606,7 +1606,7 @@ msgstr "エクストルーダー終了Gコードの時間" msgctxt "@title:label" msgid "Extruder Prestart G-code" -msgstr "" +msgstr "エクストルーダー開始前G-Code" msgctxt "@title:label" msgid "Extruder Start G-code" @@ -1767,7 +1767,7 @@ msgstr "プリンターと接続されていないため、ファームウェア msgctxt "@label" msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "ファームウェアとは直接お持ちの3Dプリンターを動かすソフトウェアです。このファームウェアはステップモーターを操作し、温度を管理し、プリンターとして成すべき点を補います。" +msgstr "ファームウェアとは直接お持ちの3Dプリンターを動かすソフトウェアです。このファームウェアはステップモーターを操作し、温度を管理し、プリンターを動作できるようにします。" msgctxt "@label" msgid "Firmware update completed." @@ -1799,7 +1799,7 @@ msgstr "次の空き" msgctxt "@option:check" msgid "Flip model's toolhandle Y axis (restart required)" -msgstr "" +msgstr "モデルツールハンドルのY軸を反転（再起動が必要）" msgctxt "@label:listbox" msgid "Flow" @@ -1894,7 +1894,7 @@ msgstr "一般" msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, these parts would collapse during printing." -msgstr "オーバーハングがあるモデルにサポートを生成します。このサポート構造なしでは、プリント中にオーバーハングのパーツが崩壊してしまいます。" +msgstr "オーバーハングがあるモデルにサポートを生成します。このサポート構造なしでは、プリント中にオーバーハングのパーツが崩れてしまいます。" msgctxt "@label:category menu label" msgid "Generic" @@ -2023,7 +2023,7 @@ msgstr "モデルを取り込む" msgctxt "@label:MonitorStatus" msgid "In maintenance. Please check the printer" -msgstr "メンテナンス。プリンターをチェックしてください" +msgstr "メンテナンス中です。プリンターをチェックしてください" msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." @@ -2291,7 +2291,7 @@ msgstr "ビルドプレートを調整する" msgctxt "@title:window The argument is a package name, and the second is the version." msgid "License for %1 %2" -msgstr "" +msgstr "%1 %2のライセンス" msgctxt "@item:inlistbox" msgid "Lighter is higher" @@ -2399,7 +2399,7 @@ msgstr "Makerbotプリントファイルライター" msgctxt "@item:inlistbox" msgid "Makerbot Replicator+ Printfile" -msgstr "" +msgstr "Makerbot Replicator+ プリントファイル" msgctxt "@item:inlistbox" msgid "Makerbot Sketch Printfile" @@ -2459,7 +2459,7 @@ msgstr "プリンター管理" msgctxt "@text" msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." -msgstr "UltiMaker Curaのプラグインと材料プロファイルはここで管理します。プラグインを常に最新の状態に保ち、セットアップのバックアップを定期的に取るようにしてください。" +msgstr "ここでUltiMaker Curaのプラグインと材料プロファイルを管理します。プラグインを常に最新の状態に保ち、セットアップのバックアップを定期的に取るようにしてください。" msgctxt "description" msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." @@ -2467,7 +2467,7 @@ msgstr "アプリケーションの拡張機能を管理し、UltiMakerウェブ msgctxt "description" msgid "Manages network connections to UltiMaker networked printers." -msgstr "Ultimakerのネットワーク接属できるプリンターのネットワーク接続を管理します。" +msgstr "ネットワーク対応Ultimakerプリンターのネットワーク接続を管理します。" msgctxt "@label" msgid "Manufacturer" @@ -4015,7 +4015,7 @@ msgstr "スライスのクラッシュを自動的にUltimakerに報告するか msgctxt "@info:tooltip" msgid "Should the Y axis of the translate toolhandle be flipped? This will only affect model's Y coordinate, all other settings such as machine Printhead settings are unaffected and still behave as before." -msgstr "" +msgstr "ツールハンドルのY軸移動を反転するかどうか。これはモデルのY軸方向のみに影響し、プリントヘッド設定など他の設定は影響せず、従前と変わらず動作します。" msgctxt "@info:tooltip" msgid "Should the build plate be cleared before loading a new model in the single instance of Cura?" @@ -4255,7 +4255,7 @@ msgstr "開始G-Code" msgctxt "@label" msgid "Start GCode must be first" -msgstr "" +msgstr "開始G-Codeを必ず最初に実行" msgctxt "@label" msgid "Start the slicing process" @@ -4267,7 +4267,7 @@ msgstr "開始" msgctxt "@text" msgid "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users." -msgstr "素晴らしいユーザーコミュニティから提供されるプラグインを活用して、ワークフローを合理化し、UltiMaker Cura体験をカスタマイズすることができます。" +msgstr "素晴らしいユーザーコミュニティから提供されるプラグインを活用して、ワークフローを合理化し、UltiMaker Cura体験をカスタマイズできます。" msgctxt "@label" msgid "Strength" @@ -4405,7 +4405,7 @@ msgstr "バックアップが最大ファイルサイズを超えています。 msgctxt "@text" msgid "The balanced profile is designed to strike a balance between productivity, surface quality, mechanical properties and dimensional accuracy." -msgstr "バランスのとれたプロファイルは、生産性、表面品質、機械的特性、寸法精度のバランスを取るために設計されています。" +msgstr "バランスプロファイルは、生産性、表面品質、機械的特性、寸法精度のバランスを取るために設計されています。" msgctxt "@info:tooltip" msgid "The base height from the build plate in millimeters." @@ -4470,7 +4470,7 @@ msgstr "{0} は既に存在します。ファイルを上 msgctxt "@label" msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "配達時のファームウェアで動かすことはできますが、新しいバージョンの方がより改善され、便利なフィーチャーがついてきます。" +msgstr "出荷時のファームウェアは動作しますが、新しいバージョンの方がより改善され、便利な機能があります。" msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" @@ -4593,7 +4593,7 @@ msgstr "Digital Factoryからの応答に重要な情報がありません。" msgctxt "@tooltip" msgid "The target temperature of the heated bed. The bed will heat up or cool down towards this temperature. If this is 0, the bed heating is turned off." -msgstr "ヒーティッドベッドの目標温度。ベッドはこの温度に向けて上がったり下がったりします。これが0の場合、ベッドの加熱はオフになっています。" +msgstr "ヒーテッドベッドの目標温度。ベッドはこの温度に向けて上がったり下がったりします。これが0の場合、ベッドの加熱はオフになっています。" msgctxt "@tooltip" msgid "The target temperature of the hotend. The hotend will heat up or cool down towards this temperature. If this is 0, the hotend heating is turned off." @@ -4601,11 +4601,11 @@ msgstr "ホットエンドの目標温度。ホットエンドはこの温度に msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the bed to." -msgstr "ベッドのプリヒート温度。" +msgstr "ベッドのプレヒート温度。" msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." -msgstr "ホットエンドをプリヒートする温度です。" +msgstr "ホットエンドをプレヒートする温度です。" msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." @@ -4633,7 +4633,7 @@ msgstr "このエクストルーダーの構成に一致するプロファイル msgctxt "@info:status" msgid "There is no active printer yet." -msgstr "アクティブなプリンターはありません。" +msgstr "アクティブなプリンターがありません。" msgctxt "@label" msgid "There is no printer found over your network." @@ -4661,7 +4661,7 @@ msgstr "%1 が認識されていないためこの構成は利用できません msgctxt "@label" msgid "This configuration is not available because there is a mismatch or other problem with core-type %1. Please visit the support page to check which cores this printer-type supports w.r.t. new slices." -msgstr "" +msgstr "この設定は不整合あるいはコアタイプ%1による他の問題により無効化されました。サポートページをご覧いただくか、このプリンター機種のどのコアが新しいスライスをサポートしているか確認してください。" msgctxt "@text:window" msgid "This is a Cura Universal project file. Would you like to open it as a Cura Universal Project or import the models from it?" @@ -4669,7 +4669,7 @@ msgstr "これはCura Universal Projectファイルです。Cura Universal Proje msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" -msgstr "これはCuraのプロジェクトファイルです。プロジェクトとしてあけますか、それともモデルのみ取り込みますか？" +msgstr "これはCuraのプロジェクトファイルです。プロジェクトとして開きますか、それともモデルのみ取り込みますか？" msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." @@ -4789,7 +4789,7 @@ msgstr "プリントの成功率を上げるために、ビルドプレートを msgctxt "@label" msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." -msgstr "印刷ジョブをネットワーク上のプリンターに直接送信するため、ネットワークケーブルを使用してプリンターを確実にネットワークに接続するか、プリンターをWiFiネットワークに接続されていることを確認してください。Curaをプリンタに接続していない場合でも、USBドライブを使用してg-codeファイルをプリンターに転送することができます。" +msgstr "印刷ジョブをネットワーク上のプリンターに直接送信するため、ネットワークケーブルを使用してプリンターを確実にネットワークに接続するか、プリンターをWiFiネットワークに接続されていることを確認してください。Curaをプリンタに接続していない場合でも、USBドライブを使用してg-codeファイルをプリンターに転送できます。" #, python-brace-format msgctxt "@message {printer_name} is replaced with the name of the printer" @@ -5032,7 +5032,7 @@ msgstr "Universal Cura Project" msgctxt "@action:description Don't translate 'Universal Cura Project'" msgid "Universal Cura Project files can be printed on different 3D printers while retaining positional data and selected settings. When exported, all models present on the build plate will be included along with their current position, orientation, and scale. You can also select which per-extruder or per-model settings should be included to ensure proper printing." -msgstr "Universal Cura Projectファイルは座標情報と選択した設定を保持し、さまざまな3Dプリンタで印刷することができます。エクスポートすると、ビルドプレート上に存在するすべてのモデルに、現在の位置、方向、拡大率が含まれます。適切な印刷を保証するために、エクストルーダーごとまたはモデルごとにどの設定を含めるかを選択することもできます。" +msgstr "Universal Cura Projectファイルは座標情報と選択した設定を保持し、さまざまな3Dプリンタで印刷できます。エクスポートすると、ビルドプレート上に存在するすべてのモデルに、現在の位置、方向、拡大率が含まれます。適切な印刷を保証するために、エクストルーダーごとまたはモデルごとにどの設定を含めるかを選択できます。" msgctxt "@label" msgid "Unknown" @@ -5229,7 +5229,7 @@ msgstr "Cura 5.8から Cura 5.9に構成をアップグレードします。" msgctxt "description" msgid "Upgrades configurations from Cura 5.9 to Cura 5.10" -msgstr "" +msgstr "Cura 5.9からCura 5.10に構成をアップグレードします。" msgctxt "@action:button" msgid "Upload custom Firmware" @@ -5373,7 +5373,7 @@ msgstr "バージョン5.8から5.9へのアップグレード" msgctxt "name" msgid "Version Upgrade 5.9 to 5.10" -msgstr "" +msgstr "バージョン5.9から5.10へのアップグレード" msgctxt "@button" msgid "View printers in Digital Factory" @@ -5538,11 +5538,11 @@ msgstr "Y（奥行き）" msgctxt "@label" msgid "Y max ( '+' towards front)" -msgstr "" +msgstr "Y座標最大値（'+' で前方へ）" msgctxt "@label" msgid "Y min ( '-' towards back)" -msgstr "" +msgstr "Y座標最小値（'-' で後方へ）" msgctxt "@info" msgid "Yes" diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index 1eb41fa120..47f08685ff 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2025-02-21 15:37+0000\n" -"PO-Revision-Date: 2024-10-27 13:25+0000\n" +"PO-Revision-Date: 2025-02-25 12:01+0000\n" "Last-Translator: h1data \n" "Language-Team: Japanese \n" "Language: ja_JP\n" @@ -38,7 +38,7 @@ msgstr "エクストルーダー" msgctxt "machine_extruder_change_duration label" msgid "Extruder Change duration" -msgstr "" +msgstr "エクストルーダー切り替え時間" msgctxt "machine_extruder_end_code label" msgid "Extruder End G-Code" @@ -62,7 +62,7 @@ msgstr "エクストルーダー終了位置Y座標" msgctxt "machine_extruder_prestart_code label" msgid "Extruder Prestart G-Code" -msgstr "" +msgstr "エクストルーダー開始前G-Code" msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" @@ -146,7 +146,7 @@ msgstr "ノズルY座標オフセット" msgctxt "machine_extruder_prestart_code description" msgid "Prestart g-code to execute before switching to this extruder." -msgstr "" +msgstr "このエクストルーダーに切り替える前に実行される開始前G-Code。" msgctxt "machine_extruder_start_code description" msgid "Start g-code to execute when switching to this extruder." @@ -218,4 +218,4 @@ msgstr "エクストルーダーをオンにする際の開始位置Y座標。" msgctxt "machine_extruder_change_duration description" msgid "When using a multi tool setup, this value is the tool change time in seconds. This value will be added to the estimate time based on the number of changes that occur." -msgstr "" +msgstr "複数のエクストルーダーを用いる構成において、この値はエクストルーダーを切り替える時間を秒で表します。切り替えが発生する回数に基づいて、この値は残り時間に加算されます。" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 4912231339..8fba1311bb 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2025-02-21 15:37+0000\n" -"PO-Revision-Date: 2024-10-30 02:17+0000\n" +"PO-Revision-Date: 2025-03-02 04:31+0000\n" "Last-Translator: h1data \n" "Language-Team: Japanese \n" "Language: ja_JP\n" @@ -34,7 +34,7 @@ msgstr "フィーダーとノズルチャンバーの間でフィラメントが msgctxt "flooring_angles description" msgid "A list of integer line directions to use when the bottom surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "" +msgstr "底面の表面レイヤーがジグザグパターンの場合に使用する、ラインの角度を示す整数のリストです。リストの要素はレイヤーが進むごとに順番に使用され、最後に到達すると次は最初からとなります。リスト項目はカンマ区切りで、リストの全体は四角かっこで囲います。既定は空のリストで、この場合は従来の角度（45度と135度）を用います。" msgctxt "roofing_angles description" msgid "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." @@ -306,71 +306,71 @@ msgstr "底面除去幅" msgctxt "acceleration_wall_x_flooring label" msgid "Bottom Surface Inner Wall Acceleration" -msgstr "" +msgstr "底面内側ウォールの加速度" msgctxt "jerk_wall_x_flooring label" msgid "Bottom Surface Inner Wall Jerk" -msgstr "" +msgstr "底面内側ウォールのジャーク" msgctxt "speed_wall_x_flooring label" msgid "Bottom Surface Inner Wall Speed" -msgstr "" +msgstr "底面内側ウォールの速度" msgctxt "wall_x_material_flow_flooring label" msgid "Bottom Surface Inner Wall(s) Flow" -msgstr "" +msgstr "底面内側ウォールのフロー" msgctxt "acceleration_wall_0_flooring label" msgid "Bottom Surface Outer Wall Acceleration" -msgstr "" +msgstr "底面外側ウォールの加速度" msgctxt "wall_0_material_flow_flooring label" msgid "Bottom Surface Outer Wall Flow" -msgstr "" +msgstr "底面外側ウォールのフロー" msgctxt "jerk_wall_0_flooring label" msgid "Bottom Surface Outer Wall Jerk" -msgstr "" +msgstr "底面外側ウォールのジャーク" msgctxt "speed_wall_0_flooring label" msgid "Bottom Surface Outer Wall Speed" -msgstr "" +msgstr "底面外側ウォールの速度" msgctxt "acceleration_flooring label" msgid "Bottom Surface Skin Acceleration" -msgstr "" +msgstr "底面スキンの加速度" msgctxt "flooring_extruder_nr label" msgid "Bottom Surface Skin Extruder" -msgstr "" +msgstr "底面スキン用エクストルーダー" msgctxt "flooring_material_flow label" msgid "Bottom Surface Skin Flow" -msgstr "" +msgstr "底面スキンのフロー" msgctxt "jerk_flooring label" msgid "Bottom Surface Skin Jerk" -msgstr "" +msgstr "底面スキンのジャーク" msgctxt "flooring_layer_count label" msgid "Bottom Surface Skin Layers" -msgstr "" +msgstr "底面スキンのレイヤー数" msgctxt "flooring_angles label" msgid "Bottom Surface Skin Line Directions" -msgstr "" +msgstr "底面ライン方向" msgctxt "flooring_line_width label" msgid "Bottom Surface Skin Line Width" -msgstr "" +msgstr "底面スキンのライン幅" msgctxt "flooring_pattern label" msgid "Bottom Surface Skin Pattern" -msgstr "" +msgstr "底面スキンのパターン" msgctxt "speed_flooring label" msgid "Bottom Surface Skin Speed" -msgstr "" +msgstr "底面スキンの速度" msgctxt "bottom_thickness label" msgid "Bottom Thickness" @@ -610,7 +610,7 @@ msgstr "コマンドライン設定" msgctxt "flooring_pattern option concentric" msgid "Concentric" -msgstr "" +msgstr "同心円" msgctxt "infill_pattern option concentric" msgid "Concentric" @@ -1122,7 +1122,7 @@ msgstr "ノズル切替え後のプライムに必要な余剰材料。" msgctxt "variant_name" msgid "Extruder" -msgstr "" +msgstr "エクストルーダー" msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" @@ -1222,7 +1222,7 @@ msgstr "最初のレイヤーの底面ラインのフロー補正" msgctxt "wall_x_material_flow_flooring description" msgid "Flow compensation on bottom surface wall lines for all wall lines except the outermost one." -msgstr "" +msgstr "最も外側を除いた底面ウォールのすべてのラインにフロー補正を行います。" msgctxt "infill_material_flow description" msgid "Flow compensation on infill lines." @@ -1234,7 +1234,7 @@ msgstr "支持材の天井面または床面のフロー補正。" msgctxt "flooring_material_flow description" msgid "Flow compensation on lines of the areas at the bottom of the print." -msgstr "" +msgstr "造形物の底におけるラインにフロー補正を行います。" msgctxt "roofing_material_flow description" msgid "Flow compensation on lines of the areas at the top of the print." @@ -1262,7 +1262,7 @@ msgstr "支持材のフロー補正。" msgctxt "wall_0_material_flow_flooring description" msgid "Flow compensation on the bottom surface outermost wall line." -msgstr "" +msgstr "最も外側の底面ウォールのラインにフロー補正を行います。" msgctxt "wall_0_material_flow_layer_0 description" msgid "Flow compensation on the outermost wall line of the first layer." @@ -1482,7 +1482,7 @@ msgstr "Griffin" msgctxt "machine_gcode_flavor option Cheetah" msgid "Griffin+Cheetah" -msgstr "" +msgstr "Griffin+Cheetah" msgctxt "group_outer_walls label" msgid "Group Outer Walls" @@ -1890,7 +1890,7 @@ msgstr "内側から外側へ" msgctxt "retraction_combing_avoid_distance label" msgid "Inside Travel Avoid Distance" -msgstr "" +msgstr "内側の移動経路回避距離" msgctxt "support_interface_priority option interface_lines_overwrite_support_area" msgid "Interface lines preferred" @@ -2082,7 +2082,7 @@ msgstr "ライン幅" msgctxt "flooring_pattern option lines" msgid "Lines" -msgstr "" +msgstr "ライン" msgctxt "infill_pattern option lines" msgid "Lines" @@ -2414,7 +2414,7 @@ msgstr "最小レイヤー時間" msgctxt "cool_min_layer_time_overhang label" msgid "Minimum Layer Time with Overhang" -msgstr "" +msgstr "オーバーハングするレイヤーの最小時間" msgctxt "min_odd_wall_line_width label" msgid "Minimum Odd Wall Line Width" @@ -2422,7 +2422,7 @@ msgstr "最小奇数ウォールライン幅" msgctxt "cool_min_layer_time_overhang_min_segment_length label" msgid "Minimum Overhang Segment Length" -msgstr "" +msgstr "オーバーハングセグメントの最小距離" msgctxt "minimum_polygon_circumference label" msgid "Minimum Polygon Circumference" @@ -2510,7 +2510,7 @@ msgstr "型ルーフ高さ" msgctxt "flooring_monotonic label" msgid "Monotonic Bottom Surface Order" -msgstr "" +msgstr "底面方向の一貫性" msgctxt "ironing_monotonic label" msgid "Monotonic Ironing Order" @@ -2734,7 +2734,7 @@ msgstr "外側ウォール加速度" msgctxt "wall_0_deceleration label" msgid "Outer Wall End Deceleration" -msgstr "" +msgstr "外側ウォールの終了時減速度" msgctxt "wall_0_end_speed_ratio label" msgid "Outer Wall End Speed Ratio" @@ -2770,7 +2770,7 @@ msgstr "外側ウォールでの速度スプリットの距離" msgctxt "wall_0_acceleration label" msgid "Outer Wall Start Acceleration" -msgstr "" +msgstr "外側ウォール開始時加速度" msgctxt "wall_0_start_speed_ratio label" msgid "Outer Wall Start Speed Ratio" @@ -2798,11 +2798,11 @@ msgstr "オーバーハングウォール角" msgctxt "wall_overhang_speed_factors label" msgid "Overhanging Wall Speeds" -msgstr "" +msgstr "オーバーハングウォール速度" msgctxt "wall_overhang_speed_factors description" msgid "Overhanging walls will be printed at a percentage of their normal print speed. You can specify multiple values, so that even more overhanging walls will be printed even slower, e.g. by setting [75, 50, 25]" -msgstr "" +msgstr "オーバーハングするウォールは、通常のプリント速度に対し設定したパーセントの速度でプリントされます。複数の値を指定でき、オーバーハングしたウォールが増えるごとに遅くすることができます。設定例：[75, 50, 25]" msgctxt "wipe_pause description" msgid "Pause after the unretract." @@ -2838,7 +2838,7 @@ msgstr "希望枝角度" msgctxt "material_pressure_advance_factor label" msgid "Pressure advance factor" -msgstr "" +msgstr "圧力推進係数" msgctxt "wall_transition_filter_deviation description" msgid "Prevent transitioning back and forth between one extra wall and one less. This margin extends the range of line widths which follow to [Minimum Wall Line Width - Margin, 2 * Minimum Wall Line Width + Margin]. Increasing this margin reduces the number of transitions, which reduces the number of extrusion starts/stops and travel time. However, large line width variation can lead to under- or overextrusion problems." @@ -2918,7 +2918,7 @@ msgstr "印刷加速度" msgctxt "variant_name" msgid "Print Core" -msgstr "" +msgstr "プリントコア" msgctxt "jerk_print label" msgid "Print Jerk" @@ -2950,7 +2950,7 @@ msgstr "印刷物の隣に、ノズルを切り替えた後の材料でタワー msgctxt "flooring_monotonic description" msgid "Print bottom surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." -msgstr "" +msgstr "底面のラインを一方向に揃えることで、隣接するラインと常に重なり合います。これによりわずかに印刷時間がかかりますが、平面がより一貫した見た目になります。" msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." @@ -3670,7 +3670,7 @@ msgstr "開始G-Code" msgctxt "machine_start_gcode_first label" msgid "Start GCode must be first" -msgstr "" +msgstr "開始G-Codeを必ず最初に実行" msgctxt "z_seam_type description" msgid "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these near a user specified location, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker." @@ -4094,7 +4094,7 @@ msgstr "内側のウォールがが出力される際のスピード。" msgctxt "acceleration_flooring description" msgid "The acceleration with which bottom surface skin layers are printed." -msgstr "" +msgstr "底面レイヤーが印刷される際の加速度。" msgctxt "acceleration_infill description" msgid "The acceleration with which infill is printed." @@ -4114,11 +4114,11 @@ msgstr "ラフトの底面印刷時の加速度。" msgctxt "acceleration_wall_x_flooring description" msgid "The acceleration with which the bottom surface inner walls are printed." -msgstr "" +msgstr "底面内側ウォールが印刷される際の加速度。" msgctxt "acceleration_wall_0_flooring description" msgid "The acceleration with which the bottom surface outermost walls are printed." -msgstr "" +msgstr "底面の最も外側のウォールが印刷される際の加速度。" msgctxt "acceleration_support_bottom description" msgid "The acceleration with which the floors of support are printed. Printing them at lower acceleration can improve adhesion of support on top of your model." @@ -4338,7 +4338,7 @@ msgstr "次のレイヤーの高さを前のレイヤーの高さと比べた差 msgctxt "machine_head_with_fans_polygon description" msgid "The dimensions of the print head used to determine 'Safe Model Distance' when printing 'One at a Time'. These numbers relate to the centerline of the first extruder nozzle. Left of the nozzle is 'X Min' and must be negative. Rear of the nozzle is 'Y Min' and must be negative. X Max (right) and Y Max (front) are positive numbers. Gantry height is the dimension from the build plate to the X gantry beam." -msgstr "" +msgstr "一度にプリントする場合の「モデルとの安全距離」に使用される、プリントヘッドの座標です。これらの数値は最初のエクストルーダーノズルの中心線との相対値になります。ノズルの左側がX軸の最小値で、必ず負の値になります。ノズルの後方がY軸の最小値で、必ず負の値になります。X軸最大値（右側）とY軸最大値（前方）は正の値になります。ガントリーの高さはビルドプレートからガントリーの梁（はり）との距離になります。" msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." @@ -4350,7 +4350,7 @@ msgstr "Z軸シームにおける、モデルとそのサポート構造との msgctxt "retraction_combing_avoid_distance description" msgid "The distance between the nozzle and already printed outer walls when travelling inside a model." -msgstr "" +msgstr "モデルの内側を移動する際の、ノズルとプリント済みの外側ウォールとの距離。" msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." @@ -4462,7 +4462,7 @@ msgstr "インフィル造形時に使われるエクストルーダー。デュ msgctxt "flooring_extruder_nr description" msgid "The extruder train used for printing the bottom most skin. This is used in multi-extrusion." -msgstr "" +msgstr "最低面のスキンを印刷時に使用するエクストルーダー列。複数のエクストルーダーがある場合に使用されます。" msgctxt "wall_x_extruder_nr description" msgid "The extruder train used for printing the inner walls. This is used in multi-extrusion." @@ -4714,7 +4714,7 @@ msgstr "内側のウォールがプリントされれう際の最大瞬間速度 msgctxt "jerk_flooring description" msgid "The maximum instantaneous velocity change with which bottom surface skin layers are printed." -msgstr "" +msgstr "底面スキンレイヤーをプリントする際の最大瞬間速度変化です。" msgctxt "jerk_infill description" msgid "The maximum instantaneous velocity change with which infill is printed." @@ -4722,11 +4722,11 @@ msgstr "インフィルの印刷時の瞬間速度の変更。" msgctxt "jerk_wall_x_flooring description" msgid "The maximum instantaneous velocity change with which the bottom surface inner walls are printed." -msgstr "" +msgstr "底面内側ウォールをプリントする際の最大瞬間速度変化です。" msgctxt "jerk_wall_0_flooring description" msgid "The maximum instantaneous velocity change with which the bottom surface outermost walls are printed." -msgstr "" +msgstr "底面の最も外側のウォールをプリントする際の最大瞬間速度変化です。" msgctxt "jerk_support_bottom description" msgid "The maximum instantaneous velocity change with which the floors of support are printed." @@ -4870,7 +4870,7 @@ msgstr "プライムタワーシェルの最小の厚さ。厚くすることで msgctxt "cool_min_layer_time_overhang description" msgid "The minimum time spent in a layer that contains overhanging extrusions. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." -msgstr "" +msgstr "オーバーハングになる押し出しを含むレイヤーでの最小時間です。これは1つのレイヤーに最低限かける時間までプリンターを強制的に遅くします。これにより、次のレイヤーを印刷する前にプリントされた材料が適切に冷却されるようになります。ヘッド持ち上げが無効かつ最低速度を下回ってしまう場合は、レイヤーの印刷時間は最小レイヤー印刷時間より短くなります。" msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." @@ -4906,7 +4906,7 @@ msgstr "最底面のレイヤー数。下の厚さで計算すると、この値 msgctxt "flooring_layer_count description" msgid "The number of bottom most skin layers. Usually only one bottom most layer is sufficient to generate higher quality bottom surfaces." -msgstr "" +msgstr "最低面レイヤーの数です。通常、最低面はより良い品質の底面にするのに1レイヤーで十分です。" msgctxt "raft_base_wall_count description" msgid "The number of contours to print around the linear pattern in the base layer of the raft." @@ -4990,7 +4990,7 @@ msgstr "ノズルの外径。" msgctxt "flooring_pattern description" msgid "The pattern of the bottom most layers." -msgstr "" +msgstr "最低面レイヤーのパターンです。" msgctxt "infill_pattern description" msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction. Lightning infill tries to minimize the infill, by only supporting the ceiling of the object." @@ -5074,7 +5074,7 @@ msgstr "内側のウォールをプリントする速度。外側より内側の msgctxt "speed_flooring description" msgid "The speed at which bottom surface skin layers are printed." -msgstr "" +msgstr "底面レイヤーをプリントする際の速度です。" msgctxt "bridge_skin_speed description" msgid "The speed at which bridge skin regions are printed." @@ -5094,11 +5094,11 @@ msgstr "ベースラフト層が印刷される速度。ノズルから出てく msgctxt "speed_wall_x_flooring description" msgid "The speed at which the bottom surface inner walls are printed." -msgstr "" +msgstr "底面内側ウォールをプリントする際の速度です。" msgctxt "speed_wall_0_flooring description" msgid "The speed at which the bottom surface outermost wall is printed." -msgstr "" +msgstr "底面の最も外側のウォールをプリントする際の速度です。" msgctxt "bridge_wall_speed description" msgid "The speed at which the bridge walls are printed." @@ -5422,7 +5422,7 @@ msgstr "この設定は、ラフト上層部の輪郭の内側の角をどの程 msgctxt "machine_start_gcode_first description" msgid "This setting controls if the start-gcode is forced to always be the first g-code. Without this option other g-code, such as a T0 can be inserted before the start g-code." -msgstr "" +msgstr "この設定は開始G-Codeが必ず最初のG-Codeとなるよう制御します。この設定が無効の場合、T0といった他のG-Codeが開始G-Codeの前に挿入される場合があります。" msgctxt "retraction_count_max description" msgid "This setting limits the number of retractions occurring within the minimum extrusion distance window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues." @@ -5658,7 +5658,7 @@ msgstr "ウォールのシームがこの角度以上にオーバーハングし msgctxt "material_pressure_advance_factor description" msgid "Tuning factor for pressure advance, which is meant to synchronize extrusion with motion" -msgstr "" +msgstr "吐出と動作を同期するための、圧力推進を調整する係数です。" msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" @@ -5874,7 +5874,7 @@ msgstr "部品が薄くなるにつれて異なる数のウォール間を移行 msgctxt "cool_min_layer_time_overhang_min_segment_length description" msgid "When trying to apply the minimum layer time specific for overhanging layers, it will be applied only if at least one consecutive overhanging extrusion move is longer than this value." -msgstr "" +msgstr "オーバーハングするレイヤーに最小時間を適用する際、少なくとも1つの連続したオーバーハング移動がこの値より長くなるよう適用されます。" msgctxt "wipe_hop_enable description" msgid "When wiping, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate." @@ -5926,7 +5926,7 @@ msgstr "オブジェクトが保存された座標系を使用する代わりに msgctxt "machine_nozzle_temp_enabled description" msgid "Whether to control temperature from Cura. Turn this off to control nozzle temperature from outside of Cura." -msgstr "Curaから温度を制御するかどうか。これをオフにして、Cura外からノズル温度を制御することで無効化。" +msgstr "Curaから温度を制御するかどうか。これをオフにすることで、Cura外からノズル温度を制御します。" msgctxt "material_bed_temp_prepend description" msgid "Whether to include build plate temperature commands at the start of the gcode. When the start_gcode already contains build plate temperature commands Cura frontend will automatically disable this setting." @@ -5974,7 +5974,7 @@ msgstr "サポートのルーフ、フロアのライン幅。" msgctxt "flooring_line_width description" msgid "Width of a single line of the areas at the bottom of the print." -msgstr "" +msgstr "プリントの底面領域における1本のラインの幅です。" msgctxt "roofing_line_width description" msgid "Width of a single line of the areas at the top of the print." @@ -6178,7 +6178,7 @@ msgstr "ZがX/Yを上書き" msgctxt "flooring_pattern option zigzag" msgid "Zig Zag" -msgstr "" +msgstr "ジグザグ" msgctxt "infill_pattern option zigzag" msgid "Zig Zag" From bf1ccd772b2054c677233fadfb2fc218e0404e86 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 3 Mar 2025 15:34:49 +0100 Subject: [PATCH 10/72] Do not display settings that are useless when overhang is "disabled" CURA-12433 --- resources/definitions/fdmprinter.def.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index cee1c10e1f..dc9ee50976 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4995,6 +4995,7 @@ "value": "cool_min_layer_time", "minimum_value": "0", "maximum_value_warning": "600", + "enabled": "wall_overhang_angle < 90", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -5007,6 +5008,7 @@ "default_value": 5, "minimum_value": "0", "maximum_value_warning": "500", + "enabled": "wall_overhang_angle < 90", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -8719,6 +8721,7 @@ "unit": "%", "type": "[int]", "default_value": "[100]", + "enabled": "wall_overhang_angle < 90", "settable_per_mesh": true }, "bridge_settings_enabled": From 8722fb5e6fa858a56ac6b3594d084586d21a1534 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 3 Mar 2025 15:40:30 +0100 Subject: [PATCH 11/72] Move settings to experimental CURA-12433 Those settings highly depend on wall_overhang_angle, which is an experimental setting, so they should also be experimental --- resources/definitions/fdmprinter.def.json | 54 +++++++++++------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index dc9ee50976..7ec5cb6157 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4985,33 +4985,6 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "cool_min_layer_time_overhang": - { - "label": "Minimum Layer Time with Overhang", - "description": "The minimum time spent in a layer that contains overhanging extrusions. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated.", - "unit": "s", - "type": "float", - "default_value": 5, - "value": "cool_min_layer_time", - "minimum_value": "0", - "maximum_value_warning": "600", - "enabled": "wall_overhang_angle < 90", - "settable_per_mesh": false, - "settable_per_extruder": true - }, - "cool_min_layer_time_overhang_min_segment_length": - { - "label": "Minimum Overhang Segment Length", - "description": "When trying to apply the minimum layer time specific for overhanging layers, it will be applied only if at least one consecutive overhanging extrusion move is longer than this value.", - "unit": "mm", - "type": "float", - "default_value": 5, - "minimum_value": "0", - "maximum_value_warning": "500", - "enabled": "wall_overhang_angle < 90", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "cool_min_speed": { "label": "Minimum Speed", @@ -8701,6 +8674,33 @@ "default_value": 90, "settable_per_mesh": true }, + "cool_min_layer_time_overhang": + { + "label": "Minimum Layer Time with Overhang", + "description": "The minimum time spent in a layer that contains overhanging extrusions. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated.", + "unit": "s", + "type": "float", + "default_value": 5, + "value": "cool_min_layer_time", + "minimum_value": "0", + "maximum_value_warning": "600", + "enabled": "wall_overhang_angle < 90", + "settable_per_mesh": false, + "settable_per_extruder": true + }, + "cool_min_layer_time_overhang_min_segment_length": + { + "label": "Minimum Overhang Segment Length", + "description": "When trying to apply the minimum layer time specific for overhanging layers, it will be applied only if at least one consecutive overhanging extrusion move is longer than this value.", + "unit": "mm", + "type": "float", + "default_value": 5, + "minimum_value": "0", + "maximum_value_warning": "500", + "enabled": "wall_overhang_angle < 90", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "seam_overhang_angle": { "label": "Seam Overhanging Wall Angle", From 857d26307d377e86b69045589a9d8b46f5a1cad1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 3 Mar 2025 15:41:07 +0100 Subject: [PATCH 12/72] Hide setting from expert set CURA-12433 Those settings highly depend on wall_overhang_angle, which is not visible in expert, so they should also not be visible --- resources/setting_visibility/expert.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 50c9fafa64..b52c7bd526 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -251,8 +251,6 @@ cool_fan_speed_0 cool_fan_full_at_height cool_fan_full_layer cool_min_layer_time -cool_min_layer_time_overhang -cool_min_layer_time_overhang_min_segment_length cool_min_speed cool_lift_head cool_during_extruder_switch From c21ddd99ce67798c59280b4997bc4db28c27e7a5 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 4 Mar 2025 14:54:12 +0100 Subject: [PATCH 13/72] Margin wasn't wide enough to see that it's a tree. CURA-12441 --- resources/qml/Preferences/SettingVisibilityItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/SettingVisibilityItem.qml b/resources/qml/Preferences/SettingVisibilityItem.qml index 07255306a5..52b06b3dee 100644 --- a/resources/qml/Preferences/SettingVisibilityItem.qml +++ b/resources/qml/Preferences/SettingVisibilityItem.qml @@ -11,7 +11,7 @@ Item // Use the depth of the model to move the item, but also leave space for the visibility / enabled exclamation mark. // Align checkbox with SettingVisibilityCategory icon with + 5 - x: definition ? definition.depth * UM.Theme.getSize("narrow_margin").width : UM.Theme.getSize("default_margin").width + x: definition ? definition.depth * UM.Theme.getSize("wide_margin").width : UM.Theme.getSize("default_margin").width UM.TooltipArea { From cb0d69d9f2cfd5c9ae22c0f97c3f3b716a55b9d0 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 4 Mar 2025 15:03:59 +0100 Subject: [PATCH 14/72] Same cache as other setting-lists to reduce slowness on scroll. This does incur a cost on the first load of the list though. CURA-12442 --- resources/qml/Preferences/SettingVisibilityPage.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index 8743999fe2..f186f3e460 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -164,6 +164,7 @@ UM.PreferencesPage expanded: ["*"] visibilityHandler: UM.SettingPreferenceVisibilityHandler {} } + cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item. property Component settingVisibilityCategory: Cura.SettingVisibilityCategory {} property Component settingVisibilityItem: Cura.SettingVisibilityItem {} From cf419c3025d973c80d273554fa75c19f96f4c79f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 4 Mar 2025 16:08:50 +0100 Subject: [PATCH 15/72] Fix value-units can now change visually/immediately on printer switch. CURA-12443 --- resources/qml/Settings/SettingTextField.qml | 12 ++++++++++++ resources/qml/Settings/SettingView.qml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index 5259e5ea75..b9b1a0bac4 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -92,6 +92,8 @@ SettingItem UM.Label { + id: unitlabel + anchors { left: parent.left @@ -106,6 +108,16 @@ SettingItem horizontalAlignment: (input.effectiveHorizontalAlignment == Text.AlignLeft) ? Text.AlignRight : Text.AlignLeft textFormat: Text.PlainText color: UM.Theme.getColor("setting_unit") + + Binding + { + target: unitlabel + property: "text" + value: + { + return propertyProvider.properties.unit; + } + } } TextInput diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 9622998595..0252d57056 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -321,7 +321,7 @@ Item containerStackId: contents.activeMachineId key: model.key - watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ] + watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve", "unit" ] storeIndex: 0 removeUnusedValue: model.resolve === undefined } From 6a4890ecd7ae0a60c909d9b14d65c0bc212d64e0 Mon Sep 17 00:00:00 2001 From: Remco Burema <41987080+rburema@users.noreply.github.com> Date: Wed, 5 Mar 2025 09:10:52 +0100 Subject: [PATCH 16/72] nocase -> camelCase done as part of CURA-12443 Co-authored-by: Erwan MATHIEU --- resources/qml/Settings/SettingTextField.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index b9b1a0bac4..3b0f2bf521 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -92,7 +92,7 @@ SettingItem UM.Label { - id: unitlabel + id: unitLabel anchors { @@ -111,7 +111,7 @@ SettingItem Binding { - target: unitlabel + target: unitLabel property: "text" value: { From e39f5ca7ae11603c81a560b09c263cff2b90e513 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Wed, 5 Mar 2025 12:31:29 +0000 Subject: [PATCH 17/72] Trigger Curator build after resource build --- .github/workflows/conan-package-resources.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 7394a81ab7..cb1ebefd64 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -30,3 +30,13 @@ jobs: platform_mac: false install_system_dependencies: false secrets: inherit + + signal-curator: + needs: conan-package + runs-on: ubuntu-latest + steps: + - name: Trigger Curator Workflow + run: | + gh workflow run --repo ultimaker/curator -r main package.yml + env: + GITHUB_TOKEN: ${{ secrets.CURATOR_TRIGGER_PAT_C3PO }} From e19f5ee330d31abe9d7246ed9c109d4bb54e520c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Mar 2025 10:58:54 +0100 Subject: [PATCH 18/72] Do not move objects if auto-arrange fails CURA-12169 When doing an explicit auto-arrange that can not find a complete solution, it is better not to move the objects because they will probably end up in a weird position --- cura/Arranging/ArrangeObjectsJob.py | 2 +- cura/Arranging/Arranger.py | 10 +++++++--- cura/MultiplyObjectsJob.py | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cura/Arranging/ArrangeObjectsJob.py b/cura/Arranging/ArrangeObjectsJob.py index 48d2436482..d494a79327 100644 --- a/cura/Arranging/ArrangeObjectsJob.py +++ b/cura/Arranging/ArrangeObjectsJob.py @@ -40,7 +40,7 @@ class ArrangeObjectsJob(Job): found_solution_for_all = False try: - found_solution_for_all = arranger.arrange() + found_solution_for_all = arranger.arrange(only_if_full_success = True) except: # If the thread crashes, the message should still close Logger.logException("e", "Unable to arrange the objects on the buildplate. The arrange algorithm has crashed.") diff --git a/cura/Arranging/Arranger.py b/cura/Arranging/Arranger.py index fd93ab1846..d0a78431f6 100644 --- a/cura/Arranging/Arranger.py +++ b/cura/Arranging/Arranger.py @@ -16,12 +16,16 @@ class Arranger: """ raise NotImplementedError - def arrange(self, add_new_nodes_in_scene: bool = False) -> bool: + def arrange(self, add_new_nodes_in_scene: bool = False, only_if_full_success: bool = False) -> bool: """ Find placement for a set of scene nodes, and move them by using a single grouped operation. :param add_new_nodes_in_scene: Whether to create new scene nodes before applying the transformations and rotations :return: found_solution_for_all: Whether the algorithm found a place on the buildplate for all the objects """ grouped_operation, not_fit_count = self.createGroupOperationForArrange(add_new_nodes_in_scene) - grouped_operation.push() - return not_fit_count == 0 + full_success = not_fit_count == 0 + + if full_success or not only_if_full_success: + grouped_operation.push() + + return full_success diff --git a/cura/MultiplyObjectsJob.py b/cura/MultiplyObjectsJob.py index 889b6f5d1a..024baa50f5 100644 --- a/cura/MultiplyObjectsJob.py +++ b/cura/MultiplyObjectsJob.py @@ -84,6 +84,7 @@ class MultiplyObjectsJob(Job): arranger = Nest2DArrange(nodes, Application.getInstance().getBuildVolume(), fixed_nodes, factor=1000) group_operation, not_fit_count = arranger.createGroupOperationForArrange(add_new_nodes_in_scene=True) + found_solution_for_all = not_fit_count == 0 if nodes_to_add_without_arrange: for nested_node in nodes_to_add_without_arrange: From 01d03f7e21d7f98935904b85f39f32632cb0de28 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Mar 2025 10:59:55 +0100 Subject: [PATCH 19/72] Fix testing multiple arrange strategies CURA-12169 Some items were still set from previous tryes, giving a final result that could have inconsistencies (e.g. objects over disallowed ares) --- cura/Arranging/Nest2DArrange.py | 103 ++++++++++++++++---------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py index 968522d5a3..3f9a12757f 100644 --- a/cura/Arranging/Nest2DArrange.py +++ b/cura/Arranging/Nest2DArrange.py @@ -57,60 +57,61 @@ class Nest2DArrange(Arranger): if self._fixed_nodes is None: self._fixed_nodes = [] - # Add all the items we want to arrange - node_items = [] - for node in self._nodes_to_arrange: - hull_polygon = node.callDecoration("getConvexHull") - if not hull_polygon or hull_polygon.getPoints is None: - Logger.log("w", "Object {} cannot be arranged because it has no convex hull.".format(node.getName())) - continue - converted_points = [] - for point in hull_polygon.getPoints(): - converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) - item = Item(converted_points) - node_items.append(item) - - # Use a tiny margin for the build_plate_polygon (the nesting doesn't like overlapping disallowed areas) - half_machine_width = 0.5 * machine_width - 1 - half_machine_depth = 0.5 * machine_depth - 1 - build_plate_polygon = Polygon(numpy.array([ - [half_machine_width, -half_machine_depth], - [-half_machine_width, -half_machine_depth], - [-half_machine_width, half_machine_depth], - [half_machine_width, half_machine_depth] - ], numpy.float32)) - - disallowed_areas = self._build_volume.getDisallowedAreas() - for area in disallowed_areas: - converted_points = [] - - # Clip the disallowed areas so that they don't overlap the bounding box (The arranger chokes otherwise) - clipped_area = area.intersectionConvexHulls(build_plate_polygon) - - if clipped_area.getPoints() is not None and len( - clipped_area.getPoints()) > 2: # numpy array has to be explicitly checked against None - for point in clipped_area.getPoints(): - converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) - - disallowed_area = Item(converted_points) - disallowed_area.markAsDisallowedAreaInBin(0) - node_items.append(disallowed_area) - - for node in self._fixed_nodes: - converted_points = [] - hull_polygon = node.callDecoration("getConvexHull") - - if hull_polygon is not None and hull_polygon.getPoints() is not None and len( - hull_polygon.getPoints()) > 2: # numpy array has to be explicitly checked against None - for point in hull_polygon.getPoints(): - converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) - item = Item(converted_points) - item.markAsFixedInBin(0) - node_items.append(item) - strategies = [NfpConfig.Alignment.CENTER] * 3 + [NfpConfig.Alignment.BOTTOM_LEFT] * 3 found_solution_for_all = False while not found_solution_for_all and len(strategies) > 0: + + # Add all the items we want to arrange + node_items = [] + for node in self._nodes_to_arrange: + hull_polygon = node.callDecoration("getConvexHull") + if not hull_polygon or hull_polygon.getPoints is None: + Logger.log("w", "Object {} cannot be arranged because it has no convex hull.".format(node.getName())) + continue + converted_points = [] + for point in hull_polygon.getPoints(): + converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) + item = Item(converted_points) + node_items.append(item) + + # Use a tiny margin for the build_plate_polygon (the nesting doesn't like overlapping disallowed areas) + half_machine_width = 0.5 * machine_width - 1 + half_machine_depth = 0.5 * machine_depth - 1 + build_plate_polygon = Polygon(numpy.array([ + [half_machine_width, -half_machine_depth], + [-half_machine_width, -half_machine_depth], + [-half_machine_width, half_machine_depth], + [half_machine_width, half_machine_depth] + ], numpy.float32)) + + disallowed_areas = self._build_volume.getDisallowedAreas() + for area in disallowed_areas: + converted_points = [] + + # Clip the disallowed areas so that they don't overlap the bounding box (The arranger chokes otherwise) + clipped_area = area.intersectionConvexHulls(build_plate_polygon) + + if clipped_area.getPoints() is not None and len( + clipped_area.getPoints()) > 2: # numpy array has to be explicitly checked against None + for point in clipped_area.getPoints(): + converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) + + disallowed_area = Item(converted_points) + disallowed_area.markAsDisallowedAreaInBin(0) + node_items.append(disallowed_area) + + for node in self._fixed_nodes: + converted_points = [] + hull_polygon = node.callDecoration("getConvexHull") + + if hull_polygon is not None and hull_polygon.getPoints() is not None and len( + hull_polygon.getPoints()) > 2: # numpy array has to be explicitly checked against None + for point in hull_polygon.getPoints(): + converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) + item = Item(converted_points) + item.markAsFixedInBin(0) + node_items.append(item) + config = NfpConfig() config.accuracy = 1.0 config.alignment = NfpConfig.Alignment.CENTER From 22d1d170dc22d5f35122f197ad86645f353fcacb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Mar 2025 12:54:39 +0100 Subject: [PATCH 20/72] Improve arrangement calculation CURA-12169 1. Do not recalculate transformed polygons for each strategy. 2. Try all possible strategies, but only once. This seems to give the best results. --- cura/Arranging/Nest2DArrange.py | 106 +++++++++++++++++--------------- 1 file changed, 58 insertions(+), 48 deletions(-) diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py index 3f9a12757f..7e024f565f 100644 --- a/cura/Arranging/Nest2DArrange.py +++ b/cura/Arranging/Nest2DArrange.py @@ -54,64 +54,74 @@ class Nest2DArrange(Arranger): machine_depth = self._build_volume.getDepth() - (edge_disallowed_size * 2) build_plate_bounding_box = Box(int(machine_width * self._factor), int(machine_depth * self._factor)) + # Use a tiny margin for the build_plate_polygon (the nesting doesn't like overlapping disallowed areas) + half_machine_width = 0.5 * machine_width - 1 + half_machine_depth = 0.5 * machine_depth - 1 + build_plate_polygon = Polygon(numpy.array([ + [half_machine_width, -half_machine_depth], + [-half_machine_width, -half_machine_depth], + [-half_machine_width, half_machine_depth], + [half_machine_width, half_machine_depth] + ], numpy.float32)) + + def _convert_points(points): + if points is not None and len(points) > 2: # numpy array has to be explicitly checked against None + converted_points = [] + for point in points: + converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) + return [converted_points] + else: + return [] + + polygons_nodes_to_arrange = [] + for node in self._nodes_to_arrange: + hull_polygon = node.callDecoration("getConvexHull") + if not hull_polygon or hull_polygon.getPoints is None: + Logger.log("w", "Object {} cannot be arranged because it has no convex hull.".format(node.getName())) + continue + + polygons_nodes_to_arrange += _convert_points(hull_polygon.getPoints()) + + polygons_disallowed_areas = [] + for area in self._build_volume.getDisallowedAreas(): + # Clip the disallowed areas so that they don't overlap the bounding box (The arranger chokes otherwise) + clipped_area = area.intersectionConvexHulls(build_plate_polygon) + + polygons_disallowed_areas += _convert_points(clipped_area.getPoints()) + + polygons_fixed_nodes = [] if self._fixed_nodes is None: self._fixed_nodes = [] + for node in self._fixed_nodes: + hull_polygon = node.callDecoration("getConvexHull") - strategies = [NfpConfig.Alignment.CENTER] * 3 + [NfpConfig.Alignment.BOTTOM_LEFT] * 3 + if hull_polygon is not None: + polygons_fixed_nodes += _convert_points(hull_polygon.getPoints()) + + strategies = [NfpConfig.Alignment.CENTER, + NfpConfig.Alignment.BOTTOM_LEFT, + NfpConfig.Alignment.BOTTOM_RIGHT, + NfpConfig.Alignment.TOP_LEFT, + NfpConfig.Alignment.TOP_RIGHT, + NfpConfig.Alignment.DONT_ALIGN] found_solution_for_all = False while not found_solution_for_all and len(strategies) > 0: # Add all the items we want to arrange node_items = [] - for node in self._nodes_to_arrange: - hull_polygon = node.callDecoration("getConvexHull") - if not hull_polygon or hull_polygon.getPoints is None: - Logger.log("w", "Object {} cannot be arranged because it has no convex hull.".format(node.getName())) - continue - converted_points = [] - for point in hull_polygon.getPoints(): - converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) - item = Item(converted_points) + for polygon in polygons_nodes_to_arrange: + node_items.append(Item(polygon)) + + for polygon in polygons_disallowed_areas: + disallowed_area = Item(polygon) + disallowed_area.markAsDisallowedAreaInBin(0) + node_items.append(disallowed_area) + + for polygon in polygons_fixed_nodes: + item = Item(polygon) + item.markAsFixedInBin(0) node_items.append(item) - # Use a tiny margin for the build_plate_polygon (the nesting doesn't like overlapping disallowed areas) - half_machine_width = 0.5 * machine_width - 1 - half_machine_depth = 0.5 * machine_depth - 1 - build_plate_polygon = Polygon(numpy.array([ - [half_machine_width, -half_machine_depth], - [-half_machine_width, -half_machine_depth], - [-half_machine_width, half_machine_depth], - [half_machine_width, half_machine_depth] - ], numpy.float32)) - - disallowed_areas = self._build_volume.getDisallowedAreas() - for area in disallowed_areas: - converted_points = [] - - # Clip the disallowed areas so that they don't overlap the bounding box (The arranger chokes otherwise) - clipped_area = area.intersectionConvexHulls(build_plate_polygon) - - if clipped_area.getPoints() is not None and len( - clipped_area.getPoints()) > 2: # numpy array has to be explicitly checked against None - for point in clipped_area.getPoints(): - converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) - - disallowed_area = Item(converted_points) - disallowed_area.markAsDisallowedAreaInBin(0) - node_items.append(disallowed_area) - - for node in self._fixed_nodes: - converted_points = [] - hull_polygon = node.callDecoration("getConvexHull") - - if hull_polygon is not None and hull_polygon.getPoints() is not None and len( - hull_polygon.getPoints()) > 2: # numpy array has to be explicitly checked against None - for point in hull_polygon.getPoints(): - converted_points.append(Point(int(point[0] * self._factor), int(point[1] * self._factor))) - item = Item(converted_points) - item.markAsFixedInBin(0) - node_items.append(item) - config = NfpConfig() config.accuracy = 1.0 config.alignment = NfpConfig.Alignment.CENTER From 78e62635dda43e9f9d6c45d1384f602762fb9c25 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 7 Mar 2025 16:03:07 +0100 Subject: [PATCH 21/72] Remove redundant overrides This will unlock the z seam x and z seam y, otherwise the z seam would not update from x 150 and y 180 position --- resources/definitions/ultimaker_sketch_sprint.def.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index d0991231bc..25477c062c 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -395,10 +395,7 @@ "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 From 5d2856c195345a44fabd1f49d2c0d665b148915b Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 7 Mar 2025 16:32:15 +0100 Subject: [PATCH 22/72] backleft can stay --- resources/definitions/ultimaker_sketch_sprint.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index 25477c062c..529abc0940 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -395,6 +395,7 @@ "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'" }, "zig_zaggify_infill": { "value": true } } From 41cd893e09cb9c14c1234112ecaffdd303b8bf90 Mon Sep 17 00:00:00 2001 From: Frederic98 <13856291+Frederic98@users.noreply.github.com> Date: Fri, 7 Mar 2025 16:51:52 +0100 Subject: [PATCH 23/72] PP-592 --- resources/definitions/ultimaker_s8.def.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index cc9c97aebd..fd758f6e2a 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -92,10 +92,10 @@ "cool_min_temperature": { "value": "material_print_temperature-15" }, "default_material_print_temperature": { "maximum_value_warning": 320 }, "extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" }, - "flooring_layer_count": { "value": "1" }, + "flooring_layer_count": { "value": 0 }, "gradual_flow_enabled": { "value": false }, "hole_xy_offset": { "value": 0.075 }, - "infill_material_flow": { "value": "1.1*material_flow" }, + "infill_material_flow": { "value": "material_flow" }, "infill_overlap": { "value": 10 }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, "infill_sparse_density": { "value": 15 }, @@ -374,7 +374,7 @@ "speed_travel": { "maximum_value": 500, - "value": 500 + "value": 400 }, "speed_travel_layer_0": { @@ -427,7 +427,6 @@ "support_tree_bp_diameter": { "value": 15 }, "support_tree_tip_diameter": { "value": 1.0 }, "support_tree_top_rate": { "value": 20 }, - "support_wall_count": { "value": 2 }, "support_xy_distance_overhang": { "value": "machine_nozzle_size" }, "support_z_distance": { "value": "0.4*material_shrinkage_percentage_z/100.0" }, "top_bottom_thickness": { "value": "round(4*layer_height, 2)" }, From 253d11f84dbdf7db50422ef4cd256375b0ce7671 Mon Sep 17 00:00:00 2001 From: GregValiant <64202104+GregValiant@users.noreply.github.com> Date: Wed, 26 Feb 2025 07:02:12 -0500 Subject: [PATCH 24/72] Update PurgeLinesAndUnload.py This change adds a setting for "minimum Z height" for the "nail down the string" moves. Update PurgeLinesAndUnload.py Bug fix. The prime blob code didn't account for the retraction at the end. This adds an 'unretract' to compensate. --- .../scripts/PurgeLinesAndUnload.py | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py b/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py index de2b1c0f7a..e456aab044 100644 --- a/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py +++ b/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py @@ -163,11 +163,21 @@ class PurgeLinesAndUnload(Script): "move_to_start": { "label": "Circle around to layer start ⚠️​", - "description": "Depending on where the 'Layer Start X' and 'Layer Start Y' are for the print, the opening travel move can pass across the print area and leave a string there. This option will generate an orthogonal path that moves the nozzle around the edges of the build plate and then comes in to the Start Point. || ⚠️​ || The nozzle will drop to Z0.0 and touch the build plate at each stop in order to 'nail down the string' so it doesn't follow in a straight line.", + "description": "Depending on where the 'Layer Start X' and 'Layer Start Y' are for the print, the opening travel move can pass across the print area and leave a string there. This option will generate an orthogonal path that moves the nozzle around the edges of the build plate and then comes in to the Start Point. || ⚠️​ || The nozzle can drop to Z0.0 and touch the build plate at each stop in order to 'nail down the string'. The nozzle always raises after the touch-down. It will not drag on the bed.", "type": "bool", "default_value": false, "enabled": true }, + "move_to_start_min_z": + { + "label": " Minimum Z height ⚠️​", + "description": "When moving to the start position, the nozzle can touch down on the build plate at each stop (Z = 0.0). That will stick the string to the build plate at each direction change so it doesn't pull across the print area. Some printers may not respond well to Z=0.0. You may set a minimum Z height here (min is 0.0 and max is 0.50). The string must stick or it defeats the purpose of moving around the periphery.", + "type": "float", + "default_value": 0.0, + "minimum_value": 0.0, + "maximum_value": 0.5, + "enabled": "move_to_start" + }, "adjust_starting_e": { "label": "Adjust Starting E location", @@ -254,7 +264,9 @@ class PurgeLinesAndUnload(Script): self.prime_blob_distance = self.getSettingValueByKey("prime_blob_distance") else: self.prime_blob_distance = 0 - + # Set the minimum Z to stick the string to the build plate when Move to Start is selected. + self.touchdown_z = self.getSettingValueByKey("move_to_start_min_z") + # Mapping settings to corresponding methods procedures = { "add_purge_lines": self._add_purge_lines, @@ -385,7 +397,7 @@ class PurgeLinesAndUnload(Script): def add_move(axis: str, position: float) -> None: moves.append( f"G0 F{self.speed_travel} {axis}{position} ; Start move\n" - f"G0 F600 Z0 ; Nail down the string\n" + f"G0 F600 Z{self.touchdown_z} ; Nail down the string\n" f"G0 F600 Z2 ; Move up\n" ) @@ -494,6 +506,9 @@ class PurgeLinesAndUnload(Script): # Travel to the purge start purge_str += f"G0 F{self.speed_travel} X{self.machine_left + self.border_distance} Y{self.machine_front + 10} ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" + if self.prime_blob_enable: + purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" + purge_str += "G92 E0 ; Reset extruder\n" # Purge two lines purge_str += f"G1 F{self.print_speed} X{self.machine_left + self.border_distance} Y{y_stop} E{purge_volume} ; First line\n" purge_str += f"G0 X{self.machine_left + 3 + self.border_distance} Y{y_stop} ; Move over\n" @@ -513,6 +528,9 @@ class PurgeLinesAndUnload(Script): # Travel to the purge start purge_str += f"G0 F{self.speed_travel} X{self.machine_right - self.border_distance} ; Move\nG0 Y{self.machine_back - 10} ; Move\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" + if self.prime_blob_enable: + purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" + purge_str += "G92 E0 ; Reset extruder\n" # Purge two lines purge_str += f"G1 F{self.print_speed} X{self.machine_right - self.border_distance} Y{y_stop} E{purge_volume} ; First line\n" purge_str += f"G0 X{self.machine_right - 3 - self.border_distance} Y{y_stop} ; Move over\n" @@ -533,6 +551,9 @@ class PurgeLinesAndUnload(Script): # Travel to the purge start purge_str += f"G0 F{self.speed_travel} X{self.machine_left + 10} Y{self.machine_front + self.border_distance} ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" + if self.prime_blob_enable: + purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" + purge_str += "G92 E0 ; Reset extruder\n" # Purge two lines purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_front + self.border_distance} E{purge_volume} ; First line\n" purge_str += f"G0 X{x_stop} Y{self.machine_front + 3 + self.border_distance} ; Move over\n" @@ -554,6 +575,9 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 F{self.speed_travel} Y{self.machine_back - self.border_distance} ; Ortho Move to back\n" purge_str += f"G0 X{self.machine_right - 10} ; Ortho move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" + if self.prime_blob_enable: + purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" + purge_str += "G92 E0 ; Reset extruder\n" # Purge two lines purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_back - self.border_distance} E{purge_volume} ; First line\n" purge_str += f"G0 X{x_stop} Y{self.machine_back - 3 - self.border_distance} ; Move over\n" @@ -575,6 +599,9 @@ class PurgeLinesAndUnload(Script): # Travel to the purge start purge_str += f"G0 F{self.speed_travel} X{self.machine_left + self.border_distance} Y{self.machine_front + 10} ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" + if self.prime_blob_enable: + purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" + purge_str += "G92 E0 ; Reset extruder\n" # Purge two lines purge_str += f"G1 F{self.print_speed} X{self.machine_left + self.border_distance} Y{y_stop} E{purge_volume} ; First line\n" purge_str += f"G0 X{self.machine_left + 3 + self.border_distance} Y{y_stop} ; Move over\n" @@ -594,6 +621,9 @@ class PurgeLinesAndUnload(Script): # Travel to the purge start purge_str += f"G0 F{self.speed_travel} X{self.machine_right - self.border_distance} Z2 ; Move\nG0 Y{self.machine_back - 10} Z2 ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" + if self.prime_blob_enable: + purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" + purge_str += "G92 E0 ; Reset extruder\n" # Purge two lines purge_str += f"G1 F{self.print_speed} X{self.machine_right - self.border_distance} Y{y_stop} E{purge_volume} ; First line\n" purge_str += f"G0 X{self.machine_right - 3 - self.border_distance} Y{y_stop} ; Move over\n" @@ -613,6 +643,9 @@ class PurgeLinesAndUnload(Script): # Travel to the purge start purge_str += f"G0 F{self.speed_travel} X{self.machine_left + 10} Z2 ; Move\nG0 Y{self.machine_front + self.border_distance} Z2 ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" + if self.prime_blob_enable: + purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" + purge_str += "G92 E0 ; Reset extruder\n" # Purge two lines purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_front + self.border_distance} E{purge_volume} ; First line\n" purge_str += f"G0 X{x_stop} Y{self.machine_front + 3 + self.border_distance} ; Move over\n" @@ -633,6 +666,9 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 F{self.speed_travel} Y{self.machine_back - self.border_distance} Z2; Ortho Move to back\n" purge_str += f"G0 X{self.machine_right - 10} Z2 ; Ortho Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" + if self.prime_blob_enable: + purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" + purge_str += "G92 E0 ; Reset extruder\n" # Purge two lines purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_back - self.border_distance} E{purge_volume} ; First line\n" purge_str += f"G0 X{x_stop} Y{self.machine_back - 3 - self.border_distance} ; Move over\n" @@ -945,7 +981,7 @@ class PurgeLinesAndUnload(Script): blob_string = "G0 F1200 Z20 ; Move up\n" blob_string += f"G0 F{self.speed_travel} X{blob_x} Y{blob_y} ; Move to blob location\n" blob_string += f"G1 F{speed_blob} E{self.prime_blob_distance} ; Blob\n" - blob_string += f"G1 F{self.retract_speed} E-{self.retract_dist} ; Retract\n" + blob_string += f"G1 F{self.retract_speed} E{self.prime_blob_distance - self.retract_dist} ; Retract\n" blob_string += "G92 E0 ; Reset extruder\n" blob_string += "M300 P500 S600 ; Beep\n" blob_string += "G4 S2 ; Wait\n" From b25620826f77ddae558396e3f1ab5f124892f1c6 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 1 Mar 2025 13:41:33 +0100 Subject: [PATCH 25/72] use helper function Since the added lines are identical, it can be replaced with a helper function --- .../scripts/PurgeLinesAndUnload.py | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py b/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py index e456aab044..d4729b1ce7 100644 --- a/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py +++ b/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py @@ -491,6 +491,15 @@ class PurgeLinesAndUnload(Script): def calculate_purge_volume(line_width, purge_length, volume_per_mm): return round((line_width * 0.3 * purge_length) * 1.25 / volume_per_mm, 5) + + def adjust_for_prime_blob_gcode(retract_speed, retract_distance): + """Generates G-code lines for prime blob adjustment.""" + gcode_lines = [ + f"G1 F{retract_speed} E{retract_distance} ; Unretract", + "G92 E0 ; Reset extruder" + ] + return "\n".join(gcode_lines) + purge_location = self.getSettingValueByKey("purge_line_location") purge_extrusion_full = True if self.getSettingValueByKey("purge_line_length") == "purge_full" else False @@ -507,8 +516,7 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 F{self.speed_travel} X{self.machine_left + self.border_distance} Y{self.machine_front + 10} ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" if self.prime_blob_enable: - purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" - purge_str += "G92 E0 ; Reset extruder\n" + purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist) # Purge two lines purge_str += f"G1 F{self.print_speed} X{self.machine_left + self.border_distance} Y{y_stop} E{purge_volume} ; First line\n" purge_str += f"G0 X{self.machine_left + 3 + self.border_distance} Y{y_stop} ; Move over\n" @@ -529,8 +537,7 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 F{self.speed_travel} X{self.machine_right - self.border_distance} ; Move\nG0 Y{self.machine_back - 10} ; Move\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" if self.prime_blob_enable: - purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" - purge_str += "G92 E0 ; Reset extruder\n" + purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist) # Purge two lines purge_str += f"G1 F{self.print_speed} X{self.machine_right - self.border_distance} Y{y_stop} E{purge_volume} ; First line\n" purge_str += f"G0 X{self.machine_right - 3 - self.border_distance} Y{y_stop} ; Move over\n" @@ -552,8 +559,7 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 F{self.speed_travel} X{self.machine_left + 10} Y{self.machine_front + self.border_distance} ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" if self.prime_blob_enable: - purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" - purge_str += "G92 E0 ; Reset extruder\n" + purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist) # Purge two lines purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_front + self.border_distance} E{purge_volume} ; First line\n" purge_str += f"G0 X{x_stop} Y{self.machine_front + 3 + self.border_distance} ; Move over\n" @@ -576,8 +582,7 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 X{self.machine_right - 10} ; Ortho move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" if self.prime_blob_enable: - purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" - purge_str += "G92 E0 ; Reset extruder\n" + purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist) # Purge two lines purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_back - self.border_distance} E{purge_volume} ; First line\n" purge_str += f"G0 X{x_stop} Y{self.machine_back - 3 - self.border_distance} ; Move over\n" @@ -600,8 +605,7 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 F{self.speed_travel} X{self.machine_left + self.border_distance} Y{self.machine_front + 10} ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" if self.prime_blob_enable: - purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" - purge_str += "G92 E0 ; Reset extruder\n" + purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist) # Purge two lines purge_str += f"G1 F{self.print_speed} X{self.machine_left + self.border_distance} Y{y_stop} E{purge_volume} ; First line\n" purge_str += f"G0 X{self.machine_left + 3 + self.border_distance} Y{y_stop} ; Move over\n" @@ -622,8 +626,7 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 F{self.speed_travel} X{self.machine_right - self.border_distance} Z2 ; Move\nG0 Y{self.machine_back - 10} Z2 ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" if self.prime_blob_enable: - purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" - purge_str += "G92 E0 ; Reset extruder\n" + purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist) # Purge two lines purge_str += f"G1 F{self.print_speed} X{self.machine_right - self.border_distance} Y{y_stop} E{purge_volume} ; First line\n" purge_str += f"G0 X{self.machine_right - 3 - self.border_distance} Y{y_stop} ; Move over\n" @@ -644,8 +647,7 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 F{self.speed_travel} X{self.machine_left + 10} Z2 ; Move\nG0 Y{self.machine_front + self.border_distance} Z2 ; Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" if self.prime_blob_enable: - purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" - purge_str += "G92 E0 ; Reset extruder\n" + purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist) # Purge two lines purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_front + self.border_distance} E{purge_volume} ; First line\n" purge_str += f"G0 X{x_stop} Y{self.machine_front + 3 + self.border_distance} ; Move over\n" @@ -667,8 +669,7 @@ class PurgeLinesAndUnload(Script): purge_str += f"G0 X{self.machine_right - 10} Z2 ; Ortho Move to start\n" purge_str += f"G0 F600 Z0.3 ; Move down\n" if self.prime_blob_enable: - purge_str += f"G1 F{self.retract_speed} E{self.retract_dist} ; Unretract\n" - purge_str += "G92 E0 ; Reset extruder\n" + purge_str += adjust_for_prime_blob_gcode(self.retract_speed, self.retract_dist) # Purge two lines purge_str += f"G1 F{self.print_speed} X{x_stop} Y{self.machine_back - self.border_distance} E{purge_volume} ; First line\n" purge_str += f"G0 X{x_stop} Y{self.machine_back - 3 - self.border_distance} ; Move over\n" From 2cf13c5e94b82be45119fde81f3dd8d6d485e4a7 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 1 Mar 2025 13:42:43 +0100 Subject: [PATCH 26/72] Remove extra empty line --- plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py b/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py index d4729b1ce7..a356fec379 100644 --- a/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py +++ b/plugins/PostProcessingPlugin/scripts/PurgeLinesAndUnload.py @@ -500,7 +500,6 @@ class PurgeLinesAndUnload(Script): ] return "\n".join(gcode_lines) - purge_location = self.getSettingValueByKey("purge_line_location") purge_extrusion_full = True if self.getSettingValueByKey("purge_line_length") == "purge_full" else False purge_str = ";TYPE:CUSTOM----------[Purge Lines]\nG0 F600 Z2 ; Move up\nG92 E0 ; Reset extruder\n" From 9c18763f697523d593e178cc0e98c597f464ccda Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Mon, 10 Mar 2025 13:46:27 +0100 Subject: [PATCH 27/72] Update Changelog for Cura 5.10 Beta Update Changelog for Cura 5.10 Beta Contributes to CURA-12428 --- resources/texts/change_log.txt | 57 ++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 97c2da39b0..87095eaaeb 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,60 @@ +[5.10] + +* New features and improvements: +- UltiMaker S8 Support: Added compatibility for the UltiMaker S8 printer. +- Cheetah Gcode Flavor: Introduced a new Marlin-like Gcode flavor called Cheetah. +- SpaceMouse support: Interact with your object in 3D thanks to a collaboration with 3Dconnexion +- Cloud Printing for Sketch Sprint: Enabled printing over cloud with Digital Factory for Sketch Sprint users. +- Interlocking Settings: Moved Interlocking settings out of experimental into expert +- Build System Upgrade: Upgraded the build system from Conan 1 to Conan 2. Updated documentation is available. +- Preview Looping: When the last layer is played in the preview, the first layer will now play again instead of stopping. +- Updated About Page: The About Page now shows the used sources, their licenses, and their versions in a clearer way +- Flip Y-axis Translate Tool Handle: Added an option to flip the Y-axis translate tool handle in preferences contributed by @GregValiant. +- Rotation by Input & Snap Angle Input: Introduced rotation by input & snap angle input contributed by @HellAholic and @GregValiant. +- Purge Lines And Unload Filament Post Processing Script: Added a Purge Lines and Unload Filament Post Processing Script contributed by @GregValiant and @HellAholic +- Thingiverse "Open in Cura" Button Linux Support: Enabled the "Open in Cura" button from Thingiverse to open files in Linux contributed by @hadess. +- Multitool Printer Configuration Options: Introduced 3 new configuration options in machine settings for multitool printers contributed by @TheSin-. +- Search and Replace Post-Processing Plug-In: Significantly improved the Search and Replace post-processing plug-in with features like replacing only the first instance, limiting search to a layer range, and ignoring start-up or ending G-code contributed by @GregValiant +- Enabled Relative extrusion (M82 and M83 commands) for Marlin-flavored GCode, contributed by @EmJay276 + + +* New settings: +- Overhanging Wall Speeds, now gives you the ability to tune multiple values. Don’t forget to adjust the Overhanging Wall Angle to start using the setting. +- Minimum Layer Time with Overhang and Minimum Overhang Segment Length: Fine-tune the minimum layer time for overhangs. +- Distance to Walls: Finetune combing movements. +- Overhanging Wall Speeds: Fine-tune speeds based on different overhang percentages. +- Pressure Advance Factor Setting: New setting for machine definitions. +- You can now tune the Bottom Surface Skin, like you can tune the Top Surface Skin! You can now tune Extruder, Layers, Line Width, Pattern, Line Directions, Outer Wall Flow, Inner Wall(s) Flow, Flow, Outer Wall Speed, Inner Wall Speed, Skin Speed, Inner Wall Acceleration, Skin Acceleration, Outer Wall Jerk, Inner Wall Jerk, Skin Jerk, and Monotonic Bottom Surface Order +- Enable/Disable USB Printing: A preference setting to indicate that you are using the printer over USB functionality. This setting lays the groundwork for automatically disabling USB printing in the next release when it’s not being used. + +* Bug fixes: +- Resolved a crash that occurred when switching materials on Sovol printers. +- Random Seam no longer favors one side and not is truly random again +- Reduced the slicing time when no support needs to be generated +- Fixed a bug where Seam on Vertex with a User Defined seam position was not working correctly. +- Gcode replacement with a single line of code no longer produces values in separate lines +- Setting names that become too long after translation are now truncated. +- Updated UltiMaker printer logos to align with the current style. +- The number of decimal places displayed for layer height in the top bar has been reduced. +- Fixed a bug that caused incorrect retracting and hopping on printers with more than 2 extruders. +- Improved how fast the settings are loaded in the Settings Visibility window +- Improved how disallowed areas are taken into account when arranging models on the buildplate + + +* Printer definitions, profiles, and materials: +- Introduced Visual Intents for the Sketch Sprint +- Introduced new Extra Fast and Draft profiles for the Sketch Sprint +- Introduced profiles for Sketch printers for Metallic PLA with improved surface quality (matte vs shiny) +- Introduce High Speed and High Speed Solid intents for Method, Method X, and Method XL +- Introduced PC ABS and PC ABS FR materials for Method X and Method XL +- Introduced Nylon Slide for UltiMaker S Series Printers +- Updated the Breakaway Build Volume Temperature for UltiMaker Factor 4 +- Introduced Makerbot Replicator + +- Updated Voron2 printers to include TPU ASA and PVA, contributed by @WCEngineer +- Enabled Relative extrusion (M82 and M83 commands) for Marlin-flavored GCode, contributed by @EmJay276 + +Cura 5.10 supports Mac OSX 12 Monterey or higher. This is because the tools that we use to create Cura builds no longer support these versions of Mac OSX. + [5.9] * New features and improvements: From a4a35ba485aaf33e2e90431f179ae7b792850d54 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Mar 2025 13:46:31 +0100 Subject: [PATCH 28/72] Fix overlapping objects after auto-arrange CURA-12453 * Use DONT_ALIGN alignment, otherwise all the transforms get re-centered, including the ones of the fixed objects * Remove DONT_ALIGN strategy for starting point, which is a non-handled case in the inner library --- cura/Arranging/Nest2DArrange.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py index 7e024f565f..5f34cb21a0 100644 --- a/cura/Arranging/Nest2DArrange.py +++ b/cura/Arranging/Nest2DArrange.py @@ -102,8 +102,7 @@ class Nest2DArrange(Arranger): NfpConfig.Alignment.BOTTOM_LEFT, NfpConfig.Alignment.BOTTOM_RIGHT, NfpConfig.Alignment.TOP_LEFT, - NfpConfig.Alignment.TOP_RIGHT, - NfpConfig.Alignment.DONT_ALIGN] + NfpConfig.Alignment.TOP_RIGHT] found_solution_for_all = False while not found_solution_for_all and len(strategies) > 0: @@ -124,7 +123,7 @@ class Nest2DArrange(Arranger): config = NfpConfig() config.accuracy = 1.0 - config.alignment = NfpConfig.Alignment.CENTER + config.alignment = NfpConfig.Alignment.DONT_ALIGN config.starting_point = strategies[0] strategies = strategies[1:] From a6ee53c944969ae72e6f441b5932bf33c729541a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Mar 2025 14:55:46 +0100 Subject: [PATCH 29/72] Fix visibility settings not being applied for lower layers CURA-12272 --- plugins/SimulationView/SimulationPass.py | 67 ++++++++++++------------ 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/plugins/SimulationView/SimulationPass.py b/plugins/SimulationView/SimulationPass.py index 080b02bd9e..436d5b8723 100644 --- a/plugins/SimulationView/SimulationPass.py +++ b/plugins/SimulationView/SimulationPass.py @@ -67,39 +67,40 @@ class SimulationPass(RenderPass): if not self._compatibility_mode: self._layer_shader.setUniformValue("u_starts_color", Color(*Application.getInstance().getTheme().getColor("layerview_starts").getRgb())) - if self._layer_view: - self._layer_shader.setUniformValue("u_max_feedrate", self._layer_view.getMaxFeedrate()) - self._layer_shader.setUniformValue("u_min_feedrate", self._layer_view.getMinFeedrate()) - self._layer_shader.setUniformValue("u_max_thickness", self._layer_view.getMaxThickness()) - self._layer_shader.setUniformValue("u_min_thickness", self._layer_view.getMinThickness()) - self._layer_shader.setUniformValue("u_max_line_width", self._layer_view.getMaxLineWidth()) - self._layer_shader.setUniformValue("u_min_line_width", self._layer_view.getMinLineWidth()) - self._layer_shader.setUniformValue("u_max_flow_rate", self._layer_view.getMaxFlowRate()) - self._layer_shader.setUniformValue("u_min_flow_rate", self._layer_view.getMinFlowRate()) - self._layer_shader.setUniformValue("u_layer_view_type", self._layer_view.getSimulationViewType()) - self._layer_shader.setUniformValue("u_extruder_opacity", self._layer_view.getExtruderOpacities()) - self._layer_shader.setUniformValue("u_show_travel_moves", self._layer_view.getShowTravelMoves()) - self._layer_shader.setUniformValue("u_show_helpers", self._layer_view.getShowHelpers()) - self._layer_shader.setUniformValue("u_show_skin", self._layer_view.getShowSkin()) - self._layer_shader.setUniformValue("u_show_infill", self._layer_view.getShowInfill()) - self._layer_shader.setUniformValue("u_show_starts", self._layer_view.getShowStarts()) - else: - #defaults - self._layer_shader.setUniformValue("u_max_feedrate", 1) - self._layer_shader.setUniformValue("u_min_feedrate", 0) - self._layer_shader.setUniformValue("u_max_thickness", 1) - self._layer_shader.setUniformValue("u_min_thickness", 0) - self._layer_shader.setUniformValue("u_max_flow_rate", 1) - self._layer_shader.setUniformValue("u_min_flow_rate", 0) - self._layer_shader.setUniformValue("u_max_line_width", 1) - self._layer_shader.setUniformValue("u_min_line_width", 0) - self._layer_shader.setUniformValue("u_layer_view_type", 1) - self._layer_shader.setUniformValue("u_extruder_opacity", [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]]) - self._layer_shader.setUniformValue("u_show_travel_moves", 0) - self._layer_shader.setUniformValue("u_show_helpers", 1) - self._layer_shader.setUniformValue("u_show_skin", 1) - self._layer_shader.setUniformValue("u_show_infill", 1) - self._layer_shader.setUniformValue("u_show_starts", 1) + for shader in [self._layer_shader, self._layer_shadow_shader]: + if self._layer_view: + shader.setUniformValue("u_max_feedrate", self._layer_view.getMaxFeedrate()) + shader.setUniformValue("u_min_feedrate", self._layer_view.getMinFeedrate()) + shader.setUniformValue("u_max_thickness", self._layer_view.getMaxThickness()) + shader.setUniformValue("u_min_thickness", self._layer_view.getMinThickness()) + shader.setUniformValue("u_max_line_width", self._layer_view.getMaxLineWidth()) + shader.setUniformValue("u_min_line_width", self._layer_view.getMinLineWidth()) + shader.setUniformValue("u_max_flow_rate", self._layer_view.getMaxFlowRate()) + shader.setUniformValue("u_min_flow_rate", self._layer_view.getMinFlowRate()) + shader.setUniformValue("u_layer_view_type", self._layer_view.getSimulationViewType()) + shader.setUniformValue("u_extruder_opacity", self._layer_view.getExtruderOpacities()) + shader.setUniformValue("u_show_travel_moves", self._layer_view.getShowTravelMoves()) + shader.setUniformValue("u_show_helpers", self._layer_view.getShowHelpers()) + shader.setUniformValue("u_show_skin", self._layer_view.getShowSkin()) + shader.setUniformValue("u_show_infill", self._layer_view.getShowInfill()) + shader.setUniformValue("u_show_starts", self._layer_view.getShowStarts()) + else: + #defaults + shader.setUniformValue("u_max_feedrate", 1) + shader.setUniformValue("u_min_feedrate", 0) + shader.setUniformValue("u_max_thickness", 1) + shader.setUniformValue("u_min_thickness", 0) + shader.setUniformValue("u_max_flow_rate", 1) + shader.setUniformValue("u_min_flow_rate", 0) + shader.setUniformValue("u_max_line_width", 1) + shader.setUniformValue("u_min_line_width", 0) + shader.setUniformValue("u_layer_view_type", 1) + shader.setUniformValue("u_extruder_opacity", [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]]) + shader.setUniformValue("u_show_travel_moves", 0) + shader.setUniformValue("u_show_helpers", 1) + shader.setUniformValue("u_show_skin", 1) + shader.setUniformValue("u_show_infill", 1) + shader.setUniformValue("u_show_starts", 1) if not self._tool_handle_shader: self._tool_handle_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "toolhandle.shader")) From 397fc2b1611be287851e556668469ad94c3f4c0f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Mar 2025 15:23:14 +0100 Subject: [PATCH 30/72] Add missing 5.9.1. changelog --- resources/texts/change_log.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 87095eaaeb..da33504591 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -55,6 +55,11 @@ Cura 5.10 supports Mac OSX 12 Monterey or higher. This is because the tools that we use to create Cura builds no longer support these versions of Mac OSX. +[5.9.1] + +* New features and improvements: +The About Page now shows some of the used sources, their licenses, and their versions in a clearer way. This will be even more complete in Cura 5.10. + [5.9] * New features and improvements: From 69eb50eb6ae4daa3a66e7c2cb1ade0ff2974363b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Mar 2025 15:58:33 +0100 Subject: [PATCH 31/72] Minor adjustments --- resources/texts/change_log.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index da33504591..1830a0fcec 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -3,7 +3,7 @@ * New features and improvements: - UltiMaker S8 Support: Added compatibility for the UltiMaker S8 printer. - Cheetah Gcode Flavor: Introduced a new Marlin-like Gcode flavor called Cheetah. -- SpaceMouse support: Interact with your object in 3D thanks to a collaboration with 3Dconnexion +- SpaceMouse support: Navigate the view seamlessly with a 3D mouse, thanks to a collaboration with 3Dconnexion. - Cloud Printing for Sketch Sprint: Enabled printing over cloud with Digital Factory for Sketch Sprint users. - Interlocking Settings: Moved Interlocking settings out of experimental into expert - Build System Upgrade: Upgraded the build system from Conan 1 to Conan 2. Updated documentation is available. @@ -22,10 +22,9 @@ - Overhanging Wall Speeds, now gives you the ability to tune multiple values. Don’t forget to adjust the Overhanging Wall Angle to start using the setting. - Minimum Layer Time with Overhang and Minimum Overhang Segment Length: Fine-tune the minimum layer time for overhangs. - Distance to Walls: Finetune combing movements. -- Overhanging Wall Speeds: Fine-tune speeds based on different overhang percentages. - Pressure Advance Factor Setting: New setting for machine definitions. - You can now tune the Bottom Surface Skin, like you can tune the Top Surface Skin! You can now tune Extruder, Layers, Line Width, Pattern, Line Directions, Outer Wall Flow, Inner Wall(s) Flow, Flow, Outer Wall Speed, Inner Wall Speed, Skin Speed, Inner Wall Acceleration, Skin Acceleration, Outer Wall Jerk, Inner Wall Jerk, Skin Jerk, and Monotonic Bottom Surface Order -- Enable/Disable USB Printing: A preference setting to indicate that you are using the printer over USB functionality. This setting lays the groundwork for automatically disabling USB printing in the next release when it’s not being used. +- Enable/Disable USB Printing: A hidden preference setting to indicate that you are using the printer over USB functionality. This setting lays the groundwork for automatically disabling USB printing in the next release when it’s not being used. * Bug fixes: - Resolved a crash that occurred when switching materials on Sovol printers. @@ -53,7 +52,7 @@ - Updated Voron2 printers to include TPU ASA and PVA, contributed by @WCEngineer - Enabled Relative extrusion (M82 and M83 commands) for Marlin-flavored GCode, contributed by @EmJay276 -Cura 5.10 supports Mac OSX 12 Monterey or higher. This is because the tools that we use to create Cura builds no longer support these versions of Mac OSX. +Cura 5.10 supports Mac OSX 12 Monterey or higher. This is because the tools that we use to create Cura builds no longer support previous versions of Mac OSX. [5.9.1] From 7440af206e5c31b47a54c1baeb54fc19363c62e1 Mon Sep 17 00:00:00 2001 From: Mariska <40423138+MariMakes@users.noreply.github.com> Date: Mon, 10 Mar 2025 16:58:11 +0100 Subject: [PATCH 32/72] Apply suggestions from code review Minor clarifications Co-authored-by: HellAholic --- resources/texts/change_log.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 1830a0fcec..4003cfd314 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -21,7 +21,7 @@ * New settings: - Overhanging Wall Speeds, now gives you the ability to tune multiple values. Don’t forget to adjust the Overhanging Wall Angle to start using the setting. - Minimum Layer Time with Overhang and Minimum Overhang Segment Length: Fine-tune the minimum layer time for overhangs. -- Distance to Walls: Finetune combing movements. +- Inside Travel Avoid Distance: Finetune combing movements. - Pressure Advance Factor Setting: New setting for machine definitions. - You can now tune the Bottom Surface Skin, like you can tune the Top Surface Skin! You can now tune Extruder, Layers, Line Width, Pattern, Line Directions, Outer Wall Flow, Inner Wall(s) Flow, Flow, Outer Wall Speed, Inner Wall Speed, Skin Speed, Inner Wall Acceleration, Skin Acceleration, Outer Wall Jerk, Inner Wall Jerk, Skin Jerk, and Monotonic Bottom Surface Order - Enable/Disable USB Printing: A hidden preference setting to indicate that you are using the printer over USB functionality. This setting lays the groundwork for automatically disabling USB printing in the next release when it’s not being used. @@ -36,7 +36,7 @@ - Updated UltiMaker printer logos to align with the current style. - The number of decimal places displayed for layer height in the top bar has been reduced. - Fixed a bug that caused incorrect retracting and hopping on printers with more than 2 extruders. -- Improved how fast the settings are loaded in the Settings Visibility window +- Improved how fast the settings are loaded in the Settings Visibility window when scrolling - Improved how disallowed areas are taken into account when arranging models on the buildplate From 782bfd01c5cda9693ce1861bf052f6f516eb7e91 Mon Sep 17 00:00:00 2001 From: Mariska <40423138+MariMakes@users.noreply.github.com> Date: Mon, 10 Mar 2025 16:59:03 +0100 Subject: [PATCH 33/72] Update MacOSx to MaxOS Update MacOSx to MaxOS Co-authored-by: HellAholic --- resources/texts/change_log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 4003cfd314..f24716761a 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -52,7 +52,7 @@ - Updated Voron2 printers to include TPU ASA and PVA, contributed by @WCEngineer - Enabled Relative extrusion (M82 and M83 commands) for Marlin-flavored GCode, contributed by @EmJay276 -Cura 5.10 supports Mac OSX 12 Monterey or higher. This is because the tools that we use to create Cura builds no longer support previous versions of Mac OSX. +Cura 5.10 supports macOS 12 Monterey or higher. This is because the tools that we use to create Cura builds no longer support previous versions of macOS. [5.9.1] From 9be6cee8cd82cce8129710bbbf0b6c4f91612f90 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Mon, 10 Mar 2025 17:04:25 +0100 Subject: [PATCH 34/72] Mention last minute bug fixes Mention last minute bug fixes --- resources/texts/change_log.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index f24716761a..d73bdd01df 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -37,8 +37,8 @@ - The number of decimal places displayed for layer height in the top bar has been reduced. - Fixed a bug that caused incorrect retracting and hopping on printers with more than 2 extruders. - Improved how fast the settings are loaded in the Settings Visibility window when scrolling -- Improved how disallowed areas are taken into account when arranging models on the buildplate - +- Improved how disallowed areas and other models are taken into account when arranging models on the buildplate +- Infill lines are now always hidden in the preview if they are disabled * Printer definitions, profiles, and materials: - Introduced Visual Intents for the Sketch Sprint From 7b23511e325e311fd1497e9d639d671bc2cf6989 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 10 Mar 2025 17:23:59 +0100 Subject: [PATCH 35/72] update preview change Not limited to infill, also includes helpers and shell --- resources/texts/change_log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index d73bdd01df..9f0a2c563a 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -38,7 +38,7 @@ - Fixed a bug that caused incorrect retracting and hopping on printers with more than 2 extruders. - Improved how fast the settings are loaded in the Settings Visibility window when scrolling - Improved how disallowed areas and other models are taken into account when arranging models on the buildplate -- Infill lines are now always hidden in the preview if they are disabled +- Preview playback now only shows visible parts. Infill lines, shell, and helpers are always hidden if disabled in preview's color scheme * Printer definitions, profiles, and materials: - Introduced Visual Intents for the Sketch Sprint From c4dd7b304ba9ee22ae82d3c875b34024aed0b1f3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 12 Mar 2025 12:03:20 +0100 Subject: [PATCH 36/72] Fix wrongly switching project name CURA-12403 --- cura/UI/PrintInformation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/UI/PrintInformation.py b/cura/UI/PrintInformation.py index 936e646946..6826c34e43 100644 --- a/cura/UI/PrintInformation.py +++ b/cura/UI/PrintInformation.py @@ -449,6 +449,6 @@ class PrintInformation(QObject): """If this is a sort of output 'device' (like local or online file storage, rather than a printer), the user could have altered the file-name, and thus the project name should be altered as well.""" if isinstance(output_device, ProjectOutputDevice): - new_name = output_device.getLastOutputName() + new_name = output_device.popLastOutputName() if new_name is not None: self.setJobName(os.path.splitext(os.path.basename(new_name))[0]) From 85eb90afbf7484b418a3f056b8b3cda7f9803640 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 13 Mar 2025 15:10:29 +0100 Subject: [PATCH 37/72] Improve TableView manual column resizing CURA-12439 --- resources/qml/TableView.qml | 115 ++++++++++++++++++++++++++++-------- 1 file changed, 92 insertions(+), 23 deletions(-) diff --git a/resources/qml/TableView.qml b/resources/qml/TableView.qml index 7da2341908..d41897996d 100644 --- a/resources/qml/TableView.qml +++ b/resources/qml/TableView.qml @@ -25,8 +25,10 @@ Item property var onDoubleClicked: function(row) {} //Something to execute when double clicked. Accepts one argument: The index of the row that was clicked on. property bool allowSelection: true //Whether to allow the user to select items. property string sectionRole: "" + property int minimumColumnWidth: 50 //The minimum width of a column while resizing. property alias flickableDirection: tableView.flickableDirection + Row { id: headerBar @@ -50,49 +52,97 @@ Item anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.right: parent.right anchors.rightMargin: UM.Theme.getSize("narrow_margin").width + anchors.verticalCenter: parent.verticalCenter wrapMode: Text.NoWrap text: modelData font: UM.Theme.getFont("medium_bold") elide: Text.ElideRight } - Item + + MouseArea { - //Resize handle. + // Resize handle anchors { right: parent.right top: parent.top bottom: parent.bottom } - width: UM.Theme.getSize("default_lining").width + anchors.rightMargin: -width / 2 + width: UM.Theme.getSize("wide_lining").width * 2 + enabled: index < headerRepeater.count - 1 + acceptedButtons: Qt.LeftButton + cursorShape: enabled ? Qt.SizeHorCursor : Qt.ArrowCursor - MouseArea + property var dragLastPos + + onPressed: (mouse) => { dragLastPos = mapToItem(parent, mouse.x, mouse.y) } + + onPositionChanged: (mouse) => { - anchors.fill: parent + let global_pos = mapToItem(parent, mouse.x, mouse.y) + let delta = global_pos.x - dragLastPos.x + dragLastPos = global_pos - cursorShape: Qt.SizeHorCursor - drag + let new_widths = [] + for(let i = 0; i < headerRepeater.count; ++i) { - target: parent - axis: Drag.XAxis + new_widths[i] = headerRepeater.itemAt(i).width; } - onMouseXChanged: + + // Reduce the delta if needed, depending on how much available space we have on the sides + if(delta > 0) { - if(drag.active) + let available_extra_width = 0 + for(let i = index + 1; i < headerRepeater.count; ++i) { - let new_width = parent.parent.width + mouseX; - let sum_widths = mouseX; - for(let i = 0; i < headerBar.children.length; ++i) - { - sum_widths += headerBar.children[i].width; - } - if(sum_widths > tableBase.width) - { - new_width -= sum_widths - tableBase.width; //Limit the total width to not exceed the view. - } - let width_fraction = new_width / tableBase.width; //Scale with the same fraction along with the total width, if the table is resized. - parent.parent.width = Qt.binding(function() { return Math.max(10, Math.round(tableBase.width * width_fraction)) }); + available_extra_width += headerRepeater.itemAt(i).width - minimumColumnWidth } + + delta = Math.min(delta, available_extra_width) + } + else if(delta < 0) + { + let available_substracted_width = 0 + for(let i = index ; i >= 0 ; --i) + { + available_substracted_width -= headerRepeater.itemAt(i).width - minimumColumnWidth + } + + delta = Math.max(delta, available_substracted_width) + } + + if(delta > 0) + { + // Enlarge the current element + new_widths[index] += delta + + // Now reduce elements on the right + for (let i = index + 1; delta > 0 && i < headerRepeater.count; ++i) + { + let substract_width = Math.min(delta, headerRepeater.itemAt(i).width - minimumColumnWidth) + new_widths[i] -= substract_width + delta -= substract_width + } + } + else if(delta < 0) + { + // Enlarge the element on the right + new_widths[index + 1] -= delta + + // Now reduce elements on the left + for (let i = index; delta < 0 && i >= 0; --i) + { + let substract_width = Math.max(delta, -(headerRepeater.itemAt(i).width - minimumColumnWidth)) + new_widths[i] += substract_width + delta -= substract_width + } + } + + // Apply the calculated widths + for(let i = 0; i < headerRepeater.count; ++i) + { + headerRepeater.itemAt(i).width = new_widths[i]; } } } @@ -101,6 +151,7 @@ Item } } } + Rectangle { color: UM.Theme.getColor("main_background") @@ -201,6 +252,24 @@ Item } } + onWidthChanged: + { + // Get the previous width but summing the width of actual columns + let previous_width = 0 + for(let i = 0; i < headerRepeater.count; ++i) + { + previous_width += headerRepeater.itemAt(i).width; + } + + // Now resize the columns while keeping their previous ratios + for(let i = 0; i < headerRepeater.count; ++i) + { + let item = headerRepeater.itemAt(i) + let item_width_ratio = item.width / previous_width; + item.width = item_width_ratio * tableBase.width + } + } + Connections { target: model From 48b449b32ed4d083e3617066cae90de5d15aaf21 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Thu, 13 Mar 2025 22:32:10 +0100 Subject: [PATCH 38/72] Rewrite experiment - Removed the version 2.x - Rewrite onTextChanged -> add logic to not execute if text is unchanged - Rewrite currentIndex & onActivated -> use findIndex instead of for loop - Add reuseItems: true -> recycle items instead of instantiating from the delegate - Remove cacheBuffer -> memory overhead (2GB for the entire list to load in one go) - Rewrite delegate -> wrap loader as a component (based on documentation), remove switch case and replace with condition check, set asynchronous to false (introduces a bit of stutter but items are loaded when viewed). --- .../qml/Preferences/SettingVisibilityPage.qml | 71 +++++++------------ 1 file changed, 24 insertions(+), 47 deletions(-) diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index f186f3e460..f7230d2c6a 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -1,8 +1,8 @@ // Copyright (c) 2022 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.1 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import UM 1.5 as UM @@ -27,10 +27,7 @@ UM.PreferencesPage ] signal scrollToSection( string key ) - onScrollToSection: - { - settingsListView.positionViewAtIndex(definitionsModel.getIndex(key), ListView.Beginning) - } + onScrollToSection: settingsListView.positionViewAtIndex(definitionsModel.getIndex(key), ListView.Beginning) function reset() { @@ -101,7 +98,13 @@ UM.PreferencesPage placeholderText: catalog.i18nc("@label:textbox", "Filter...") - onTextChanged: definitionsModel.filter = {"i18n_label|i18n_description": "*" + text} + onTextChanged: { + if (text !== lastFilterText) { + lastFilterText = text; + definitionsModel.filter = {"i18n_label|i18n_description": "*" + text}; + } + } + property string lastFilterText: "" } Cura.ComboBox @@ -118,30 +121,14 @@ UM.PreferencesPage model: settingVisibilityPresetsModel.items textRole: "name" - currentIndex: - { - var idx = -1; - for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i) - { - if(settingVisibilityPresetsModel.items[i].presetId === settingVisibilityPresetsModel.activePreset) - { - idx = i; - break; - } - } - return idx; - } - - onActivated: - { - var preset_id = settingVisibilityPresetsModel.items[index].presetId - settingVisibilityPresetsModel.setActivePreset(preset_id) - } + currentIndex: settingVisibilityPresetsModel.items.findIndex(i => i.presetId === settingVisibilityPresetsModel.activePreset) + onActivated: settingVisibilityPresetsModel.setActivePreset(settingVisibilityPresetsModel.items[index].presetId) } ListView { id: settingsListView + reuseItems: true anchors { top: filter.bottom @@ -164,34 +151,24 @@ UM.PreferencesPage expanded: ["*"] visibilityHandler: UM.SettingPreferenceVisibilityHandler {} } - cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item. property Component settingVisibilityCategory: Cura.SettingVisibilityCategory {} property Component settingVisibilityItem: Cura.SettingVisibilityItem {} - delegate: Loader - { - id: loader + delegate: Component { + Loader { + id: loader + width: settingsListView.width - scrollBar.width + height: model.type !== undefined ? UM.Theme.getSize("section").height : 0 - width: settingsListView.width - scrollBar.width - height: model.type !== undefined ? UM.Theme.getSize("section").height : 0 + property var definition: model + property var settingDefinitionsModel: definitionsModel - property var definition: model - property var settingDefinitionsModel: definitionsModel - - asynchronous: true - active: model.type !== undefined - sourceComponent: - { - switch (model.type) - { - case "category": - return settingsListView.settingVisibilityCategory - default: - return settingsListView.settingVisibilityItem - } + asynchronous: false + active: model.type !== undefined + sourceComponent: model.type === "category" ? settingsListView.settingVisibilityCategory : settingsListView.settingVisibilityItem } - } + } } } } From e1430c76fd361a5ac7fca3a93e1750be598456f1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Thu, 13 Mar 2025 22:35:05 +0100 Subject: [PATCH 39/72] fix indent --- resources/qml/Preferences/SettingVisibilityPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index f7230d2c6a..c14af51da8 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -168,7 +168,7 @@ UM.PreferencesPage active: model.type !== undefined sourceComponent: model.type === "category" ? settingsListView.settingVisibilityCategory : settingsListView.settingVisibilityItem } - } + } } } } From 90115808eef7da642b8591f16b88554437808be8 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 14 Mar 2025 11:38:45 +0100 Subject: [PATCH 40/72] Use yaml.safe_load instead of yaml.load CURA-12548 Note that this is not technically required, because external contributors can change it anyway. However, making this change will silent a security warning raised by an automatic analysis tool, and it doesn't hurt. --- printer-linter/src/terminal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/printer-linter/src/terminal.py b/printer-linter/src/terminal.py index d93372571f..774c5b4de4 100644 --- a/printer-linter/src/terminal.py +++ b/printer-linter/src/terminal.py @@ -21,7 +21,7 @@ def main() -> None: parser.add_argument("--diagnose", action="store_true", help="Diagnose the files") parser.add_argument("--deleted", action="store_true", help="Check for deleted files") parser.add_argument("--fix", action="store_true", help="Attempt to apply the suggested fixes on the files") - parser.add_argument("Files", metavar="F", type=Path, nargs="+", help="Files or directories to format") + parser.add_argument("Files", type=Path, nargs="+", help="Files or directories to format") args = parser.parse_args() files = extractFilePaths(args.Files) @@ -39,7 +39,7 @@ def main() -> None: return with open(setting_path, "r") as f: - settings = yaml.load(f, yaml.FullLoader) + settings = yaml.safe_load(f) full_body_check = {"Diagnostics": []} comments_check = {"Error Files": []} From 67d4afb97ee22faa7a782791e235382b49ffe6f2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 14 Mar 2025 12:00:24 +0100 Subject: [PATCH 41/72] Use HSTS for local OAuth2 callback server CURA-12458 This prevents possible man-in-the-middle attacks from within the user PC. Not very likely, but still a good practice. --- cura/OAuth2/AuthorizationRequestHandler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/OAuth2/AuthorizationRequestHandler.py b/cura/OAuth2/AuthorizationRequestHandler.py index 9affee9911..5263cb8c2d 100644 --- a/cura/OAuth2/AuthorizationRequestHandler.py +++ b/cura/OAuth2/AuthorizationRequestHandler.py @@ -127,6 +127,7 @@ class AuthorizationRequestHandler(BaseHTTPRequestHandler): def _sendHeaders(self, status: "ResponseStatus", content_type: str, redirect_uri: str = None) -> None: self.send_response(status.code, status.message) self.send_header("Content-type", content_type) + self.send_header("Strict-Transport-Security", "max-age=900") if redirect_uri: self.send_header("Location", redirect_uri) self.end_headers() From 0e5f2822382276bd3b04377ef8427e3d7e756e06 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 15 Mar 2025 22:07:57 +0100 Subject: [PATCH 42/72] Replace for loop with map() and remove redundant else - map().join is a better fit that replaces the for loop and a if/else since there is no complex logic involved. - there is a return inside the if statement for requires.length ===0, so no need for else statement as the code execution stops with return --- .../qml/Preferences/SettingVisibilityItem.qml | 43 ++++++++----------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/resources/qml/Preferences/SettingVisibilityItem.qml b/resources/qml/Preferences/SettingVisibilityItem.qml index 52b06b3dee..a7f4a47e23 100644 --- a/resources/qml/Preferences/SettingVisibilityItem.qml +++ b/resources/qml/Preferences/SettingVisibilityItem.qml @@ -46,33 +46,26 @@ Item text: { - if(provider.properties.enabled == "True") - { - return "" - } - var key = definition ? definition.key : "" - var requires = settingDefinitionsModel.getRequires(key, "enabled") - if (requires.length == 0) - { - return catalog.i18nc("@item:tooltip", "This setting has been hidden by the active machine and will not be visible."); - } - else - { - var requires_text = "" - for (var i in requires) - { - if (requires_text == "") - { - requires_text = requires[i].label - } - else - { - requires_text += ", " + requires[i].label - } - } + if (provider.properties.enabled === "True") return ""; - return catalog.i18ncp("@item:tooltip %1 is list of setting names", "This setting has been hidden by the value of %1. Change the value of that setting to make this setting visible.", "This setting has been hidden by the values of %1. Change the values of those settings to make this setting visible.", requires.length) .arg(requires_text); + var key = definition ? definition.key : ""; + var requires = settingDefinitionsModel.getRequires(key, "enabled"); + + if (requires.length === 0) { + return catalog.i18nc( + "@item:tooltip", + "This setting has been hidden by the active machine and will not be visible." + ); } + + var requiresText = requires.map(r => r.label).join(", "); + + return catalog.i18ncp( + "@item:tooltip %1 is list of setting names", + "This setting has been hidden by the value of %1. Change the value of that setting to make this setting visible.", + "This setting has been hidden by the values of %1. Change the values of those settings to make this setting visible.", + requires.length + ).arg(requiresText); } UM.ColorImage From 656701751236a71888ec1a3f207973ce74c01423 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 15 Mar 2025 22:25:23 +0100 Subject: [PATCH 43/72] set QtQuick and QtQuick.Controls to 2.15 --- resources/qml/Preferences/SettingVisibilityPage.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index c14af51da8..490e7768bc 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -1,8 +1,8 @@ // Copyright (c) 2022 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick -import QtQuick.Controls +import QtQuick 2.15 +import QtQuick.Controls 2.15 import UM 1.5 as UM From b549542f18a79692026c746a68f3f1cf3d8a8762 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 15 Mar 2025 22:31:25 +0100 Subject: [PATCH 44/72] lint --- resources/qml/Preferences/SettingVisibilityPage.qml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index 490e7768bc..f3fca52104 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -98,8 +98,10 @@ UM.PreferencesPage placeholderText: catalog.i18nc("@label:textbox", "Filter...") - onTextChanged: { - if (text !== lastFilterText) { + onTextChanged: + { + if (text !== lastFilterText) + { lastFilterText = text; definitionsModel.filter = {"i18n_label|i18n_description": "*" + text}; } @@ -155,8 +157,10 @@ UM.PreferencesPage property Component settingVisibilityCategory: Cura.SettingVisibilityCategory {} property Component settingVisibilityItem: Cura.SettingVisibilityItem {} - delegate: Component { - Loader { + delegate: Component + { + Loader + { id: loader width: settingsListView.width - scrollBar.width height: model.type !== undefined ? UM.Theme.getSize("section").height : 0 From 5a9b776d2b5e94133352e2158755b8909eba7f1f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 17 Mar 2025 14:48:45 +0100 Subject: [PATCH 45/72] Enable flooring settings when flooring is actually active CURA-12472 --- resources/definitions/fdmprinter.def.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7ec5cb6157..c93c11a245 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3049,6 +3049,7 @@ "minimum_value": "0.0001", "minimum_value_warning": "50", "maximum_value_warning": "150", + "enabled": "flooring_layer_count > 0 and bottom_layers > 0", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -3063,6 +3064,7 @@ "minimum_value": "0.0001", "minimum_value_warning": "50", "maximum_value_warning": "150", + "enabled": "flooring_layer_count > 0 and bottom_layers > 0", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true } @@ -3492,6 +3494,7 @@ "maximum_value_warning": "150", "default_value": 30, "value": "speed_wall_0", + "enabled": "flooring_layer_count > 0 and bottom_layers > 0", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -3506,6 +3509,7 @@ "maximum_value_warning": "150", "default_value": 60, "value": "speed_wall_x", + "enabled": "flooring_layer_count > 0 and bottom_layers > 0", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true } @@ -3908,7 +3912,7 @@ "maximum_value_warning": "10000", "default_value": 3000, "value": "acceleration_wall_0", - "enabled": "resolveOrValue('acceleration_enabled')", + "enabled": "resolveOrValue('acceleration_enabled') and flooring_layer_count > 0 and bottom_layers > 0", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -3923,7 +3927,7 @@ "maximum_value_warning": "10000", "default_value": 3000, "value": "acceleration_wall_x", - "enabled": "resolveOrValue('acceleration_enabled')", + "enabled": "resolveOrValue('acceleration_enabled') and flooring_layer_count > 0 and bottom_layers > 0", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true } @@ -4279,7 +4283,7 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_wall_0", - "enabled": "resolveOrValue('jerk_enabled')", + "enabled": "resolveOrValue('jerk_enabled') and flooring_layer_count > 0 and bottom_layers > 0", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -4293,7 +4297,7 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_wall_x", - "enabled": "resolveOrValue('jerk_enabled')", + "enabled": "resolveOrValue('jerk_enabled') and flooring_layer_count > 0 and bottom_layers > 0", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true } From 7a2cb6480c4208103be5eb49cbd267ea714b5b07 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 17 Mar 2025 14:52:51 +0100 Subject: [PATCH 46/72] Enable roofing settings when roofing is actually active CURA-12472 --- resources/definitions/fdmprinter.def.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c93c11a245..b42b5c417a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3021,6 +3021,7 @@ "minimum_value": "0.0001", "minimum_value_warning": "50", "maximum_value_warning": "150", + "enabled": "roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -3035,6 +3036,7 @@ "minimum_value": "0.0001", "minimum_value_warning": "50", "maximum_value_warning": "150", + "enabled": "roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true }, @@ -3466,6 +3468,7 @@ "maximum_value_warning": "150", "default_value": 30, "value": "speed_wall_0", + "enabled": "roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -3480,6 +3483,7 @@ "maximum_value_warning": "150", "default_value": 60, "value": "speed_wall_x", + "enabled": "roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true }, @@ -3882,7 +3886,7 @@ "maximum_value_warning": "10000", "default_value": 3000, "value": "acceleration_wall_0", - "enabled": "resolveOrValue('acceleration_enabled')", + "enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -3897,7 +3901,7 @@ "maximum_value_warning": "10000", "default_value": 3000, "value": "acceleration_wall_x", - "enabled": "resolveOrValue('acceleration_enabled')", + "enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true }, @@ -4255,7 +4259,7 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_wall_0", - "enabled": "resolveOrValue('jerk_enabled')", + "enabled": "resolveOrValue('jerk_enabled') and roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -4269,7 +4273,7 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_wall_x", - "enabled": "resolveOrValue('jerk_enabled')", + "enabled": "resolveOrValue('jerk_enabled') and roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "wall_x_extruder_nr", "settable_per_mesh": true }, From d1b0a59565e9bc33a54c58b871b77c3af6ce4939 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 17 Mar 2025 15:19:59 +0100 Subject: [PATCH 47/72] Update S8 profiles: - Adjust warning levels to reflect the new motion limits - Enable floor layers (0 to 1) to improve bottom quality - Use normal prime tower (iso interleaving) for improved robustness - Increase skirt/brim length to ensure a good start of extrusion - Increase support line width from 0.4mm to 0.5mm for sturdier tree supports - Reduce support speed to wall_speed to improve tree support robustness PP-595 --- resources/definitions/ultimaker_s8.def.json | 178 +++++++++++++++++--- 1 file changed, 155 insertions(+), 23 deletions(-) diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index fd758f6e2a..9b8af0af56 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -48,27 +48,145 @@ }, "overrides": { - "acceleration_infill": { "value": "acceleration_print" }, - "acceleration_layer_0": { "value": 2000 }, - "acceleration_prime_tower": { "value": "acceleration_print" }, - "acceleration_print": { "value": 20000 }, - "acceleration_print_layer_0": { "value": "acceleration_layer_0" }, - "acceleration_roofing": { "value": "acceleration_wall_0" }, - "acceleration_skirt_brim": { "value": "acceleration_layer_0" }, - "acceleration_support": { "value": "acceleration_print" }, - "acceleration_support_bottom": { "value": "acceleration_support_interface" }, - "acceleration_support_infill": { "value": "acceleration_support" }, - "acceleration_support_interface": { "value": "acceleration_support" }, - "acceleration_support_roof": { "value": "acceleration_support_interface" }, - "acceleration_topbottom": { "value": "acceleration_print" }, - "acceleration_travel": { "value": 10000 }, + "acceleration_flooring": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_roofing" + }, + "acceleration_infill": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_print" + }, + "acceleration_layer_0": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": 2000 + }, + "acceleration_prime_tower": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_print" + }, + "acceleration_print": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": 20000 + }, + "acceleration_print_layer_0": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_layer_0" + }, + "acceleration_roofing": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_wall_0" + }, + "acceleration_skirt_brim": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_layer_0" + }, + "acceleration_support": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_print" + }, + "acceleration_support_bottom": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_support_interface" + }, + "acceleration_support_infill": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_support" + }, + "acceleration_support_interface": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_support" + }, + "acceleration_support_roof": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_support_interface" + }, + "acceleration_topbottom": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_print" + }, + "acceleration_travel": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": 10000 + }, "acceleration_travel_enabled": { "value": true }, - "acceleration_travel_layer_0": { "value": "acceleration_layer_0" }, - "acceleration_wall": { "value": "acceleration_print/8" }, - "acceleration_wall_0": { "value": "acceleration_wall" }, - "acceleration_wall_0_roofing": { "value": "acceleration_wall_0" }, - "acceleration_wall_x": { "value": "acceleration_print" }, - "acceleration_wall_x_roofing": { "value": "acceleration_wall" }, + "acceleration_travel_layer_0": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_layer_0" + }, + "acceleration_wall": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_print/8" + }, + "acceleration_wall_0": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_wall" + }, + "acceleration_wall_0_flooring": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_wall_0_roofing" + }, + "acceleration_wall_0_roofing": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_wall_0" + }, + "acceleration_wall_x": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_print" + }, + "acceleration_wall_x_flooring": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_wall_x_roofing" + }, + "acceleration_wall_x_roofing": + { + "maximum_value": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x", + "value": "acceleration_wall" + }, "adhesion_type": { "value": "'brim' if support_enable and support_structure=='tree' else 'skirt'" }, "bottom_thickness": { "value": "3*layer_height if top_layers==4 and not support_enable else top_bottom_thickness" }, "bridge_skin_material_flow": { "value": 200 }, @@ -89,10 +207,14 @@ "cool_min_layer_time_overhang": { "value": 9 }, "cool_min_layer_time_overhang_min_segment_length": { "value": 2 }, "cool_min_speed": { "value": 6 }, - "cool_min_temperature": { "value": "material_print_temperature-15" }, + "cool_min_temperature": + { + "minimum_value_warning": "material_print_temperature-15", + "value": "material_print_temperature-15" + }, "default_material_print_temperature": { "maximum_value_warning": 320 }, "extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" }, - "flooring_layer_count": { "value": 0 }, + "flooring_layer_count": { "value": 1 }, "gradual_flow_enabled": { "value": false }, "hole_xy_offset": { "value": 0.075 }, "infill_material_flow": { "value": "material_flow" }, @@ -241,6 +363,8 @@ "value": "jerk_wall_0" }, "machine_gcode_flavor": { "default_value": "Cheetah" }, + "machine_max_acceleration_x": { "default_value": 50000 }, + "machine_max_acceleration_y": { "default_value": 50000 }, "machine_max_feedrate_x": { "default_value": 500 }, "machine_max_feedrate_y": { "default_value": 500 }, "machine_max_jerk_e": @@ -281,6 +405,7 @@ "optimize_wall_printing_order": { "value": false }, "prime_tower_brim_enable": { "value": true }, "prime_tower_min_volume": { "value": 10 }, + "prime_tower_mode": { "resolve": "'normal'" }, "retraction_amount": { "value": 6.5 }, "retraction_combing_avoid_distance": { "value": 1.2 }, "retraction_combing_max_distance": { "value": 50 }, @@ -293,6 +418,7 @@ "skin_material_flow": { "value": 95 }, "skin_overlap": { "value": 0 }, "skin_preshrink": { "value": 0 }, + "skirt_brim_minimal_length": { "value": 1000 }, "skirt_brim_speed": { "maximum_value_warning": 300, @@ -344,7 +470,7 @@ "speed_support": { "maximum_value_warning": 300, - "value": "speed_print" + "value": "speed_wall" }, "speed_support_bottom": { @@ -374,11 +500,13 @@ "speed_travel": { "maximum_value": 500, + "maximum_value_warning": 500, "value": 400 }, "speed_travel_layer_0": { "maximum_value": 500, + "maximum_value_warning": 500, "value": 150 }, "speed_wall": @@ -417,13 +545,17 @@ "value": "speed_wall" }, "support_angle": { "value": 60 }, + "support_bottom_distance": { "maximum_value_warning": "3*layer_height" }, "support_bottom_offset": { "value": 0 }, "support_brim_width": { "value": 10 }, "support_interface_enable": { "value": true }, "support_interface_offset": { "value": "support_offset" }, + "support_line_width": { "value": "1.25*line_width" }, "support_offset": { "value": "1.2 if support_structure == 'tree' else 0.8" }, "support_pattern": { "value": "'gyroid' if support_structure == 'tree' else 'lines'" }, + "support_roof_height": { "minimum_value_warning": 0 }, "support_structure": { "value": "'normal'" }, + "support_top_distance": { "maximum_value_warning": "3*layer_height" }, "support_tree_bp_diameter": { "value": 15 }, "support_tree_tip_diameter": { "value": 1.0 }, "support_tree_top_rate": { "value": 20 }, From 3b5432912c4b76138b3990bc88587a6a21ead919 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 17 Mar 2025 16:22:11 +0100 Subject: [PATCH 48/72] Standardize QML code CURA-12466 --- .../qml/Preferences/SettingVisibilityPage.qml | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index f3fca52104..60599c93fc 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -154,25 +154,31 @@ UM.PreferencesPage visibilityHandler: UM.SettingPreferenceVisibilityHandler {} } - property Component settingVisibilityCategory: Cura.SettingVisibilityCategory {} - property Component settingVisibilityItem: Cura.SettingVisibilityItem {} + Component + { + id: settingVisibilityCategory + Cura.SettingVisibilityCategory {} + } - delegate: Component - { - Loader - { - id: loader - width: settingsListView.width - scrollBar.width - height: model.type !== undefined ? UM.Theme.getSize("section").height : 0 + Component + { + id: settingVisibilityItem + Cura.SettingVisibilityItem {} + } - property var definition: model - property var settingDefinitionsModel: definitionsModel + delegate: Loader + { + id: loader + width: settingsListView.width - scrollBar.width + height: model.type !== undefined ? UM.Theme.getSize("section").height : 0 - asynchronous: false - active: model.type !== undefined - sourceComponent: model.type === "category" ? settingsListView.settingVisibilityCategory : settingsListView.settingVisibilityItem - } - } + property var definition: model + property var settingDefinitionsModel: definitionsModel + + asynchronous: false + active: model.type !== undefined + sourceComponent: model.type === "category" ? settingVisibilityCategory : settingVisibilityItem + } } } } From 7204cdfa968bbe3924d95fddc0d21744278d3c56 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 17 Mar 2025 16:35:18 +0100 Subject: [PATCH 49/72] Revert onTextChange --- resources/qml/Preferences/SettingVisibilityPage.qml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index 60599c93fc..73fd021fa2 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -98,15 +98,7 @@ UM.PreferencesPage placeholderText: catalog.i18nc("@label:textbox", "Filter...") - onTextChanged: - { - if (text !== lastFilterText) - { - lastFilterText = text; - definitionsModel.filter = {"i18n_label|i18n_description": "*" + text}; - } - } - property string lastFilterText: "" + onTextChanged: definitionsModel.filter = {"i18n_label|i18n_description": "*" + text} } Cura.ComboBox From 09c49126a84c81ecd63b475bcd0113b06633a3f8 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Mon, 17 Mar 2025 16:26:52 +0100 Subject: [PATCH 50/72] [PP-593] Mark Nylon CF Slide as experimental on CC 0.4 cores --- .../um_s3_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg | 1 + .../um_s5_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg | 1 + .../ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm.inst.cfg | 3 ++- .../ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm.inst.cfg | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/intent/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg index 6b0e052ec9..8d8e73a1a8 100644 --- a/resources/intent/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -5,6 +5,7 @@ version = 4 [metadata] intent_category = engineering +is_experimental = True material = generic_nylon-cf-slide quality_type = draft setting_version = 25 diff --git a/resources/intent/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg index 0e2138ce25..a89e4eb944 100644 --- a/resources/intent/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -5,6 +5,7 @@ version = 4 [metadata] intent_category = engineering +is_experimental = True material = generic_nylon-cf-slide quality_type = draft setting_version = 25 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm.inst.cfg index 611f5bc5a6..128d0bef77 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_nylon-cf-slide_0.2mm.inst.cfg @@ -1,9 +1,10 @@ [general] definition = ultimaker_s3 -name = Fast +name = Fast - Experimental version = 4 [metadata] +is_experimental = True material = generic_nylon-cf-slide quality_type = draft setting_version = 25 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm.inst.cfg index 08c199737d..87651a1870 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_nylon-cf-slide_0.2mm.inst.cfg @@ -1,9 +1,10 @@ [general] definition = ultimaker_s5 -name = Fast +name = Fast - Experimental version = 4 [metadata] +is_experimental = True material = generic_nylon-cf-slide quality_type = draft setting_version = 25 From 24c749c64be46188d2d8627fa637e4eb63a37f5d Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 17 Mar 2025 17:08:15 +0100 Subject: [PATCH 51/72] Reduce the warning limits such that they do not overlap the max limits. PP-595 --- resources/definitions/ultimaker_s8.def.json | 50 ++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index 9b8af0af56..bc5dae085c 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -51,140 +51,140 @@ "acceleration_flooring": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_roofing" }, "acceleration_infill": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_print" }, "acceleration_layer_0": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": 2000 }, "acceleration_prime_tower": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_print" }, "acceleration_print": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": 20000 }, "acceleration_print_layer_0": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_layer_0" }, "acceleration_roofing": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_wall_0" }, "acceleration_skirt_brim": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_layer_0" }, "acceleration_support": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_print" }, "acceleration_support_bottom": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_support_interface" }, "acceleration_support_infill": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_support" }, "acceleration_support_interface": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_support" }, "acceleration_support_roof": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_support_interface" }, "acceleration_topbottom": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_print" }, "acceleration_travel": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": 10000 }, "acceleration_travel_enabled": { "value": true }, "acceleration_travel_layer_0": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_layer_0" }, "acceleration_wall": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_print/8" }, "acceleration_wall_0": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_wall" }, "acceleration_wall_0_flooring": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_wall_0_roofing" }, "acceleration_wall_0_roofing": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_wall_0" }, "acceleration_wall_x": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_print" }, "acceleration_wall_x_flooring": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_wall_x_roofing" }, "acceleration_wall_x_roofing": { "maximum_value": "machine_max_acceleration_x", - "maximum_value_warning": "machine_max_acceleration_x", + "maximum_value_warning": "machine_max_acceleration_x*0.8", "value": "acceleration_wall" }, "adhesion_type": { "value": "'brim' if support_enable and support_structure=='tree' else 'skirt'" }, @@ -500,13 +500,13 @@ "speed_travel": { "maximum_value": 500, - "maximum_value_warning": 500, + "maximum_value_warning": 400, "value": 400 }, "speed_travel_layer_0": { "maximum_value": 500, - "maximum_value_warning": 500, + "maximum_value_warning": 400, "value": 150 }, "speed_wall": From 05e8b4283b83bf83fa81fe10e598e0b08d7118f1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 17 Mar 2025 16:37:46 +0000 Subject: [PATCH 52/72] Set conan package version 5.10.0 --- conandata.yml | 14 +++++++------- resources/conandata.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conandata.yml b/conandata.yml index 5af5cdef64..698c1238f6 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,15 +1,15 @@ -version: "5.10.0-beta.1" +version: "5.10.0" requirements: - - "cura_resources/5.10.0-beta.1" - - "uranium/5.10.0-beta.1" - - "curaengine/5.10.0-beta.1" - - "cura_binary_data/5.10.0-beta.1" - - "fdm_materials/5.10.0-beta.1" + - "cura_resources/5.10.0" + - "uranium/5.10.0" + - "curaengine/5.10.0" + - "cura_binary_data/5.10.0" + - "fdm_materials/5.10.0" - "dulcificum/5.10.0" - "pysavitar/5.10.0" - "pynest2d/5.10.0" requirements_internal: - - "fdm_materials/5.10.0-beta.1" + - "fdm_materials/5.10.0" - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" diff --git a/resources/conandata.yml b/resources/conandata.yml index 8236ba70b5..a30e8f2613 100644 --- a/resources/conandata.yml +++ b/resources/conandata.yml @@ -1 +1 @@ -version: "5.10.0-beta.1" +version: "5.10.0" From 3348c292783871411b700c26f6fe20e27a89123b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 18 Mar 2025 14:12:34 +0100 Subject: [PATCH 53/72] Apply review suggestions CURA-12439 --- resources/qml/TableView.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/TableView.qml b/resources/qml/TableView.qml index d41897996d..30087dcece 100644 --- a/resources/qml/TableView.qml +++ b/resources/qml/TableView.qml @@ -67,8 +67,8 @@ Item right: parent.right top: parent.top bottom: parent.bottom + rightMargin: -width / 2 } - anchors.rightMargin: -width / 2 width: UM.Theme.getSize("wide_lining").width * 2 enabled: index < headerRepeater.count - 1 acceptedButtons: Qt.LeftButton @@ -76,9 +76,9 @@ Item property var dragLastPos - onPressed: (mouse) => { dragLastPos = mapToItem(parent, mouse.x, mouse.y) } + onPressed: function(mouse) { dragLastPos = mapToItem(parent, mouse.x, mouse.y) } - onPositionChanged: (mouse) => + onPositionChanged: function(mouse) { let global_pos = mapToItem(parent, mouse.x, mouse.y) let delta = global_pos.x - dragLastPos.x From 3fbfca48d81600cf0d6f5154b2c9a86c7a00a7fd Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 18 Mar 2025 16:14:50 +0100 Subject: [PATCH 54/72] Fix fallback setting error. --- resources/definitions/ultimaker.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 65ceaf6f0f..2e9f4abda1 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -84,7 +84,7 @@ "material_standby_temperature": { "minimum_value": "0", - "value": "material_print_temperature - 100" + "value": "resolveOrValue('material_print_temperature') - 100" }, "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" }, "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" }, From e1baa171c3849eb32e6fac7c4754a2d792fa51c2 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 19 Mar 2025 11:28:03 +0100 Subject: [PATCH 55/72] capitalization --- resources/definitions/ultimaker_s8.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index bc5dae085c..9aa7e00d4f 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "Ultimaker S8", + "name": "UltiMaker S8", "inherits": "ultimaker_s7", "metadata": { "visible": true, - "author": "Ultimaker", + "author": "UltiMaker", "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s7_platform.obj", @@ -577,4 +577,4 @@ "z_seam_position": { "value": "'backright'" }, "z_seam_type": { "value": "'sharpest_corner'" } } -} \ No newline at end of file +} From 65e3a3666ece2cc7f51db21c2f7b61f6ae7c944e Mon Sep 17 00:00:00 2001 From: HellAholic <28710690+HellAholic@users.noreply.github.com> Date: Wed, 19 Mar 2025 10:29:28 +0000 Subject: [PATCH 56/72] Apply printer-linter format --- resources/definitions/ultimaker_s8.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index 9aa7e00d4f..379ca626ec 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -577,4 +577,4 @@ "z_seam_position": { "value": "'backright'" }, "z_seam_type": { "value": "'sharpest_corner'" } } -} +} \ No newline at end of file From a9018a06c4233132ce717bfbbecbce6141f8ec4e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 19 Mar 2025 15:39:00 +0100 Subject: [PATCH 57/72] Have developer/tester/etc. builds be distinct per biweekly day. Less cause for confusion when sending out internal builds to test/develop on. CURA-12469 --- conanfile.py | 24 ++++++++++++++++++++++++ resources/themes/daily_test_colors.json | 16 ++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 resources/themes/daily_test_colors.json diff --git a/conanfile.py b/conanfile.py index b3e070e3b3..c727a6d293 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,8 +1,10 @@ +import json import os import requests import yaml import tempfile import tarfile +from datetime import datetime from io import StringIO from pathlib import Path from git import Repo @@ -562,6 +564,25 @@ class CuraConan(ConanFile): self.cpp.package.bindirs = ["bin"] self.cpp.package.resdirs = ["resources", "plugins", "packaging"] + def _make_internal_distinct(self): + test_colors_path = Path(self.source_folder, "resources", "themes", "daily_test_colors.json") + if self.options.internal: + biweekly_day = (datetime.now() - datetime(2025, 3, 14)).days + with test_colors_path.open("r") as test_colors_file: + test_colors = json.load(test_colors_file) + for theme_dir in Path(self.source_folder, "resources", "themes").iterdir(): + if theme_dir.is_dir(): + theme_path = Path(theme_dir, "theme.json") + if theme_path.exists(): + with theme_path.open("r") as theme_file: + theme = json.load(theme_file) + if theme["colors"]: + theme["colors"]["main_window_header_background"] = test_colors[biweekly_day] + with theme_path.open("w") as theme_file: + json.dump(theme, theme_file) + elif test_colors_path.exists(): + test_colors_path.unlink() + def generate(self): copy(self, "cura_app.py", self.source_folder, str(self._script_dir)) @@ -581,6 +602,9 @@ class CuraConan(ConanFile): copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(Path(self.source_folder, "resources", "bundled_packages")), keep_path = False) + # Make internal versions built on different days distinct, so people don't get confused while testing. + self._make_internal_distinct() + # Copy resources of cura_binary_data cura_binary_data = self.dependencies["cura_binary_data"].cpp_info copy(self, "*", cura_binary_data.resdirs[0], str(self._share_dir.joinpath("cura")), keep_path = True) diff --git a/resources/themes/daily_test_colors.json b/resources/themes/daily_test_colors.json new file mode 100644 index 0000000000..1cfa2baa74 --- /dev/null +++ b/resources/themes/daily_test_colors.json @@ -0,0 +1,16 @@ +[ + [ 62, 33, 55, 255], + [126, 196, 193, 255], + [126, 196, 193, 255], + [215, 155, 125, 255], + [228, 148, 58, 255], + [192, 199, 65, 255], + [157, 48, 59, 255], + [140, 143, 174, 255], + [ 23, 67, 75, 255], + [ 23, 67, 75, 255], + [154, 99, 72, 255], + [112, 55, 127, 255], + [100, 125, 52, 255], + [210, 100, 113, 255] +] From bc4d57348cc223f115e384aa0a72baa0a585ed97 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 19 Mar 2025 16:27:31 +0100 Subject: [PATCH 58/72] Version has been bumped a while ago. Needed to test CURA-12469 (and I suppose it doesn't hurt for anything else that needs the internal data). --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 50d27455a2..20392c6e44 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,7 +10,7 @@ requirements: - "pynest2d/5.10.0" requirements_internal: - "fdm_materials/5.11.0-alpha.0@ultimaker/testing" - - "cura_private_data/5.10.0-alpha.0@internal/testing" + - "cura_private_data/5.11.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: From 2b032af13c3ed1e43baa9c706fd0c3581b544c6c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 19 Mar 2025 16:39:37 +0100 Subject: [PATCH 59/72] Broaden the 'internal' condition a bit. Should help with testing as well. CURA-12469 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index c727a6d293..994dfb63a4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -566,7 +566,7 @@ class CuraConan(ConanFile): def _make_internal_distinct(self): test_colors_path = Path(self.source_folder, "resources", "themes", "daily_test_colors.json") - if self.options.internal: + if "alpha" in self.version: biweekly_day = (datetime.now() - datetime(2025, 3, 14)).days with test_colors_path.open("r") as test_colors_file: test_colors = json.load(test_colors_file) From b01b3be245f32440aab3a1a66b948e00daf91b35 Mon Sep 17 00:00:00 2001 From: Frederic98 <13856291+Frederic98@users.noreply.github.com> Date: Thu, 20 Mar 2025 10:05:53 +0100 Subject: [PATCH 60/72] [PP-600] Reduce S8 travel speed to 300 --- resources/definitions/ultimaker_s8.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index 379ca626ec..80e7986acf 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -500,13 +500,13 @@ "speed_travel": { "maximum_value": 500, - "maximum_value_warning": 400, - "value": 400 + "maximum_value_warning": 300, + "value": 300 }, "speed_travel_layer_0": { "maximum_value": 500, - "maximum_value_warning": 400, + "maximum_value_warning": 300, "value": 150 }, "speed_wall": From 7ba07d0236d05822220b4dbe4589d090d92ed46b Mon Sep 17 00:00:00 2001 From: THeijmans Date: Thu, 20 Mar 2025 09:56:33 +0100 Subject: [PATCH 61/72] PP-599 slower unretracts to reduce extrusion issues --- .../ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg index 4ed174596a..1085302fc7 100644 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg @@ -13,4 +13,5 @@ weight = -2 [values] cool_min_layer_time_fan_speed_max = 11 +retraction_prime_speed = 15 From bf2eef3537d6f9ef3237f39cf8b303563d1804ff Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 21 Mar 2025 10:13:46 +0100 Subject: [PATCH 62/72] Revert "Merge pull request #20128 from Ultimaker/CURA-12371" This reverts commit f2ebf160a5770a8ed9a2e32153f4380011eb51cd, reversing changes made to 97deb2f15ea4f2b904d14270d0d2a8b0fff19009. --- plugins/MakerbotWriter/MakerbotWriter.py | 78 +----------------------- 1 file changed, 1 insertion(+), 77 deletions(-) diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index e4c2d2cbd1..f35b53a84d 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -258,87 +258,11 @@ class MakerbotWriter(MeshWriter): meta["preferences"] = dict() bounds = application.getBuildVolume().getBoundingBox() - intent = CuraApplication.getInstance().getIntentManager().currentIntentCategory meta["preferences"]["instance0"] = { "machineBounds": [bounds.right, bounds.front, bounds.left, bounds.back] if bounds is not None else None, - "printMode": intent + "printMode": CuraApplication.getInstance().getIntentManager().currentIntentCategory, } - if file_format == "application/x-makerbot": - accel_overrides = meta["accel_overrides"] = {} - if intent in ['highspeed', 'highspeedsolid']: - accel_overrides['do_input_shaping'] = True - accel_overrides['do_corner_rounding'] = True - bead_mode_overrides = accel_overrides["bead_mode"] = {} - - accel_enabled = global_stack.getProperty('acceleration_enabled', 'value') - - if accel_enabled: - global_accel_setting = global_stack.getProperty('acceleration_print', 'value') - accel_overrides["rate_mm_per_s_sq"] = { - "x": global_accel_setting, - "y": global_accel_setting - } - - if global_stack.getProperty('acceleration_travel_enabled', 'value'): - travel_accel_setting = global_stack.getProperty('acceleration_travel', 'value') - bead_mode_overrides['Travel Move'] = { - "rate_mm_per_s_sq": { - "x": travel_accel_setting, - "y": travel_accel_setting - } - } - - jerk_enabled = global_stack.getProperty('jerk_enabled', 'value') - if jerk_enabled: - global_jerk_setting = global_stack.getProperty('jerk_print', 'value') - accel_overrides["max_speed_change_mm_per_s"] = { - "x": global_jerk_setting, - "y": global_jerk_setting - } - - if global_stack.getProperty('jerk_travel_enabled', 'value'): - travel_jerk_setting = global_stack.getProperty('jerk_travel', 'value') - if 'Travel Move' not in bead_mode_overrides: - bead_mode_overrides['Travel Move' ] = {} - bead_mode_overrides['Travel Move'].update({ - "max_speed_change_mm_per_s": { - "x": travel_jerk_setting, - "y": travel_jerk_setting - } - }) - - - # Get bead mode settings per extruder - available_bead_modes = { - "infill": "FILL", - "prime_tower": "PRIME_TOWER", - "roofing": "TOP_SURFACE", - "support_infill": "SUPPORT", - "support_interface": "SUPPORT_INTERFACE", - "wall_0": "WALL_OUTER", - "wall_x": "WALL_INNER", - "skirt_brim": "SKIRT" - } - for idx, extruder in enumerate(extruders): - for bead_mode_setting, bead_mode_tag in available_bead_modes.items(): - ext_specific_tag = "%s_%s" % (bead_mode_tag, idx) - if accel_enabled or jerk_enabled: - bead_mode_overrides[ext_specific_tag] = {} - - if accel_enabled: - accel_val = extruder.getProperty('acceleration_%s' % bead_mode_setting, 'value') - bead_mode_overrides[ext_specific_tag]["rate_mm_per_s_sq"] = { - "x": accel_val, - "y": accel_val - } - if jerk_enabled: - jerk_val = extruder.getProperty('jerk_%s' % bead_mode_setting, 'value') - bead_mode_overrides[ext_specific_tag][ "max_speed_change_mm_per_s"] = { - "x": jerk_val, - "y": jerk_val - } - meta["miracle_config"] = {"gaggles": {"instance0": {}}} version_info = dict() From ed7372b3801a1d5295676d00e5b6556a00f9a8a0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 21 Mar 2025 10:24:55 +0100 Subject: [PATCH 63/72] Revert "Merge pull request #20129 from Ultimaker/PP-544-HS-Method" This reverts commit 53f4046a513ea3e341bde572d237409cd0e9bf8f, reversing changes made to f2ebf160a5770a8ed9a2e32153f4380011eb51cd. --- .../ultimaker_method_base.def.json | 238 ++++-------------- ...hod_1a_um-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...a_um-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ..._um-tough-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...ough-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ...hod_1c_um-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...c_um-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ..._um-tough-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...ough-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ...d_labs_um-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...s_um-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ..._um-tough-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...ough-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ...odx_1a_um-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...a_um-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ..._um-tough-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...ough-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ...dx_1c_um-absr-175_0.2mm_highspeed.inst.cfg | 32 --- ..._um-absr-175_0.2mm_highspeedsolid.inst.cfg | 38 --- ...odx_1c_um-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...c_um-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ..._um-tough-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...ough-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ...x_1xa_um-absr-175_0.2mm_highspeed.inst.cfg | 32 --- ..._um-absr-175_0.2mm_highspeedsolid.inst.cfg | 38 --- ..._labs_um-absr-175_0.2mm_highspeed.inst.cfg | 32 --- ..._um-absr-175_0.2mm_highspeedsolid.inst.cfg | 38 --- ...x_labs_um-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...s_um-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ..._um-tough-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...ough-pla-175_0.2mm_highspeedsolid.inst.cfg | 41 --- ...dxl_1a_um-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...a_um-pla-175_0.2mm_highspeedsolid.inst.cfg | 42 ---- ..._um-tough-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...ough-pla-175_0.2mm_highspeedsolid.inst.cfg | 42 ---- ...xl_1c_um-absr-175_0.2mm_highspeed.inst.cfg | 32 --- ..._um-absr-175_0.2mm_highspeedsolid.inst.cfg | 38 --- ...dxl_1c_um-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...c_um-pla-175_0.2mm_highspeedsolid.inst.cfg | 42 ---- ..._um-tough-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...ough-pla-175_0.2mm_highspeedsolid.inst.cfg | 42 ---- ...l_1xa_um-absr-175_0.2mm_highspeed.inst.cfg | 32 --- ..._um-absr-175_0.2mm_highspeedsolid.inst.cfg | 38 --- ..._labs_um-absr-175_0.2mm_highspeed.inst.cfg | 32 --- ..._um-absr-175_0.2mm_highspeedsolid.inst.cfg | 38 --- ...l_labs_um-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...s_um-pla-175_0.2mm_highspeedsolid.inst.cfg | 42 ---- ..._um-tough-pla-175_0.2mm_highspeed.inst.cfg | 34 --- ...ough-pla-175_0.2mm_highspeedsolid.inst.cfg | 42 ---- 49 files changed, 47 insertions(+), 1967 deletions(-) delete mode 100644 resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_highspeed.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index c7dfac8aef..1e5eb952ed 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -33,14 +33,12 @@ { "acceleration_enabled": { - "enabled": true, + "enabled": false, "value": true }, "acceleration_infill": { - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, + "enabled": false, "value": "acceleration_print" }, "acceleration_layer_0": @@ -50,18 +48,12 @@ }, "acceleration_prime_tower": { - "enabled": "acceleration_enabled and prime_tower_enable and extruders_enabled_count > 1", - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, + "enabled": false, "value": "acceleration_print" }, "acceleration_print": { - "enabled": "acceleration_enabled", - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, + "enabled": false, "value": 800 }, "acceleration_print_layer_0": @@ -71,49 +63,33 @@ }, "acceleration_roofing": { - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, + "enabled": false, "value": "acceleration_print" }, - "acceleration_skirt_brim": - { - "enabled": "acceleration_enabled and (adhesion_type == 'skirt' or adhesion_type == 'brim')", - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, - "value": 800 - }, "acceleration_support": { - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, + "enabled": false, "value": "acceleration_print" }, "acceleration_support_bottom": { "enabled": false, - "value": "acceleration_support_interface" + "value": "acceleration_print" }, "acceleration_support_infill": { - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, - "value": "acceleration_support" + "enabled": false, + "value": "acceleration_print" }, "acceleration_support_interface": { - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, - "value": "acceleration_support" + "enabled": false, + "value": "acceleration_print" }, "acceleration_support_roof": { "enabled": false, - "value": "acceleration_support_interface" + "value": "acceleration_print" }, "acceleration_topbottom": { @@ -122,10 +98,7 @@ }, "acceleration_travel": { - "enabled": "acceleration_enabled", - "maximum_value": 5000, - "minimum_value": 200, - "minimum_value_warning": 750, + "enabled": false, "value": 5000 }, "acceleration_travel_enabled": @@ -140,37 +113,28 @@ }, "acceleration_wall": { - "enabled": "acceleration_enabled", - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, + "enabled": false, "value": "acceleration_print" }, "acceleration_wall_0": { - "enabled": "acceleration_enabled", - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, - "value": "acceleration_wall" + "enabled": false, + "value": "acceleration_print" }, "acceleration_wall_0_roofing": { "enabled": false, - "value": "acceleration_wall" + "value": "acceleration_print" }, "acceleration_wall_x": { - "enabled": "acceleration_enabled", - "maximum_value": 3500, - "minimum_value": 200, - "minimum_value_warning": 750, - "value": "acceleration_wall" + "enabled": false, + "value": "acceleration_print" }, "acceleration_wall_x_roofing": { "enabled": false, - "value": "acceleration_wall" + "value": "acceleration_print" }, "adhesion_extruder_nr": { @@ -239,15 +203,12 @@ "inset_direction": { "value": "'inside_out'" }, "jerk_enabled": { - "enabled": true, + "enabled": false, "value": true }, "jerk_infill": { - "enabled": "jerk_enabled", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, + "enabled": false, "value": "jerk_print" }, "jerk_layer_0": @@ -257,19 +218,13 @@ }, "jerk_prime_tower": { - "enabled": "jerk_enabled and prime_tower_enable and extruders_enabled_count > 1", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, + "enabled": false, "value": "jerk_print" }, "jerk_print": { - "enabled": "jerk_enabled", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, - "value": 12.5 + "enabled": false, + "value": 6.25 }, "jerk_print_layer_0": { @@ -278,50 +233,33 @@ }, "jerk_roofing": { - "enabled": "jerk_enabled", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, + "enabled": false, "value": "jerk_print" }, - "jerk_skirt_brim": - { - "enabled": "jerk_enabled and (adhesion_type == 'brim' or adhesion_type == 'skirt')", - "value": 12.5 - }, "jerk_support": { - "enabled": "jerk_enabled and support_enable", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, + "enabled": false, "value": "jerk_print" }, "jerk_support_bottom": { "enabled": false, - "value": "jerk_support_interface" + "value": "jerk_print" }, "jerk_support_infill": { - "enabled": "jerk_enabled and support_enable", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, - "value": "jerk_support" + "enabled": false, + "value": "jerk_print" }, "jerk_support_interface": { - "enabled": "jerk_enabled and support_enable", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, - "value": "jerk_support" + "enabled": false, + "value": "jerk_print" }, "jerk_support_roof": { "enabled": false, - "value": "jerk_support_interface" + "value": "jerk_print" }, "jerk_topbottom": { @@ -330,11 +268,8 @@ }, "jerk_travel": { - "enabled": "jerk_enabled", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, - "value": 12.5 + "enabled": false, + "value": "jerk_print" }, "jerk_travel_enabled": { @@ -348,18 +283,12 @@ }, "jerk_wall": { - "enabled": "jerk_enabled", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, + "enabled": false, "value": "jerk_print" }, "jerk_wall_0": { - "enabled": "jerk_enabled", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, + "enabled": false, "value": "jerk_print" }, "jerk_wall_0_roofing": @@ -369,10 +298,7 @@ }, "jerk_wall_x": { - "enabled": "jerk_enabled", - "maximum_value": 35, - "minimum_value": 5, - "minimum_value_warning": 12, + "enabled": false, "value": "jerk_print" }, "jerk_wall_x_roofing": @@ -591,86 +517,16 @@ "skirt_height": { "value": 3 }, "small_skin_width": { "value": 4 }, "speed_equalize_flow_width_factor": { "value": 0 }, - "speed_infill": - { - "maximum_value": 350, - "maximum_value_warning": 325 - }, - "speed_prime_tower": - { - "maximum_value": 250, - "maximum_value_warning": 200, - "value": "speed_topbottom" - }, - "speed_print": - { - "maximum_value": 350, - "maximum_value_warning": 325, - "value": 50 - }, - "speed_roofing": - { - "maximum_value": 300, - "maximum_value_warning": 275, - "value": "speed_wall_0" - }, - "speed_support": - { - "maximum_value": 350, - "maximum_value_warning": 325, - "value": "speed_wall" - }, - "speed_support_infill": - { - "maximum_value": 350, - "maximum_value_warning": 325 - }, - "speed_support_interface": - { - "maximum_value": 260, - "maximum_value_warning": 255, - "value": "speed_topbottom" - }, - "speed_support_roof": - { - "maximum_value": 260, - "maximum_value_warning": 255 - }, - "speed_topbottom": - { - "maximum_value": 260, - "maximum_value_warning": 255, - "value": "speed_wall" - }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50 }, + "speed_roofing": { "value": "speed_wall_0" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_wall" }, "speed_travel": { "value": 250 }, - "speed_wall": - { - "maximum_value": 260, - "maximum_value_warning": 255, - "value": "speed_print * 40/50" - }, - "speed_wall_0": - { - "maximum_value": 260, - "maximum_value_warning": 255, - "value": "speed_wall * 30/40" - }, - "speed_wall_0_roofing": - { - "maximum_value": 260, - "maximum_value_warning": 255 - }, - "speed_wall_x": - { - "maximum_value": 260, - "maximum_value_warning": 255, - "value": "speed_wall" - }, - "speed_wall_x_roofing": - { - "maximum_value": 260, - "maximum_value_warning": 255 - }, + "speed_wall": { "value": "speed_print * 40/50" }, + "speed_wall_0": { "value": "speed_wall * 30/40" }, + "speed_wall_x": { "value": "speed_wall" }, "support_angle": { "value": 40 }, "support_bottom_height": { "value": "2*support_infill_sparse_thickness" }, "support_bottom_line_width": diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index d94d81975a..0000000000 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 4d07d03ceb..0000000000 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 0a99efa15f..0000000000 --- a/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 91578dbbab..0000000000 --- a/resources/intent/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 9027a2f4ab..0000000000 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index ed738f50b0..0000000000 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 3687fd1e2c..0000000000 --- a/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 03bcd00b03..0000000000 --- a/resources/intent/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 25fe675396..0000000000 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 52831d4540..0000000000 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 4e703a29f1..0000000000 --- a/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 989b134ee2..0000000000 --- a/resources/intent/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_method -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index fd0a3af0cb..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index d9fbea6879..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 95c145c410..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 70553ab775..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index f5a00d9db1..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_pattern = zigzag -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_pattern = zigzag - diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 2e098b3a0b..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,38 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_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_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 36e67bf91f..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 9a8c84f118..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index c3e0d3c20e..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index f9478920c8..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 0db1a5b803..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1XA - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_pattern = zigzag -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_pattern = zigzag - diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index b6ff6e1ebd..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,38 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1XA - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_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_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 4b42af13fa..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_pattern = zigzag -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_pattern = zigzag - diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 69a50a831b..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,38 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_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_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 1c0d1aea28..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index fb0211d89e..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index c286add3fc..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index a443e7fa29..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,41 +0,0 @@ -[general] -definition = ultimaker_methodx -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 47 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index ed8a845d8f..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index b0f667ae13..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 45 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -material_bed_temperature = 45 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 5057bf35e6..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 228d1b0297..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1A - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 45 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -material_bed_temperature = 45 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 0328525090..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_pattern = zigzag -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_pattern = zigzag - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 0c2bb88cc7..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,38 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_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_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index c2f02ccc55..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 42a678616a..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 45 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -material_bed_temperature = 45 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 1eea27049b..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index b7637e1bf7..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1C - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 45 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -material_bed_temperature = 45 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index a82ddaa428..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1XA - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_pattern = zigzag -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_pattern = zigzag - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 9aebcb531b..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,38 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = 1XA - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_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_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 11aa6d2878..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_pattern = zigzag -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_pattern = zigzag - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index ea8caef493..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,38 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_absr_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -cool_min_temperature = 245.0 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -speed_layer_0 = 55 -speed_print = 300 -speed_support = 100 -speed_support_interface = 75 -speed_travel = 500 -speed_travel_layer_0 = 250 -speed_wall_0 = 40 -support_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_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index 2b101b37a5..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 1af18325ae..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 45 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -material_bed_temperature = 45 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -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_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_highspeed.inst.cfg deleted file mode 100644 index d2480bf711..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_highspeed.inst.cfg +++ /dev/null @@ -1,34 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed -version = 4 - -[metadata] -intent_category = highspeed -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bridge_wall_speed = 300 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_pattern = zigzag -jerk_print = 35 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg deleted file mode 100644 index 77ba3130b1..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm_highspeedsolid.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -definition = ultimaker_methodxl -name = High Speed Solid -version = 4 - -[metadata] -intent_category = highspeedsolid -is_experimental = True -material = ultimaker_tough_pla_175 -quality_type = draft -setting_version = 25 -type = intent -variant = LABS - -[values] -acceleration_print = 3500 -bottom_thickness = =top_bottom_thickness -bridge_wall_speed = 300 -build_volume_temperature = 45 -cool_fan_enabled = True -cool_fan_speed = 100 -cool_min_layer_time = 3 -infill_angles = [45,135] -infill_material_flow = 97 -infill_pattern = zigzag -infill_sparse_density = 99 -jerk_print = 35 -material_bed_temperature = 45 -speed_infill = 240.0 -speed_layer_0 = 55 -speed_print = 300 -speed_travel = 500 -speed_travel_layer_0 = 350.0 -speed_wall_0 = 45 -support_interface_line_width = 0.42 -support_line_width = 0.47 -support_material_flow = 100 -support_pattern = zigzag -support_roof_line_width = 0.42 -top_bottom_thickness = =layer_height * 2 -top_thickness = =top_bottom_thickness - From fa0624784b2c1339de07e605507bf01828ba662d Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 20 Mar 2025 10:00:17 -0400 Subject: [PATCH 64/72] machine_min_cool_heat_time_window=0 for Method PP-601 --- 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 c7dfac8aef..cd32ecc66e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -391,7 +391,7 @@ "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_min_cool_heat_time_window": { "value": 0 }, "machine_name": { "default_value": "UltiMaker Method" }, "machine_nozzle_cool_down_speed": { "value": 0.8 }, "machine_nozzle_heat_up_speed": { "value": 3.5 }, From c71148321ae3dafecc6da1cacff9c7fae2441af3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 21 Mar 2025 15:26:43 +0100 Subject: [PATCH 65/72] Translate settings values in recommended screen CURA-11911 For settings inside the screen, they are translated through the SettingDefinitionModel, but we don't use one here, so we have to translate it explicitely --- resources/qml/Widgets/SingleSettingComboBox.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index d917dc2753..d627efd2a9 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -12,7 +12,8 @@ import Cura 1.7 as Cura // All of the setting updating logic is handled by this component. // This uses the "options" value of a setting to populate the drop down. This will only work for settings with "options" // If the setting is limited to a single extruder or is settable with different values per extruder use "updateAllExtruders: true" -Cura.ComboBox { +Cura.ComboBox +{ textRole: "text" property alias settingName: propertyProvider.key property alias propertyRemoveUnusedValue: propertyProvider.removeUnusedValue @@ -23,6 +24,8 @@ Cura.ComboBox { // This is only used if updateAllExtruders == true property int defaultExtruderIndex: Cura.ExtruderManager.activeExtruderIndex + UM.I18nCatalog { id: settings_catalog; name: "fdmprinter.def.json" } + model: ListModel { id: comboboxModel @@ -42,6 +45,7 @@ Cura.ComboBox { { var key = propertyProvider.properties["options"].keys()[i] var value = propertyProvider.properties["options"][key] + value = settings_catalog.i18nc(settingName + " option " + key, value) comboboxModel.append({ text: value, code: key}) if (propertyProvider.properties.value === key) From 6596edb941f42e625cd5ca78f7e0a3c40b774ffd Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 21 Mar 2025 15:27:22 +0100 Subject: [PATCH 66/72] Fix ugly translation CURA-11911 Trust me, this really means nothing in this context :D --- resources/i18n/fr_FR/cura.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index c9211201bc..64bb8cd87d 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -4284,7 +4284,7 @@ msgstr "Interface du support" msgctxt "@action:label" msgid "Support Type" -msgstr "Type de prise en charge" +msgstr "Structure du support" msgctxt "@label Description for application dependency" msgid "Support library for faster math" From 7cfcf09ec04bd8b697e87f9f9f97715e79a481d2 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Fri, 21 Mar 2025 19:14:39 +0100 Subject: [PATCH 67/72] Update Changelog for stable Update changelog for stable release --- resources/texts/change_log.txt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 9f0a2c563a..1c54e413e3 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -21,11 +21,13 @@ * New settings: - Overhanging Wall Speeds, now gives you the ability to tune multiple values. Don’t forget to adjust the Overhanging Wall Angle to start using the setting. - Minimum Layer Time with Overhang and Minimum Overhang Segment Length: Fine-tune the minimum layer time for overhangs. +Try it for yourself with this Overhanging Wall Angle Test. - Inside Travel Avoid Distance: Finetune combing movements. - Pressure Advance Factor Setting: New setting for machine definitions. - You can now tune the Bottom Surface Skin, like you can tune the Top Surface Skin! You can now tune Extruder, Layers, Line Width, Pattern, Line Directions, Outer Wall Flow, Inner Wall(s) Flow, Flow, Outer Wall Speed, Inner Wall Speed, Skin Speed, Inner Wall Acceleration, Skin Acceleration, Outer Wall Jerk, Inner Wall Jerk, Skin Jerk, and Monotonic Bottom Surface Order - Enable/Disable USB Printing: A hidden preference setting to indicate that you are using the printer over USB functionality. This setting lays the groundwork for automatically disabling USB printing in the next release when it’s not being used. + * Bug fixes: - Resolved a crash that occurred when switching materials on Sovol printers. - Random Seam no longer favors one side and not is truly random again @@ -37,14 +39,27 @@ - The number of decimal places displayed for layer height in the top bar has been reduced. - Fixed a bug that caused incorrect retracting and hopping on printers with more than 2 extruders. - Improved how fast the settings are loaded in the Settings Visibility window when scrolling -- Improved how disallowed areas and other models are taken into account when arranging models on the buildplate +- Improved how disallowed areas and other models are taken into account when arranging models on the buildplate, including other models - Preview playback now only shows visible parts. Infill lines, shell, and helpers are always hidden if disabled in preview's color scheme + +* Bugs resolved since the Beta release +- Fixed a bug where the inner wall was bridging incorrectly +- Fixed a bug where support meshes were not printing if they had nothing to support +- Fixed a bug where project names would get mixed up when switching between projects +- Improved the UltiMaker S8 profiles for improved reliability and quality +- Updated Nylon CF Slide settings to reduce under extrusion +- Reduced the chance of a filament jam on Method series printers with dual extrusion prints with small layertimes +- The Bottom Surface Skin settings introduced in this release are now only enabled if 'Bottom Surface Skin layers' is more than zero +- Improved the speed when interacting with the Settings Visiblity window +- Columns in the Profile Description Screen can now be resized so long setting names can be read +- Two non-critical security fixes were implemented to align with security best practices in OAuth2 and the printer-linter +- Resolved top reported crashes coming in via the analyzing tool Sentry + * Printer definitions, profiles, and materials: - Introduced Visual Intents for the Sketch Sprint - Introduced new Extra Fast and Draft profiles for the Sketch Sprint - Introduced profiles for Sketch printers for Metallic PLA with improved surface quality (matte vs shiny) -- Introduce High Speed and High Speed Solid intents for Method, Method X, and Method XL - Introduced PC ABS and PC ABS FR materials for Method X and Method XL - Introduced Nylon Slide for UltiMaker S Series Printers - Updated the Breakaway Build Volume Temperature for UltiMaker Factor 4 From fd13ee10e3c24489166880398610af69c6cac648 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 21 Mar 2025 23:01:16 +0100 Subject: [PATCH 68/72] Optional changes - Add padding to the textArea Adds 15 padding to the right side of the what's new text items (text will not go under scrollbar) Adds 15 padding to left and right of the changelog --- resources/qml/WelcomePages/ChangelogContent.qml | 2 ++ resources/qml/WelcomePages/WhatsNewContent.qml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/qml/WelcomePages/ChangelogContent.qml b/resources/qml/WelcomePages/ChangelogContent.qml index 7c3b1adfc3..a8e70463e9 100644 --- a/resources/qml/WelcomePages/ChangelogContent.qml +++ b/resources/qml/WelcomePages/ChangelogContent.qml @@ -43,6 +43,8 @@ Item textArea.readOnly: true textArea.font: UM.Theme.getFont("default") textArea.onLinkActivated: Qt.openUrlExternally(link) + textArea.rightPadding: 15 + textArea.leftPadding: 15 } Cura.PrimaryButton diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index 6406d65756..d4b1c8e04b 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -114,7 +114,7 @@ Item textArea.font: UM.Theme.getFont("default") textArea.onLinkActivated: Qt.openUrlExternally(link) textArea.leftPadding: 0 - textArea.rightPadding: 0 + textArea.rightPadding: 15 } } } From d23e2b915ef912360db39d6003dc98b8e7597a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A1udio=20=27Patola=27=20Sampaio?= Date: Sun, 23 Mar 2025 23:58:30 +0100 Subject: [PATCH 69/72] Updated pt_BR strings for Cura --- resources/i18n/pt_BR/cura.po | 32 ++--- resources/i18n/pt_BR/fdmextruder.def.json.po | 12 +- resources/i18n/pt_BR/fdmprinter.def.json.po | 120 +++++++++---------- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index b7294f21e2..ec12c27651 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Cura 5.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-02-21 15:37+0100\n" -"PO-Revision-Date: 2024-10-28 04:18+0100\n" +"PO-Revision-Date: 2025-03-23 17:45+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Poedit 3.5\n" msgctxt "@title:label" msgid " " @@ -183,7 +183,7 @@ msgstr "Visão 3D" msgctxt "name" msgid "3DConnexion mouses" -msgstr "" +msgstr "Mouses 3DConnexion" msgctxt "@item:inlistbox" msgid "3MF File" @@ -483,7 +483,7 @@ msgstr "Permite carregar e exibir arquivos G-Code." msgctxt "description" msgid "Allows working with 3D mouses inside Cura." -msgstr "" +msgstr "Permite trabalhar com mouses 3D dentro do Cura." msgctxt "@option:discardOrKeep" msgid "Always ask me this" @@ -1603,7 +1603,7 @@ msgstr "Extrusor %1" msgctxt "@label" msgid "Extruder Change duration" -msgstr "" +msgstr "Duração de Mudança do Extrusor" msgctxt "@title:label" msgid "Extruder End G-code" @@ -1615,7 +1615,7 @@ msgstr "Duração do G-code Final do Extrusor" msgctxt "@title:label" msgid "Extruder Prestart G-code" -msgstr "" +msgstr "G-Code de Pré-Início do Extrusor" msgctxt "@title:label" msgid "Extruder Start G-code" @@ -1808,7 +1808,7 @@ msgstr "Primeira disponível" msgctxt "@option:check" msgid "Flip model's toolhandle Y axis (restart required)" -msgstr "" +msgstr "Trocar o eixo Y da ferramenta do modelo (reinício requerido)" msgctxt "@label:listbox" msgid "Flow" @@ -2300,7 +2300,7 @@ msgstr "Nivelar mesa" msgctxt "@title:window The argument is a package name, and the second is the version." msgid "License for %1 %2" -msgstr "" +msgstr "Licença para %1 %2" msgctxt "@item:inlistbox" msgid "Lighter is higher" @@ -2408,7 +2408,7 @@ msgstr "Gerador de Makerbot Printfile" msgctxt "@item:inlistbox" msgid "Makerbot Replicator+ Printfile" -msgstr "" +msgstr "Makerbot Replicator+ Arquivo de Impressão" msgctxt "@item:inlistbox" msgid "Makerbot Sketch Printfile" @@ -4029,7 +4029,7 @@ msgstr "Devem falhas de fatiamento serem automaticamente relatadas à Ultimaker? msgctxt "@info:tooltip" msgid "Should the Y axis of the translate toolhandle be flipped? This will only affect model's Y coordinate, all other settings such as machine Printhead settings are unaffected and still behave as before." -msgstr "" +msgstr "Deverá o eixo Y de translação da ferramenta trocar de orientação? Isto afetará apenas a coordenada Y do modelo, todos os outros ajustes tais como ajustes de Cabeça de Impressão não serão afetados e ainda funcionarão como antes." msgctxt "@info:tooltip" msgid "Should the build plate be cleared before loading a new model in the single instance of Cura?" @@ -4269,7 +4269,7 @@ msgstr "G-Code Inicial" msgctxt "@label" msgid "Start GCode must be first" -msgstr "" +msgstr "O GCode de Início deve ser o primeiro" msgctxt "@label" msgid "Start the slicing process" @@ -4677,7 +4677,7 @@ msgstr "Esta configuração não está disponível porque %1 não foi reconhecid msgctxt "@label" msgid "This configuration is not available because there is a mismatch or other problem with core-type %1. Please visit the support page to check which cores this printer-type supports w.r.t. new slices." -msgstr "" +msgstr "Esta configuração não está disponível porque há uma incompatibilidade ou outro problema com o core-type %1. Por favor visite a página de suporte para verificar que núcleos este tipo de impressora suporta de acordo com as novas fatias." msgctxt "@text:window" msgid "This is a Cura Universal project file. Would you like to open it as a Cura Universal Project or import the models from it?" @@ -5247,7 +5247,7 @@ msgstr "Atualiza configurações do Cura 5.8 para o Cura 5.9." msgctxt "description" msgid "Upgrades configurations from Cura 5.9 to Cura 5.10" -msgstr "" +msgstr "Atualiza configurações do Cura 5.9 para o Cura 5.10" msgctxt "@action:button" msgid "Upload custom Firmware" @@ -5391,7 +5391,7 @@ msgstr "Atualização de Versão de 5.8 para 5.9" msgctxt "name" msgid "Version Upgrade 5.9 to 5.10" -msgstr "" +msgstr "Atualização de Versão de 5.9 para 5.10" msgctxt "@button" msgid "View printers in Digital Factory" @@ -5556,11 +5556,11 @@ msgstr "Y (Profundidade)" msgctxt "@label" msgid "Y max ( '+' towards front)" -msgstr "" +msgstr "Y máximo ('+' indo para a frente)" msgctxt "@label" msgid "Y min ( '-' towards back)" -msgstr "" +msgstr "Y mínimo ('-' indo para trás)" msgctxt "@info" msgid "Yes" diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index 49382fb874..4c66398f73 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2025-02-21 15:37+0000\n" -"PO-Revision-Date: 2024-10-28 04:20+0100\n" +"PO-Revision-Date: 2025-03-23 17:27+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Poedit 3.5\n" msgctxt "platform_adhesion description" msgid "Adhesion" @@ -43,7 +43,7 @@ msgstr "Extrusor" msgctxt "machine_extruder_change_duration label" msgid "Extruder Change duration" -msgstr "" +msgstr "Duração da Mudança do Extrusor" msgctxt "machine_extruder_end_code label" msgid "Extruder End G-Code" @@ -67,7 +67,7 @@ msgstr "Posição Y Final do Extrusor" msgctxt "machine_extruder_prestart_code label" msgid "Extruder Prestart G-Code" -msgstr "" +msgstr "G-Code de Pré-Início do Extrusor" msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" @@ -151,7 +151,7 @@ msgstr "Deslocamento Y do Bico" msgctxt "machine_extruder_prestart_code description" msgid "Prestart g-code to execute before switching to this extruder." -msgstr "" +msgstr "G-Code a executar antes de trocar para este extrusor." msgctxt "machine_extruder_start_code description" msgid "Start g-code to execute when switching to this extruder." @@ -223,7 +223,7 @@ msgstr "A coordenada Y da posição de início quando se liga o extrusor." msgctxt "machine_extruder_change_duration description" msgid "When using a multi tool setup, this value is the tool change time in seconds. This value will be added to the estimate time based on the number of changes that occur." -msgstr "" +msgstr "Ao usar uma configuração multiferramentas, este valor é o tempo da mudança de ferramentas em segundos. O valor será adicionado ao tempo estimado baseado no número de mudanças que ocorrem." #~ msgctxt "machine_extruder_end_code description" #~ msgid "End g-code to execute whenever turning the extruder off." diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 68b114fe6a..6ba8a6d874 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Cura 5.7\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2025-02-21 15:37+0000\n" -"PO-Revision-Date: 2024-10-29 03:52+0100\n" +"PO-Revision-Date: 2025-03-23 23:56+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Poedit 3.5\n" msgctxt "prime_tower_mode description" msgid "How to generate the prime tower:
  • Normal: create a bucket in which secondary materials are primed
  • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
" @@ -39,7 +39,7 @@ msgstr "Um fator indicando em quanto o filamento é comprimido entre o alimentad msgctxt "flooring_angles description" msgid "A list of integer line directions to use when the bottom surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "" +msgstr "Uma lista de linhas de direções inteiras a usar quando as camadas de contorno da superfície inferior usa os padrões de linhas ou ziguezague. Elementos da lista são usados sequencialmente à medida que as camadas progridem e quando o fim da lista é alcançado, ela reinicia do começo. Os itens da lista são separados por vírgulas e a lista inteira é contida em colchetes. O valor default é uma lista vazia que significa usar os ângulos default tradicionais (45 e 135 graus)." msgctxt "roofing_angles description" msgid "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." @@ -311,71 +311,71 @@ msgstr "Largura de Remoção do Contorno Inferior" msgctxt "acceleration_wall_x_flooring label" msgid "Bottom Surface Inner Wall Acceleration" -msgstr "" +msgstr "Aceleração da Parede Interna da Superfície Inferior" msgctxt "jerk_wall_x_flooring label" msgid "Bottom Surface Inner Wall Jerk" -msgstr "" +msgstr "Jerk da Parede Interna da Superfície Inferior" msgctxt "speed_wall_x_flooring label" msgid "Bottom Surface Inner Wall Speed" -msgstr "" +msgstr "Velocidade da Parede Interna da Superfície Inferior" msgctxt "wall_x_material_flow_flooring label" msgid "Bottom Surface Inner Wall(s) Flow" -msgstr "" +msgstr "Fluxo da(s) Parede(s) Interna(s) da Superfície Inferior" msgctxt "acceleration_wall_0_flooring label" msgid "Bottom Surface Outer Wall Acceleration" -msgstr "" +msgstr "Aceleração da Parede Externa da Superfície Inferior" msgctxt "wall_0_material_flow_flooring label" msgid "Bottom Surface Outer Wall Flow" -msgstr "" +msgstr "Fluxo da Parede Externa da Superfície Inferior" msgctxt "jerk_wall_0_flooring label" msgid "Bottom Surface Outer Wall Jerk" -msgstr "" +msgstr "Jerk da Parede Externa da Superfície Inferior" msgctxt "speed_wall_0_flooring label" msgid "Bottom Surface Outer Wall Speed" -msgstr "" +msgstr "Velocidade da Parede Externa da Superfície Inferior" msgctxt "acceleration_flooring label" msgid "Bottom Surface Skin Acceleration" -msgstr "" +msgstr "Aceleração do Contorno da Superfície Inferior" msgctxt "flooring_extruder_nr label" msgid "Bottom Surface Skin Extruder" -msgstr "" +msgstr "Extrusor do Contorno da Superfície Inferior" msgctxt "flooring_material_flow label" msgid "Bottom Surface Skin Flow" -msgstr "" +msgstr "Fluxo do Contorno da Superfície Inferior" msgctxt "jerk_flooring label" msgid "Bottom Surface Skin Jerk" -msgstr "" +msgstr "Jerk do Contorno da Superfície Inferior" msgctxt "flooring_layer_count label" msgid "Bottom Surface Skin Layers" -msgstr "" +msgstr "Camadas do Contorno da Superfície Inferior" msgctxt "flooring_angles label" msgid "Bottom Surface Skin Line Directions" -msgstr "" +msgstr "Direções de Filete do Contorno da Superfície Inferior" msgctxt "flooring_line_width label" msgid "Bottom Surface Skin Line Width" -msgstr "" +msgstr "Largura de Filete do Contorno da Superfície Inferior" msgctxt "flooring_pattern label" msgid "Bottom Surface Skin Pattern" -msgstr "" +msgstr "Padrão do Contorno da Superfície Inferior" msgctxt "speed_flooring label" msgid "Bottom Surface Skin Speed" -msgstr "" +msgstr "Velocidade do Contorno da Superfície Inferior" msgctxt "bottom_thickness label" msgid "Bottom Thickness" @@ -615,7 +615,7 @@ msgstr "Ajustes de Linha de Comando" msgctxt "flooring_pattern option concentric" msgid "Concentric" -msgstr "" +msgstr "Concêntrico" msgctxt "infill_pattern option concentric" msgid "Concentric" @@ -1127,7 +1127,7 @@ msgstr "Material extra a avançar depois da troca de bico." msgctxt "variant_name" msgid "Extruder" -msgstr "" +msgstr "Extrusor" msgctxt "extruder_prime_pos_x label" msgid "Extruder Prime X Position" @@ -1227,7 +1227,7 @@ msgstr "Compensação de fluxo nos filetes da base da primeira camada" msgctxt "wall_x_material_flow_flooring description" msgid "Flow compensation on bottom surface wall lines for all wall lines except the outermost one." -msgstr "" +msgstr "Compensação de fluxo nos filetes de parede da superfície inferior para todos os filetes exceto o mais externo." msgctxt "infill_material_flow description" msgid "Flow compensation on infill lines." @@ -1239,7 +1239,7 @@ msgstr "Compensação de fluxo em filetes do teto ou base do suporte." msgctxt "flooring_material_flow description" msgid "Flow compensation on lines of the areas at the bottom of the print." -msgstr "" +msgstr "Compensação de fluxo em filetes das áreas da base da impressão." msgctxt "roofing_material_flow description" msgid "Flow compensation on lines of the areas at the top of the print." @@ -1267,7 +1267,7 @@ msgstr "Compensação de fluxo em filetes de estruturas de suporte." msgctxt "wall_0_material_flow_flooring description" msgid "Flow compensation on the bottom surface outermost wall line." -msgstr "" +msgstr "Compensação de fluxo na parede mais externa da superfície inferior." msgctxt "wall_0_material_flow_layer_0 description" msgid "Flow compensation on the outermost wall line of the first layer." @@ -1491,7 +1491,7 @@ msgstr "Griffin" msgctxt "machine_gcode_flavor option Cheetah" msgid "Griffin+Cheetah" -msgstr "" +msgstr "Griffin+Cheetah" msgctxt "group_outer_walls label" msgid "Group Outer Walls" @@ -1899,7 +1899,7 @@ msgstr "De Dentro Pra Fora" msgctxt "retraction_combing_avoid_distance label" msgid "Inside Travel Avoid Distance" -msgstr "" +msgstr "Distância de Desvio do Percurso Interior" msgctxt "support_interface_priority option interface_lines_overwrite_support_area" msgid "Interface lines preferred" @@ -2091,7 +2091,7 @@ msgstr "Largura de Extrusão" msgctxt "flooring_pattern option lines" msgid "Lines" -msgstr "" +msgstr "Filetes" msgctxt "infill_pattern option lines" msgid "Lines" @@ -2423,7 +2423,7 @@ msgstr "Tempo Mínimo de Camada" msgctxt "cool_min_layer_time_overhang label" msgid "Minimum Layer Time with Overhang" -msgstr "" +msgstr "Tempo Mínimo de Camada com Seção Pendente" msgctxt "min_odd_wall_line_width label" msgid "Minimum Odd Wall Line Width" @@ -2431,7 +2431,7 @@ msgstr "Largura Mínima de Filete de Parede Ímpar" msgctxt "cool_min_layer_time_overhang_min_segment_length label" msgid "Minimum Overhang Segment Length" -msgstr "" +msgstr "Comprimento Mínimo do Segmento de Seção Pendente" msgctxt "minimum_polygon_circumference label" msgid "Minimum Polygon Circumference" @@ -2519,7 +2519,7 @@ msgstr "Altura de Teto do Molde" msgctxt "flooring_monotonic label" msgid "Monotonic Bottom Surface Order" -msgstr "" +msgstr "Ordem Monotônica de Superfície Inferior" msgctxt "ironing_monotonic label" msgid "Monotonic Ironing Order" @@ -2743,7 +2743,7 @@ msgstr "Aceleração da Parede Exterior" msgctxt "wall_0_deceleration label" msgid "Outer Wall End Deceleration" -msgstr "" +msgstr "Deceleração do Final da Parede Externa" msgctxt "wall_0_end_speed_ratio label" msgid "Outer Wall End Speed Ratio" @@ -2779,7 +2779,7 @@ msgstr "Distância de Divisão de Velocidade da Parede Externa" msgctxt "wall_0_acceleration label" msgid "Outer Wall Start Acceleration" -msgstr "" +msgstr "Aceleração do Início da Parede Externa" msgctxt "wall_0_start_speed_ratio label" msgid "Outer Wall Start Speed Ratio" @@ -2807,11 +2807,11 @@ msgstr "Ângulo de Parede Pendente" msgctxt "wall_overhang_speed_factors label" msgid "Overhanging Wall Speeds" -msgstr "" +msgstr "Velocidades das Paredes Pendentes" msgctxt "wall_overhang_speed_factors description" msgid "Overhanging walls will be printed at a percentage of their normal print speed. You can specify multiple values, so that even more overhanging walls will be printed even slower, e.g. by setting [75, 50, 25]" -msgstr "" +msgstr "Paredes pendentes serão impressas em uma porcentagem de sua velocidade normal de impressão. Você pode especificar valores múltiplos, de forma que ainda mais paredes pendentes sejam impressas mais lentamente, por exemplo colocando [75, 50, 25]" msgctxt "wipe_pause description" msgid "Pause after the unretract." @@ -2847,7 +2847,7 @@ msgstr "Ângulo Preferido de Galho" msgctxt "material_pressure_advance_factor label" msgid "Pressure advance factor" -msgstr "" +msgstr "Factor de avanço de pressão" msgctxt "wall_transition_filter_deviation description" msgid "Prevent transitioning back and forth between one extra wall and one less. This margin extends the range of line widths which follow to [Minimum Wall Line Width - Margin, 2 * Minimum Wall Line Width + Margin]. Increasing this margin reduces the number of transitions, which reduces the number of extrusion starts/stops and travel time. However, large line width variation can lead to under- or overextrusion problems." @@ -2927,7 +2927,7 @@ msgstr "Aceleração da Impressão" msgctxt "variant_name" msgid "Print Core" -msgstr "" +msgstr "Núcleo de Impressão" msgctxt "jerk_print label" msgid "Print Jerk" @@ -2959,7 +2959,7 @@ msgstr "Imprimir uma torre próxima à impressão que serve para purgar o materi msgctxt "flooring_monotonic description" msgid "Print bottom surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent." -msgstr "" +msgstr "Imprime os filetes da superfície inferior em uma ordem que faz com que sempre se sobreponham com linhas adjacentes em uma direção única. Isso leva um pouco mais de tempo pra imprimir, mas faz superfícies chatas terem aspecto mais consistente." msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." @@ -3679,7 +3679,7 @@ msgstr "G-Code Inicial" msgctxt "machine_start_gcode_first label" msgid "Start GCode must be first" -msgstr "" +msgstr "O GCode de Início deve ser o primeiro" msgctxt "z_seam_type description" msgid "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these near a user specified location, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker." @@ -4103,7 +4103,7 @@ msgstr "Aceleração com que se imprimem as paredes interiores." msgctxt "acceleration_flooring description" msgid "The acceleration with which bottom surface skin layers are printed." -msgstr "" +msgstr "A aceleração com a qual as camadas do contorno da superfície inferior serão impressas." msgctxt "acceleration_infill description" msgid "The acceleration with which infill is printed." @@ -4123,11 +4123,11 @@ msgstr "A aceleração com que as camadas de base do raft são impressas." msgctxt "acceleration_wall_x_flooring description" msgid "The acceleration with which the bottom surface inner walls are printed." -msgstr "" +msgstr "A aceleração com que as paredes internas da superfície inferior são impressas." msgctxt "acceleration_wall_0_flooring description" msgid "The acceleration with which the bottom surface outermost walls are printed." -msgstr "" +msgstr "A aceleração com que as paredes mais externas da superfície inferior são impressas." msgctxt "acceleration_support_bottom description" msgid "The acceleration with which the floors of support are printed. Printing them at lower acceleration can improve adhesion of support on top of your model." @@ -4347,7 +4347,7 @@ msgstr "A diferença em tamanho da próxima camada comparada à anterior." msgctxt "machine_head_with_fans_polygon description" msgid "The dimensions of the print head used to determine 'Safe Model Distance' when printing 'One at a Time'. These numbers relate to the centerline of the first extruder nozzle. Left of the nozzle is 'X Min' and must be negative. Rear of the nozzle is 'Y Min' and must be negative. X Max (right) and Y Max (front) are positive numbers. Gantry height is the dimension from the build plate to the X gantry beam." -msgstr "" +msgstr "As dimensões da cabeça de impressão usadas para determinar a 'Distância de Modo Seguro' ao imprimir 'Um de Cada Vez'. Esses número se relacionam ao filete central do bico do primeiro extrusor. À esquerda do bico é 'X Mínimo' e deve ser negativo. A parte de trás do bico é 'Y Mínimo' e deve ser negativa. X Máximo (direita) e Y Máximo (frente) são números positivos. Altura do eixo é a dimensão da plataforma de impressão até a barra do eixo X." msgctxt "ironing_line_spacing description" msgid "The distance between the lines of ironing." @@ -4359,7 +4359,7 @@ msgstr "A distância entre o modelo e sua estrutura de suporta na costura do eix msgctxt "retraction_combing_avoid_distance description" msgid "The distance between the nozzle and already printed outer walls when travelling inside a model." -msgstr "" +msgstr "A distância entre o bico e paredes externas já impressas ao percorrer no interior do modelo." msgctxt "travel_avoid_distance description" msgid "The distance between the nozzle and already printed parts when avoiding during travel moves." @@ -4471,7 +4471,7 @@ msgstr "O carro extrusor usado para imprimir preenchimento. Este ajuste é usado msgctxt "flooring_extruder_nr description" msgid "The extruder train used for printing the bottom most skin. This is used in multi-extrusion." -msgstr "" +msgstr "O carro de extrusor usado para imprimir o contorno mais inferior. Isto é usado em multi-extrusão." msgctxt "wall_x_extruder_nr description" msgid "The extruder train used for printing the inner walls. This is used in multi-extrusion." @@ -4723,7 +4723,7 @@ msgstr "A máxima mudança de velocidade instantânea em uma direção com que a msgctxt "jerk_flooring description" msgid "The maximum instantaneous velocity change with which bottom surface skin layers are printed." -msgstr "" +msgstr "A máxima mudança instantânea de velocidade com que as camadas de contorno da superfície inferior são impressas." msgctxt "jerk_infill description" msgid "The maximum instantaneous velocity change with which infill is printed." @@ -4731,11 +4731,11 @@ msgstr "A mudança instantânea máxima de velocidade em uma direção com que o msgctxt "jerk_wall_x_flooring description" msgid "The maximum instantaneous velocity change with which the bottom surface inner walls are printed." -msgstr "" +msgstr "A máxima mudança instantânea de velocidade com que as paredes internas da superfície inferior são impressas." msgctxt "jerk_wall_0_flooring description" msgid "The maximum instantaneous velocity change with which the bottom surface outermost walls are printed." -msgstr "" +msgstr "A máxima mudança instantânea de velocidade com quem as paredes externas da superfície inferior são impressas." msgctxt "jerk_support_bottom description" msgid "The maximum instantaneous velocity change with which the floors of support are printed." @@ -4879,7 +4879,7 @@ msgstr "A espessura mínima do casco da torre de purga. Você pode aumentar este msgctxt "cool_min_layer_time_overhang description" msgid "The minimum time spent in a layer that contains overhanging extrusions. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." -msgstr "" +msgstr "O tempo mínimo gasto em uma camada que contenha extrusões pendentes. Isto força a impressora a desacelerar para pelo menos gastar o tempo ajustado aqui em uma camada. E por sua vez isso permite que o material impresso esfrie apropriadamente antes de imprimir a próxima camada. Camadas ainda podem levar menos tempo que o tempo mínimo de camada se Levantar Cabeça estiver desabilitado e se a Velocidade Mínima fosse violada dessa forma." msgctxt "cool_min_layer_time description" msgid "The minimum time spent in a layer. This forces the printer to slow down, to at least spend the time set here in one layer. This allows the printed material to cool down properly before printing the next layer. Layers may still take shorter than the minimal layer time if Lift Head is disabled and if the Minimum Speed would otherwise be violated." @@ -4915,7 +4915,7 @@ msgstr "O número de camadas inferiores. Quando calculado da espessura inferior, msgctxt "flooring_layer_count description" msgid "The number of bottom most skin layers. Usually only one bottom most layer is sufficient to generate higher quality bottom surfaces." -msgstr "" +msgstr "O número de camadas do contorno mais inferior. Geralmente somente uma camada de contorno mais inferior é suficiente para gerar superfícies inferiores de maior qualidade." msgctxt "raft_base_wall_count description" msgid "The number of contours to print around the linear pattern in the base layer of the raft." @@ -4955,7 +4955,7 @@ msgstr "O número de filetes usado para o brim de suporte. Mais filetes melhoram msgctxt "build_volume_fan_nr description" msgid "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan" -msgstr "O número da ventoinha que refrigera o volume de construção. Se isto for colocado em 0, significa que não há ventoinha do volume de construção." +msgstr "O número da ventoinhas que refrigeram o volume de construção. Se isto for colocado em 0, significa que não há ventoinha do volume de construção." msgctxt "raft_surface_layers description" msgid "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1." @@ -4999,7 +4999,7 @@ msgstr "Diâmetro exterior do bico (a ponta do hotend)." msgctxt "flooring_pattern description" msgid "The pattern of the bottom most layers." -msgstr "" +msgstr "O padrão das camadas mais inferiores." msgctxt "infill_pattern description" msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction. Lightning infill tries to minimize the infill, by only supporting the ceiling of the object." @@ -5083,7 +5083,7 @@ msgstr "A velocidade em que todas as paredes interiores são impressas. Imprimir msgctxt "speed_flooring description" msgid "The speed at which bottom surface skin layers are printed." -msgstr "" +msgstr "A velocidade com que as camadas do contorno da superfície inferior são impressas." msgctxt "bridge_skin_speed description" msgid "The speed at which bridge skin regions are printed." @@ -5103,11 +5103,11 @@ msgstr "A velocidade em que a camada de base do raft é impressa. Deve ser impre msgctxt "speed_wall_x_flooring description" msgid "The speed at which the bottom surface inner walls are printed." -msgstr "" +msgstr "A velocidade com que as paredes internas da superfície inferior são impressas." msgctxt "speed_wall_0_flooring description" msgid "The speed at which the bottom surface outermost wall is printed." -msgstr "" +msgstr "A velocidade com que a parede mais externa da superfície inferior é impressa." msgctxt "bridge_wall_speed description" msgid "The speed at which the bridge walls are printed." @@ -5431,7 +5431,7 @@ msgstr "Este ajuste controle quantos cantos internos no contorno do topo do raft msgctxt "machine_start_gcode_first description" msgid "This setting controls if the start-gcode is forced to always be the first g-code. Without this option other g-code, such as a T0 can be inserted before the start g-code." -msgstr "" +msgstr "Este ajuste controle se o gcode de início é forçado para sempre ser o primeiro g-code. Sem esta opção outro g-code, como um T0, pode ser inserido antes do g-code de início." msgctxt "retraction_count_max description" msgid "This setting limits the number of retractions occurring within the minimum extrusion distance window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues." @@ -5667,7 +5667,7 @@ msgstr "Tentar prevenir costuras nas paredes que tenham seção pendente com ân msgctxt "material_pressure_advance_factor description" msgid "Tuning factor for pressure advance, which is meant to synchronize extrusion with motion" -msgstr "" +msgstr "Fator de sintonização de avanço de pressão, que tem a função de sincronizar a extrusão com o movimento" msgctxt "machine_gcode_flavor option UltiGCode" msgid "Ultimaker 2" @@ -5883,7 +5883,7 @@ msgstr "Ao transicionar entre diferentes números de paredes à medida que a pe msgctxt "cool_min_layer_time_overhang_min_segment_length description" msgid "When trying to apply the minimum layer time specific for overhanging layers, it will be applied only if at least one consecutive overhanging extrusion move is longer than this value." -msgstr "" +msgstr "Ao tentar aplicar o tempo mínimo de camada específico para camadas pendentes, o ajuste valerá somente se no mínimo um movimento de extrusão pendente consecutivo demorar mais que esse valor." msgctxt "wipe_hop_enable description" msgid "When wiping, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate." @@ -5983,7 +5983,7 @@ msgstr "Largura de um filete usado no teto ou base do suporte." msgctxt "flooring_line_width description" msgid "Width of a single line of the areas at the bottom of the print." -msgstr "" +msgstr "Largura de um filete singular das áreas na base da impressão." msgctxt "roofing_line_width description" msgid "Width of a single line of the areas at the top of the print." @@ -6187,7 +6187,7 @@ msgstr "Z substitui X/Y" msgctxt "flooring_pattern option zigzag" msgid "Zig Zag" -msgstr "" +msgstr "Ziguezague" msgctxt "infill_pattern option zigzag" msgid "Zig Zag" From 9a378d771f296d098646cf4f29aeca8a5538125b Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 24 Mar 2025 09:20:16 +0100 Subject: [PATCH 70/72] Update interlocking Clarity --- resources/texts/change_log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 1c54e413e3..c4c1ccefd7 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -5,7 +5,7 @@ - Cheetah Gcode Flavor: Introduced a new Marlin-like Gcode flavor called Cheetah. - SpaceMouse support: Navigate the view seamlessly with a 3D mouse, thanks to a collaboration with 3Dconnexion. - Cloud Printing for Sketch Sprint: Enabled printing over cloud with Digital Factory for Sketch Sprint users. -- Interlocking Settings: Moved Interlocking settings out of experimental into expert +- Interlocking Settings: Moved Interlocking settings from "Experimental" to "Dual Extrusion" category and placed under "Expert" setting visibility preset. - Build System Upgrade: Upgraded the build system from Conan 1 to Conan 2. Updated documentation is available. - Preview Looping: When the last layer is played in the preview, the first layer will now play again instead of stopping. - Updated About Page: The About Page now shows the used sources, their licenses, and their versions in a clearer way From efd681b28ef9448877c94e0847b4e715328b6931 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 24 Mar 2025 09:45:50 +0100 Subject: [PATCH 71/72] update the changelog --- resources/texts/change_log.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index c4c1ccefd7..cfe54e3200 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -11,6 +11,7 @@ - Updated About Page: The About Page now shows the used sources, their licenses, and their versions in a clearer way - Flip Y-axis Translate Tool Handle: Added an option to flip the Y-axis translate tool handle in preferences contributed by @GregValiant. - Rotation by Input & Snap Angle Input: Introduced rotation by input & snap angle input contributed by @HellAholic and @GregValiant. +- Improved the speed when interacting with the Settings Visiblity window contributed by @HellAholic - Purge Lines And Unload Filament Post Processing Script: Added a Purge Lines and Unload Filament Post Processing Script contributed by @GregValiant and @HellAholic - Thingiverse "Open in Cura" Button Linux Support: Enabled the "Open in Cura" button from Thingiverse to open files in Linux contributed by @hadess. - Multitool Printer Configuration Options: Introduced 3 new configuration options in machine settings for multitool printers contributed by @TheSin-. @@ -47,11 +48,11 @@ Try it for yourself