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

Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library

Browse Source
This commit is contained in:
Jelle Spijker 2022-07-14 09:20:42 +02:00
commit 9cb8e4d742
No known key found for this signature in database
GPG Key ID: 6662DC033BE6B99A
31 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/conan-package.yml vendored
View File

@ -48,19 +48,19 @@ on:
jobs: jobs:
conan-recipe-version: conan-recipe-version:
uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main
with: with:
project_name: cura project_name: cura
conan-package-export-macos: conan-package-export-macos:
needs: [ conan-recipe-version ] needs: [ conan-recipe-version ]
uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main
with: with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'macos-10.15' runs_on: 'macos-10.15'
python_version: '3.10.4' python_version: '3.10.x'
conan_config_branch: 'master' conan_config_branch: 'master'
conan_logging_level: 'info' conan_logging_level: 'info'
conan_export_binaries: true conan_export_binaries: true
@ -68,13 +68,13 @@ jobs:
conan-package-export-linux: conan-package-export-linux:
needs: [ conan-recipe-version ] needs: [ conan-recipe-version ]
uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main
with: with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'ubuntu-20.04' runs_on: 'ubuntu-20.04'
python_version: '3.10.4' python_version: '3.10.x'
conan_config_branch: 'master' conan_config_branch: 'master'
conan_logging_level: 'info' conan_logging_level: 'info'
conan_export_binaries: true conan_export_binaries: true
@ -82,13 +82,13 @@ jobs:
conan-package-export-windows: conan-package-export-windows:
needs: [ conan-recipe-version ] needs: [ conan-recipe-version ]
uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main
with: with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'windows-2022' runs_on: 'windows-2022'
python_version: '3.10.4' python_version: '3.10.x'
conan_config_branch: 'master' conan_config_branch: 'master'
conan_logging_level: 'info' conan_logging_level: 'info'
conan_export_binaries: true conan_export_binaries: true
@ -96,9 +96,9 @@ jobs:
notify-export: notify-export:
if: ${{ always() }} if: ${{ always() }}
needs: [ conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] needs: [ conan-recipe-version, conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ]
uses: ultimaker/cura/.github/workflows/notify.yml@5.1 uses: ultimaker/cura/.github/workflows/notify.yml@main
with: with:
success: ${{ contains(join(needs.*.result, ','), 'success') }} success: ${{ contains(join(needs.*.result, ','), 'success') }}
success_title: "New Conan recipe exported in ${{ github.repository }}" success_title: "New Conan recipe exported in ${{ github.repository }}"

2
.github/workflows/conan-recipe-version.yml vendored
View File

@ -76,7 +76,7 @@ jobs:
# FIXME: for when we push a tag (such as an release) # FIXME: for when we push a tag (such as an release)
if is_tag: if is_tag:
branch_version = tools.Version("2.3.5") branch_version = tools.Version("${{ github.ref_name }}")
else: else:
try: try:
branch_version = tools.Version(repo.active_branch.name) branch_version = tools.Version(repo.active_branch.name)

4
.github/workflows/unit-test.yml vendored
View File

@ -62,7 +62,7 @@ env:
jobs: jobs:
conan-recipe-version: conan-recipe-version:
uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main
with: with:
project_name: cura project_name: cura
@ -71,7 +71,7 @@ jobs:
needs: [ conan-recipe-version ] needs: [ conan-recipe-version ]
steps: steps:
- name: Checkout CuraEngine - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Setup Python and pip - name: Setup Python and pip

8
plugins/ModelChecker/model_checker.svg
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg"> <svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg">
<polygon fill="#000000" points="19 11 30 8 30 24 19 27" /> <polygon points="19 11 30 8 30 24 19 27" />
<path d="M10,19 C5.581722,19 2,15.418278 2,11 C2,6.581722 5.581722,3 10,3 C14.418278,3 18,6.581722 18,11 C18,15.418278 14.418278,19 10,19 Z M10,17 C13.3137085,17 16,14.3137085 16,11 C16,7.6862915 13.3137085,5 10,5 C6.6862915,5 4,7.6862915 4,11 C4,14.3137085 6.6862915,17 10,17 Z" fill="#000000" /> <path d="M10,19 C5.581722,19 2,15.418278 2,11 C2,6.581722 5.581722,3 10,3 C14.418278,3 18,6.581722 18,11 C18,15.418278 14.418278,19 10,19 Z M10,17 C13.3137085,17 16,14.3137085 16,11 C16,7.6862915 13.3137085,5 10,5 C6.6862915,5 4,7.6862915 4,11 C4,14.3137085 6.6862915,17 10,17 Z" />
<polygon fill="#000000" points="4.2 15 6 16.8 1.8 21 0 19.2" /> <polygon points="4.2 15 6 16.8 1.8 21 0 19.2" />
<path d="M18.7333454,8.81666365 C18.2107269,6.71940704 16.9524304,4.91317986 15.248379,3.68790525 L18,3 L30,6 L18.7333454,8.81666365 Z M17,16.6573343 L17,27 L6,24 L6,19.0644804 C7.20495897,19.6632939 8.56315852,20 10,20 C12.8272661,20 15.3500445,18.6963331 17,16.6573343 Z" fill="#000000" /> <path d="M18.7333454,8.81666365 C18.2107269,6.71940704 16.9524304,4.91317986 15.248379,3.68790525 L18,3 L30,6 L18.7333454,8.81666365 Z M17,16.6573343 L17,27 L6,24 L6,19.0644804 C7.20495897,19.6632939 8.56315852,20 10,20 C12.8272661,20 15.3500445,18.6963331 17,16.6573343 Z" />
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 877 B

