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

Merge branch 'main' into PP-480-Fix-generic-profiles-factor-4

Browse Source
This commit is contained in:
Erwan MATHIEU 2024-05-23 14:51:27 +02:00 committed by GitHub
commit 5f1b0751be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/printer-linter-pr-diagnose.yml vendored
View File

@ -5,6 +5,9 @@ on:
path:
- "resources/**"
permissions:
contents: read
jobs:
printer-linter-diagnose:
name: Printer linter PR diagnose

3
.github/workflows/printer-linter-pr-post.yml vendored
View File

@ -5,6 +5,9 @@ on:
workflows: ["printer-linter-pr-diagnose"]
types: [completed]
permissions:
issues: write
jobs:
clang-tidy-results:
# Trigger the job only if the previous (insecure) workflow completed successfully

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

@ -6845,7 +6845,7 @@
"label": "Prime Tower Type",
"description": "<html>How to generate the prime tower:<ul><li><b>Normal:</b> create a bucket in which secondary materials are primed</li><li><b>Interleaved:</b> 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</li></ul></html>",
"type": "enum",
"value": "'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'",
"resolve": "'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'",
"options":
{
"normal": "Normal",