From a8860017c7da7f87dfdb804a4ac94fed001ebdab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 15:43:13 +0100 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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