After

Width:  |  Height:  |  Size: 817 B

1
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View File

@ -43,7 +43,6 @@ Item
qualityType = Cura.MachineManager.activeQualityType qualityType = Cura.MachineManager.activeQualityType
} else { } else {
qualityType = Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category) qualityType = Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category)
print(Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category))
} }
Cura.IntentManager.selectIntent(model.intent_category, qualityType) Cura.IntentManager.selectIntent(model.intent_category, qualityType)
} }

1
resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_bam
variant = AA 0.4 variant = AA 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed cool_fan_speed_max = =cool_fan_speed

1
resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_bam
variant = AA 0.4 variant = AA 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed cool_fan_speed_max = =cool_fan_speed

1
resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_pva
variant = BB 0.4 variant = BB 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
material_print_temperature = =default_material_print_temperature + 5 material_print_temperature = =default_material_print_temperature + 5
material_standby_temperature = 100 material_standby_temperature = 100

1
resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_pva
variant = BB 0.4 variant = BB 0.4
[values] [values]
support_infill_sparse_thickness = =3*layer_height
brim_replaces_support = False brim_replaces_support = False
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = False prime_tower_enable = False

1
resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_pva
variant = BB 0.4 variant = BB 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = False prime_tower_enable = False

1
resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
View File

@ -13,7 +13,6 @@ variant = BB 0.8
[values] [values]
brim_replaces_support = False brim_replaces_support = False
layer_height = 0.4
material_standby_temperature = 100 material_standby_temperature = 100
retraction_count_max = 5 retraction_count_max = 5
support_brim_enable = True support_brim_enable = True

2
resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
View File

@ -13,11 +13,9 @@ variant = BB 0.8
[values] [values]
brim_replaces_support = False brim_replaces_support = False
layer_height = 0.3
material_standby_temperature = 100 material_standby_temperature = 100
retraction_count_max = 5 retraction_count_max = 5
support_brim_enable = True support_brim_enable = True
support_infill_sparse_thickness = 0.3
support_interface_enable = True support_interface_enable = True
skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))

3
resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg
View File

@ -11,5 +11,4 @@ weight = -1
global_quality = True global_quality = True
[values] [values]
layer_height = 0.15 layer_height = 0.15
support_infill_sparse_thickness = =2*layer_height

3
resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg
View File

@ -11,5 +11,4 @@ weight = 1
global_quality = True global_quality = True
[values] [values]
layer_height = 0.06 layer_height = 0.06
support_infill_sparse_thickness = =3*layer_height

1
resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg
View File

@ -12,4 +12,3 @@ global_quality = True
[values] [values]
layer_height = 0.1 layer_height = 0.1
support_infill_sparse_thickness = =2*layer_height

1
resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_bam
variant = AA 0.4 variant = AA 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed cool_fan_speed_max = =cool_fan_speed

1
resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_bam
variant = AA 0.4 variant = AA 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed cool_fan_speed_max = =cool_fan_speed

1
resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_pva
variant = BB 0.4 variant = BB 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
material_print_temperature = =default_material_print_temperature + 5 material_print_temperature = =default_material_print_temperature + 5
material_standby_temperature = 100 material_standby_temperature = 100

1
resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_pva
variant = BB 0.4 variant = BB 0.4
[values] [values]
support_infill_sparse_thickness = =3*layer_height
brim_replaces_support = False brim_replaces_support = False
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = False prime_tower_enable = False

1
resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_pva
variant = BB 0.4 variant = BB 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = False prime_tower_enable = False

1
resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg
View File

@ -12,4 +12,3 @@ global_quality = True
[values] [values]
layer_height = 0.15 layer_height = 0.15
support_infill_sparse_thickness = =2*layer_height

1
resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg
View File

@ -12,4 +12,3 @@ global_quality = True
[values] [values]
layer_height = 0.06 layer_height = 0.06
support_infill_sparse_thickness = =3*layer_height

1
resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg
View File

@ -12,4 +12,3 @@ global_quality = True
[values] [values]
layer_height = 0.1 layer_height = 0.1
support_infill_sparse_thickness = =2*layer_height

1
resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_bam
variant = AA 0.4 variant = AA 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed cool_fan_speed_max = =cool_fan_speed

1
resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_bam
variant = AA 0.4 variant = AA 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed cool_fan_speed_max = =cool_fan_speed

1
resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_pva
variant = BB 0.4 variant = BB 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
material_print_temperature = =default_material_print_temperature + 5 material_print_temperature = =default_material_print_temperature + 5
material_standby_temperature = 100 material_standby_temperature = 100

1
resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_pva
variant = BB 0.4 variant = BB 0.4
[values] [values]
support_infill_sparse_thickness = =3*layer_height
brim_replaces_support = False brim_replaces_support = False
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = False prime_tower_enable = False

1
resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
View File

@ -12,6 +12,7 @@ material = generic_pva
variant = BB 0.4 variant = BB 0.4
[values] [values]
support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False brim_replaces_support = False
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = False prime_tower_enable = False

1
resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg
View File

@ -12,4 +12,3 @@ global_quality = True
[values] [values]
layer_height = 0.15 layer_height = 0.15
support_infill_sparse_thickness = =2*layer_height

1
resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg
View File

@ -12,4 +12,3 @@ global_quality = True
[values] [values]
layer_height = 0.06 layer_height = 0.06
support_infill_sparse_thickness = =3*layer_height

1
resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg
View File

@ -12,4 +12,3 @@ global_quality = True
[values] [values]
layer_height = 0.1 layer_height = 0.1
support_infill_sparse_thickness = =2*layer_height