From ca099c2bb839eed796e75afb5ea284fd4a5a830f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 3 Nov 2023 10:40:01 +0100 Subject: [PATCH 1/3] Don't define value for disabled print-sequence setting. --- resources/definitions/ultimaker_method_base.def.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index b62a5939b9..9af2d716a0 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -355,11 +355,7 @@ "prime_tower_line_width": { "value": 1 }, "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, "prime_tower_wipe_enabled": { "value": true }, - "print_sequence": - { - "enabled": false, - "value": "all_at_once" - }, + "print_sequence": { "enabled": false }, "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, "raft_base_line_width": { "value": 1.4 }, "raft_base_speed": { "value": 5 }, From 97ad526ea4b299301775b0f5a2d414662f39641a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 3 Nov 2023 10:56:59 +0100 Subject: [PATCH 2/3] Refine prime tower new settings descriptions CURA-11259 --- resources/definitions/fdmprinter.def.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c20010090f..4527339494 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6675,7 +6675,7 @@ { "value": "resolveOrValue('adhesion_type') in ['raft', 'brim']", "label": "Prime Tower Base", - "description": "Prime-towers might need the extra adhesion afforded by a brim or raft, even if the model doesn't.", + "description": "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height.", "type": "bool", "enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('adhesion_type') != 'raft'", "default_value": false, @@ -6686,7 +6686,7 @@ { "value": "resolveOrValue('raft_margin') if resolveOrValue('adhesion_type') == 'raft' else resolveOrValue('brim_width')", "label": "Prime Tower Base Size", - "description": "The width of the prime tower base.", + "description": "The width of the prime tower brim/base. A larger base enhances adhesion to the build plate, but also reduces the effective print area.", "type": "float", "unit": "mm", "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')", @@ -6700,7 +6700,7 @@ { "value": "resolveOrValue('layer_height')", "label": "Prime Tower Base Height", - "description": "The height of the prime tower base.", + "description": "The height of the prime tower base. Increasing this value will result in a more sturdy prime tower because the base will be wider. If this setting is too low, the prime tower will not have a sturdy base.", "type": "float", "unit": "mm", "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')", @@ -6712,8 +6712,8 @@ }, "prime_tower_base_curve_magnitude": { - "label": "Prime Tower Base Curve Magnitude", - "description": "The magnitude factor used for the curve of the prime tower foot.", + "label": "Prime Tower Base Slope", + "description": "The magnitude factor used for the slope of the prime tower base. If you increase this value, the base will become slimmer. If you decrease it, the base will become thicker.", "type": "float", "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')", "default_value": 4, From b2291064fbda4a0f31cbdaa7028b006803972d61 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 3 Nov 2023 11:29:58 +0100 Subject: [PATCH 3/3] Re-fix nightly builds --- .github/workflows/installers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index b71f64d50c..b0c83399f6 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -280,13 +280,13 @@ jobs: import datetime from jinja2 import Template - with open(".github/workflows/release-notes.md.jinja", "r") as f: + with open(".github/workflows/release_notes.md.jinja", "r") as f: release_notes = Template(f.read()) current_nightly_beta = "${{ needs.default-values.outputs.release_tag }}".split("nightly-")[-1] with open("release-notes.md", "w") as f: f.write(release_notes.render( - timestamp=${{ steps.filename.outputs.NIGHTLY_TIME }}, + timestamp="${{ steps.filename.outputs.NIGHTLY_TIME }}", branch="" if ${{ needs.default-values.outputs.release_tag == 'nightly' }} else current_nightly_beta, branch_specific="" if os.getenv("GITHUB_REF") == "refs/heads/main" else f"?branch={current_nightly_beta}", ))