GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-10 03:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.6'

Browse Source
This commit is contained in:
Erwan MATHIEU 2023-11-03 11:31:58 +01:00
commit d69a5e0034
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/installers.yml vendored
View File

@ -291,14 +291,14 @@ 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 }},
branch="" if ${{ needs.default_values.outputs.release_tag == 'nightly' }} else current_nightly_beta,
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}",
))

10
resources/definitions/fdmprinter.def.json
View File

@ -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,

6
resources/definitions/ultimaker_method_base.def.json
View File

@ -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 },