From f282f874023a24bbbd10bcb34304cbb1665be306 Mon Sep 17 00:00:00 2001 From: CoreCode Date: Wed, 20 Nov 2024 14:22:16 +0100 Subject: [PATCH 01/15] Update UltiMaker-Cura.spec.jinja --- UltiMaker-Cura.spec.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 2dce96282e6..a24ce1558a9 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -75,7 +75,7 @@ app = BUNDLE( coll, name='{{ display_name }}.app', icon={{ icon }}, - bundle_identifier={{ osx_bundle_identifier }} + "_" + '{{ display_name }}'.replace(" ", "_") + "_" {{ short_version }}, + bundle_identifier={{ osx_bundle_identifier }} + "_" + '{{ display_name }}'.replace(" ", "_"), version={{ version }}, info_plist={ 'CFBundleDisplayName': '{{ display_name }}', From 30205e1c784bb1a2654d674c810f6e5d9d55f95a Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 7 Dec 2024 16:10:42 +0100 Subject: [PATCH 02/15] Update description Add (restart required) --- resources/qml/Preferences/GeneralPage.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index a686fca8e54..62cab53a78d 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -669,12 +669,12 @@ UM.PreferencesPage { width: childrenRect.width height: childrenRect.height - text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped?") + text: catalog.i18nc("@info:tooltip", "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.") UM.CheckBox { id: flipToolhandleYCheckbox - text: catalog.i18nc("@option:check", "Flip toolhandle Y axis") + text: catalog.i18nc("@option:check", "Flip model's toolhandle Y axis (restart required)") checked: boolCheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle")) onCheckedChanged: UM.Preferences.setValue("tool/flip_y_axis_tool_handle", checked) } From d8b3e773ab4cdae808352f5f3c734fefa297d6f2 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Dec 2024 08:22:26 +0100 Subject: [PATCH 03/15] update label for clarity Greg's proposal: add details to clarify what the Y min & Y max refer to --- plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index c2238d2205c..d40efbee8a6 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -214,7 +214,7 @@ Item settingStoreIndex: propertyStoreIndex - labelText: catalog.i18nc("@label", "Y min") + labelText: catalog.i18nc("@label", "Y min ( '-' towards back)") labelFont: base.labelFont labelWidth: base.labelWidth controlWidth: base.controlWidth @@ -254,7 +254,7 @@ Item settingKey: "machine_head_with_fans_polygon" settingStoreIndex: propertyStoreIndex - labelText: catalog.i18nc("@label", "Y max") + labelText: catalog.i18nc("@label", "Y max ( '+' towards front)") labelFont: base.labelFont labelWidth: base.labelWidth controlWidth: base.controlWidth From 4c686afcb6acf1cd0e7dc3879f2027d2211dd1f0 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Dec 2024 08:23:40 +0100 Subject: [PATCH 04/15] Update machine head & fan polygon description Greg's proposal: add details to clarify what the Y min & Y max refer to. Previous description was unclear and referred to front of print head as being a negative value which is not accurate. --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0b..de47e3ff86d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -461,7 +461,7 @@ "machine_head_with_fans_polygon": { "label": "Machine Head & Fan Polygon", - "description": "The shape of the print head. These are coordinates relative to the position of the print head, which is usually the position of its first extruder. The dimensions left and in front of the print head must be negative coordinates.", + "description": "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.", "type": "polygon", "default_value": [ [-20, 10], From d5cf5f66acc2e4d8cf56149f88913d862456f238 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Dec 2024 07:25:19 +0000 Subject: [PATCH 05/15] Applied printer-linter format --- Cura-workflows | 1 + pydir.txt | 1 + 2 files changed, 2 insertions(+) create mode 160000 Cura-workflows create mode 100644 pydir.txt diff --git a/Cura-workflows b/Cura-workflows new file mode 160000 index 00000000000..a38e2d1e102 --- /dev/null +++ b/Cura-workflows @@ -0,0 +1 @@ +Subproject commit a38e2d1e1029e5a350f7ecbee037e7ccabb7044a diff --git a/pydir.txt b/pydir.txt new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/pydir.txt @@ -0,0 +1 @@ + From a8860017c7da7f87dfdb804a4ac94fed001ebdab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 15:43:13 +0100 Subject: [PATCH 06/15] Add setting for inner combing distance to walls CURA-12236 --- resources/definitions/fdmprinter.def.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0b..d998554b7aa 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4412,6 +4412,21 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "retraction_combing_avoid_distance": + { + "label": "Distance to Walls", + "description": "Preferred distance to outer walls when doing an inside combing travel move.", + "unit": "mm", + "type": "float", + "default_value": 0, + "value": "machine_nozzle_size * 1.5", + "minimum_value": "0", + "minimum_value_warning": "machine_nozzle_size * 0.5", + "maximum_value_warning": "machine_nozzle_size * 10", + "enabled": "resolveOrValue('retraction_combing') != 'off'", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "travel_retract_before_outer_wall": { "label": "Retract Before Outer Wall", From 0785e6f055258107785e7bd20df831d486157cc7 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Mon, 16 Dec 2024 14:44:57 +0000 Subject: [PATCH 07/15] Applied printer-linter format --- Cura-workflows | 1 + package_details.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 160000 Cura-workflows create mode 100644 package_details.txt diff --git a/Cura-workflows b/Cura-workflows new file mode 160000 index 00000000000..cabc2d7e3cb --- /dev/null +++ b/Cura-workflows @@ -0,0 +1 @@ +Subproject commit cabc2d7e3cb6f5b64475de4947f1e0f68f9adf73 diff --git a/package_details.txt b/package_details.txt new file mode 100644 index 00000000000..e8b13f42500 --- /dev/null +++ b/package_details.txt @@ -0,0 +1,42 @@ +author: UltiMaker +build_policy: missing +default_options: + enterprise: False + staging: False + cloud_api_version: 1 + display_name: UltiMaker Cura + cura_debug_mode: False + internal: False + i18n_extract: False +description: 3D printer / slicing GUI built on top of the Uranium framework +generators: ['VirtualPythonEnv'] +label: +languages: [] +license: LGPL-3.0 +name: cura +options: + cloud_api_version: 1 + cura_debug_mode: False + display_name: UltiMaker Cura + enterprise: False + i18n_extract: False + internal: False + staging: False +options_definitions: + enterprise: ['True', 'False'] + staging: ['True', 'False'] + cloud_api_version: ['ANY'] + display_name: ['ANY'] + cura_debug_mode: ['True', 'False'] + internal: ['True', 'False'] + i18n_extract: ['True', 'False'] +package_type: None +python_requires: + translationextractor/2.3.0@ultimaker/stable#d504876a4742c1b92bcd6e1d5ba7509a: {'remote': 'cura-conan2', 'recipe': 'Downloaded', 'path': '/home/runner/.conan2/p/transe0e29f719efb7/e'} +requires: [{'ref': 'gettext/0.22.5', 'run': True, 'libs': False, 'skip': False, 'test': False, 'force': False, 'direct': True, 'build': True, 'transitive_headers': None, 'transitive_libs': None, 'headers': False, 'package_id_mode': None, 'visible': False}] +revision_mode: hash +settings: ['os', 'compiler', 'build_type', 'arch'] +topics: ['conan', 'python', 'pyqt6', 'qt', 'qml', '3d-printing', 'slicer'] +url: https://github.com/Ultimaker/cura +vendor: False +version: 5.10.0-alpha.0 From 29cb2b121ccd7e69862a426835a77cdd5444028c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Dec 2024 10:24:29 +0100 Subject: [PATCH 08/15] Polish setting name and description CURA-12236 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d998554b7aa..8471c59f828 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4414,8 +4414,8 @@ }, "retraction_combing_avoid_distance": { - "label": "Distance to Walls", - "description": "Preferred distance to outer walls when doing an inside combing travel move.", + "label": "Inside Travel Avoid Distance", + "description": "The distance between the nozzle and already printed outer walls when travelling inside a model.", "unit": "mm", "type": "float", "default_value": 0, From 02ab5dd0bef6098ec844d2e086d9ad174e844981 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Wed, 18 Dec 2024 09:25:46 +0000 Subject: [PATCH 09/15] Applied printer-linter format --- Cura-workflows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cura-workflows b/Cura-workflows index cabc2d7e3cb..7ee2e85d418 160000 --- a/Cura-workflows +++ b/Cura-workflows @@ -1 +1 @@ -Subproject commit cabc2d7e3cb6f5b64475de4947f1e0f68f9adf73 +Subproject commit 7ee2e85d4182f8489a2e6bbd25c0823ad1d69101 From 5f81ba3e018463758d1e708f62e0dbeb9dfe931c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Dec 2024 10:42:09 +0100 Subject: [PATCH 10/15] Remove unwanted files --- Cura-workflows | 1 - package_details.txt | 42 ------------------------------------------ 2 files changed, 43 deletions(-) delete mode 160000 Cura-workflows delete mode 100644 package_details.txt diff --git a/Cura-workflows b/Cura-workflows deleted file mode 160000 index 7ee2e85d418..00000000000 --- a/Cura-workflows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ee2e85d4182f8489a2e6bbd25c0823ad1d69101 diff --git a/package_details.txt b/package_details.txt deleted file mode 100644 index e8b13f42500..00000000000 --- a/package_details.txt +++ /dev/null @@ -1,42 +0,0 @@ -author: UltiMaker -build_policy: missing -default_options: - enterprise: False - staging: False - cloud_api_version: 1 - display_name: UltiMaker Cura - cura_debug_mode: False - internal: False - i18n_extract: False -description: 3D printer / slicing GUI built on top of the Uranium framework -generators: ['VirtualPythonEnv'] -label: -languages: [] -license: LGPL-3.0 -name: cura -options: - cloud_api_version: 1 - cura_debug_mode: False - display_name: UltiMaker Cura - enterprise: False - i18n_extract: False - internal: False - staging: False -options_definitions: - enterprise: ['True', 'False'] - staging: ['True', 'False'] - cloud_api_version: ['ANY'] - display_name: ['ANY'] - cura_debug_mode: ['True', 'False'] - internal: ['True', 'False'] - i18n_extract: ['True', 'False'] -package_type: None -python_requires: - translationextractor/2.3.0@ultimaker/stable#d504876a4742c1b92bcd6e1d5ba7509a: {'remote': 'cura-conan2', 'recipe': 'Downloaded', 'path': '/home/runner/.conan2/p/transe0e29f719efb7/e'} -requires: [{'ref': 'gettext/0.22.5', 'run': True, 'libs': False, 'skip': False, 'test': False, 'force': False, 'direct': True, 'build': True, 'transitive_headers': None, 'transitive_libs': None, 'headers': False, 'package_id_mode': None, 'visible': False}] -revision_mode: hash -settings: ['os', 'compiler', 'build_type', 'arch'] -topics: ['conan', 'python', 'pyqt6', 'qt', 'qml', '3d-printing', 'slicer'] -url: https://github.com/Ultimaker/cura -vendor: False -version: 5.10.0-alpha.0 From 2ad64e13db5807ee88f0517c54c3e99ca769ae8a Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 18 Dec 2024 18:21:00 +0100 Subject: [PATCH 11/15] Introduce Cheetah flavor --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0b..8a933838dae 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -384,6 +384,7 @@ "RepRap (RepRap)": "RepRap", "UltiGCode": "Ultimaker 2", "Griffin": "Griffin", + "Cheetah": "Griffin+Cheetah", "Makerbot": "Makerbot", "BFB": "Bits from Bytes", "MACH3": "Mach3", From 43b19c34457d3c861a7e9b0d9fd63475acdcf4ae Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 17 Jan 2025 17:57:58 -0500 Subject: [PATCH 12/15] PP-554 Kedge Visual Intents * The settings used in the Visual intent profile improve the roof quality * Settings include temp adjustments, line widths, small features, hole, roof accel & speed * These apply to PLA & TPLA * all of the visual intents are marked as experimental for Cura 5.10 PP-554 --- ...int_0.4mm_um-pla-175_0.2mm_visual.inst.cfg | 42 +++++++++++++++++++ ...4mm_um-tough-pla-175_0.2mm_visual.inst.cfg | 42 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm_visual.inst.cfg create mode 100644 resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm_visual.inst.cfg diff --git a/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm_visual.inst.cfg new file mode 100644 index 00000000000..6a81905545a --- /dev/null +++ b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm_visual.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = ultimaker_sketch_sprint +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_pla_175 +quality_type = draft +setting_version = 24 +type = intent +variant = 0.4mm + +[values] +acceleration_roofing = 1500 +acceleration_wall_0_roofing = 1500 +acceleration_wall_x_roofing = 1500 +cool_min_temperature = 220.0 +hole_xy_offset = 0.2 +hole_xy_offset_max_diameter = 3 +inset_direction = inside_out +line_width = 0.4 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +min_bead_width = 0.34 +min_wall_line_width = 0.34 +roofing_line_width = 0.35 +roofing_monotonic = False +roofing_pattern = lines +skin_monotonic = False +skin_outline_count = 0 +skin_overlap = 25 +small_feature_max_length = 25 +small_feature_speed_factor = 40 +small_hole_max_size = 4.5 +small_skin_width = 4 +speed_roofing = 100 +wall_line_width_x = 0.4 +z_seam_type = back + diff --git a/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm_visual.inst.cfg new file mode 100644 index 00000000000..1635985b89f --- /dev/null +++ b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.2mm_visual.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = ultimaker_sketch_sprint +name = Visual +version = 4 + +[metadata] +intent_category = visual +is_experimental = True +material = ultimaker_tough_pla_175 +quality_type = draft +setting_version = 24 +type = intent +variant = 0.4mm + +[values] +acceleration_roofing = 1500 +acceleration_wall_0_roofing = 1500 +acceleration_wall_x_roofing = 1500 +cool_min_temperature = 220.0 +hole_xy_offset = 0.2 +hole_xy_offset_max_diameter = 3 +inset_direction = inside_out +line_width = 0.4 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +min_bead_width = 0.34 +min_wall_line_width = 0.34 +roofing_line_width = 0.35 +roofing_monotonic = False +roofing_pattern = lines +skin_monotonic = False +skin_outline_count = 0 +skin_overlap = 25 +small_feature_max_length = 25 +small_feature_speed_factor = 40 +small_hole_max_size = 4.5 +small_skin_width = 4 +speed_roofing = 100 +wall_line_width_x = 0.4 +z_seam_type = back + From 73519a3cdc6569c9e8e5bf011514bb0c1cb369d9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 21 Jan 2025 10:08:01 +0100 Subject: [PATCH 13/15] Remove + character from bundle identifier CURA-12313 This character is not allowed and will make an invalid package, see https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleidentifier --- packaging/MacOS/build_macos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index a495a027695..a7063f688d7 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -154,7 +154,7 @@ def create_dmg(filename: str, dist_path: str, source_path: str, app_name: str) - parser.add_argument("--app_name", required = True, type = str, help = "Filename of the .app that will be contained within the dmg/pkg") args = parser.parse_args() - cura_version = args.cura_conan_version.split("/")[-1] + cura_version = args.cura_conan_version.replace("+","-") # + is not allowed for bundle identifier app_name = f"{args.app_name}.app" From a13726bba129afcb1f01eafdf2e2bcc9ba0b2521 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 22 Jan 2025 09:54:20 +0100 Subject: [PATCH 14/15] Move interlocking settings out of experimental CURA-12247 Also set interlocking_enable to basic settings because it is quite important and just enabling it doesn't require advanced knowledge/skills. --- resources/definitions/fdmprinter.def.json | 164 +++++++++++----------- resources/setting_visibility/advanced.cfg | 2 +- resources/setting_visibility/basic.cfg | 1 + resources/setting_visibility/expert.cfg | 12 +- 4 files changed, 90 insertions(+), 89 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8471c59f828..9ce93cd4eb1 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7500,6 +7500,88 @@ "enabled": "retraction_enable and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": true + }, + "interlocking_enable": + { + "label": "Generate Interlocking Structure", + "description": "At the locations where models touch, generate an interlocking beam structure. This improves the adhesion between models, especially models printed in different materials.", + "type": "bool", + "enabled": "extruders_enabled_count > 1", + "default_value": false, + "resolve": "(extruders_enabled_count > 1) and any(extruderValues('interlocking_enable'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_beam_width": + { + "label": "Interlocking Beam Width", + "description": "The width of the interlocking structure beams.", + "type": "float", + "unit": "mm", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 0.8, + "value": "2 * wall_line_width_0", + "minimum_value": "min_odd_wall_line_width", + "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)", + "maximum_value_warning": "max(extruderValues('wall_line_width_0')) * 6", + "settable_per_mesh": true, + "settable_per_extruder": true + }, + "interlocking_orientation": + { + "label": "Interlocking Structure Orientation", + "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", + "unit": "\u00b0", + "type": "float", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 22.5, + "minimum_value": "0", + "maximum_value": "360", + "resolve": "min(extruderValues('interlocking_orientation'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_beam_layer_count": + { + "label": "Interlocking Beam Layer Count", + "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "1", + "maximum_value_warning": "50", + "resolve": "max(extruderValues('interlocking_beam_layer_count'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_depth": + { + "label": "Interlocking Depth", + "description": "The distance from the boundary between models to generate interlocking structure, measured in cells. Too few cells will result in poor adhesion.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "1", + "maximum_value": "10", + "maximum_value_warning": "5", + "resolve": "max(extruderValues('interlocking_depth'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_boundary_avoidance": + { + "label": "Interlocking Boundary Avoidance", + "description": "The distance from the outside of a model where interlocking structures will not be generated, measured in cells.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "0", + "minimum_value_warning": "resolveOrValue('interlocking_depth')", + "maximum_value": "10", + "maximum_value_warning": "5", + "resolve": "max(extruderValues('interlocking_boundary_avoidance'))", + "settable_per_mesh": false, + "settable_per_extruder": false } } }, @@ -7922,88 +8004,6 @@ "settable_per_mesh": true, "settable_per_extruder": false }, - "interlocking_enable": - { - "label": "Generate Interlocking Structure", - "description": "At the locations where models touch, generate an interlocking beam structure. This improves the adhesion between models, especially models printed in different materials.", - "type": "bool", - "enabled": "extruders_enabled_count > 1", - "default_value": false, - "resolve": "(extruders_enabled_count > 1) and any(extruderValues('interlocking_enable'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_beam_width": - { - "label": "Interlocking Beam Width", - "description": "The width of the interlocking structure beams.", - "type": "float", - "unit": "mm", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 0.8, - "value": "2 * wall_line_width_0", - "minimum_value": "min_odd_wall_line_width", - "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)", - "maximum_value_warning": "max(extruderValues('wall_line_width_0')) * 6", - "settable_per_mesh": true, - "settable_per_extruder": true - }, - "interlocking_orientation": - { - "label": "Interlocking Structure Orientation", - "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", - "unit": "\u00b0", - "type": "float", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 22.5, - "minimum_value": "0", - "maximum_value": "360", - "resolve": "min(extruderValues('interlocking_orientation'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_beam_layer_count": - { - "label": "Interlocking Beam Layer Count", - "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", - "type": "int", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 2, - "minimum_value": "1", - "maximum_value_warning": "50", - "resolve": "max(extruderValues('interlocking_beam_layer_count'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_depth": - { - "label": "Interlocking Depth", - "description": "The distance from the boundary between models to generate interlocking structure, measured in cells. Too few cells will result in poor adhesion.", - "type": "int", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 2, - "minimum_value": "1", - "maximum_value": "10", - "maximum_value_warning": "5", - "resolve": "max(extruderValues('interlocking_depth'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_boundary_avoidance": - { - "label": "Interlocking Boundary Avoidance", - "description": "The distance from the outside of a model where interlocking structures will not be generated, measured in cells.", - "type": "int", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 2, - "minimum_value": "0", - "minimum_value_warning": "resolveOrValue('interlocking_depth')", - "maximum_value": "10", - "maximum_value_warning": "5", - "resolve": "max(extruderValues('interlocking_boundary_avoidance'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, "support_skip_some_zags": { "label": "Break Up Support In Chunks", diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 93c3dc91efd..8585a05eeca 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -133,6 +133,7 @@ prime_tower_mode prime_tower_position_x prime_tower_position_y prime_tower_brim_enable +interlocking_enable [meshfix] @@ -144,7 +145,6 @@ magic_spiralize smooth_spiralized_contours [experimental] -interlocking_enable conical_overhang_enabled support_conical_enabled adaptive_layer_height_enabled diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 0193eb26ba7..6c6124ab673 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -56,6 +56,7 @@ adhesion_extruder_nr prime_tower_enable prime_tower_position_x prime_tower_position_y +interlocking_enable [meshfix] diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index b13618e5c16..6c78e405036 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -378,6 +378,12 @@ prime_tower_min_shell_thickness ooze_shield_enabled ooze_shield_angle ooze_shield_dist +interlocking_enable +interlocking_beam_width +interlocking_orientation +interlocking_beam_layer_count +interlocking_dept +interlocking_boundary_avoidance [meshfix] meshfix_union_all @@ -428,12 +434,6 @@ roofing_monotonic roofing_angles infill_enable_travel_optimization material_flow_temp_graph -interlocking_enable -interlocking_beam_width -interlocking_orientation -interlocking_beam_layer_count -interlocking_dept -interlocking_boundary_avoidance support_skip_some_zags support_skip_zag_per_mm support_zag_skip_count From 4a30660a5cc78a131d3b4afbbee2c01ee545d85e Mon Sep 17 00:00:00 2001 From: HellAholic Date: Thu, 23 Jan 2025 10:19:57 +0100 Subject: [PATCH 15/15] Remove pydir and workflow folder --- Cura-workflows | 1 - pydir.txt | 1 - 2 files changed, 2 deletions(-) delete mode 160000 Cura-workflows delete mode 100644 pydir.txt diff --git a/Cura-workflows b/Cura-workflows deleted file mode 160000 index a38e2d1e102..00000000000 --- a/Cura-workflows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a38e2d1e1029e5a350f7ecbee037e7ccabb7044a diff --git a/pydir.txt b/pydir.txt deleted file mode 100644 index 8b137891791..00000000000 --- a/pydir.txt +++ /dev/null @@ -1 +0,0 @@ -