diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 2c8de838fd..4f0ec17ad5 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -95,7 +95,7 @@ jobs: secrets: inherit notify-export: - if: always() + if: ${{ always() }} needs: [ conan-recipe-version, conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] uses: ultimaker/cura/.github/workflows/notify.yml@main diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 7c2da8e133..8fc1266eb8 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -60,7 +60,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-10.15, windows-2022, ubuntu-20.04 ] + include: + - { os: macos-10.15, os_id: 'MacOS' } + - { os: windows-2022, os_id: 'Windows' } + - { os: ubuntu-20.04, os_id: 'Linux' } + - { os: ubuntu-22.04, os_id: 'Linux-latest' } steps: - name: Checkout @@ -112,7 +116,7 @@ jobs: - name: Install Linux system requirements if: ${{ runner.os == 'Linux' }} run: | - sudo apt install build-essential checkinstall zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev -y + sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev -y wget --no-check-certificate --quiet https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O $GITHUB_WORKSPACE/appimagetool chmod +x $GITHUB_WORKSPACE/appimagetool echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV @@ -167,35 +171,35 @@ jobs: - name: Archive the artifacts (bash) if: ${{ github.event.inputs.installer == 'false' && runner.os != 'Windows' }} - run: tar -zcf "./Ultimaker-Cura-$CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.tar.gz" "./Ultimaker-Cura/" + run: tar -zcf "./Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.tar.gz" "./Ultimaker-Cura/" working-directory: dist - name: Archive the artifacts (Powershell) if: ${{ github.event.inputs.installer == 'false' && runner.os == 'Windows' }} - run: Compress-Archive -Path ".\Ultimaker-Cura" -DestinationPath ".\Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.zip" + run: Compress-Archive -Path ".\Ultimaker-Cura" -DestinationPath ".\Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.zip" working-directory: dist - name: Create the Windows exe installer (Powershell) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' }} run: | - python ..\cura_inst\packaging\NSIS\nsis-configurator.py ".\Ultimaker-Cura" "..\cura_inst\packaging\NSIS\Ultimaker-Cura.nsi.jinja" "Ultimaker Cura" "Ultimaker-Cura.exe" "$Env:CURA_VERSION_MAJOR" "$Env:CURA_VERSION_MINOR" "$Env:CURA_VERSION_PATCH" "$Env:CURA_VERSION_BUILD" "Ultimaker B.V." "https://ultimaker.com" "..\cura_inst\packaging\cura_license.txt" "LZMA" "..\cura_inst\packaging\NSIS\cura_banner_nsis.bmp" "..\cura_inst\packaging\icons\Cura.ico" "Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.exe" + python ..\cura_inst\packaging\NSIS\nsis-configurator.py ".\Ultimaker-Cura" "..\cura_inst\packaging\NSIS\Ultimaker-Cura.nsi.jinja" "Ultimaker Cura" "Ultimaker-Cura.exe" "$Env:CURA_VERSION_MAJOR" "$Env:CURA_VERSION_MINOR" "$Env:CURA_VERSION_PATCH" "$Env:CURA_VERSION_BUILD" "Ultimaker B.V." "https://ultimaker.com" "..\cura_inst\packaging\cura_license.txt" "LZMA" "..\cura_inst\packaging\NSIS\cura_banner_nsis.bmp" "..\cura_inst\packaging\icons\Cura.ico" "Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.exe" makensis /V2 /P4 Ultimaker-Cura.nsi working-directory: dist - name: Create the Linux AppImage (Bash) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Linux' }} - run: python ../cura_inst/packaging/AppImage/create_appimage.py ./Ultimaker-Cura $CURA_VERSION_FULL "Ultimaker-Cura-$CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.AppImage" + run: python ../cura_inst/packaging/AppImage/create_appimage.py ./Ultimaker-Cura $CURA_VERSION_FULL "Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.AppImage" working-directory: dist - name: Create the MacOS dmg (Bash) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }} - run: python ../cura_inst/packaging/dmg/dmg_sign_noterize.py ../cura_inst . "Ultimaker-Cura-$CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.dmg" + run: python ../cura_inst/packaging/dmg/dmg_sign_noterize.py ../cura_inst . "Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.dmg" working-directory: dist - name: Upload the artifacts uses: actions/upload-artifact@v3 with: - name: Ultimaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ runner.os }}-${{ runner.arch }} + name: Ultimaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ matrix.os_id }}-${{ runner.arch }} path: | dist/*.tar.gz dist/*.zip @@ -205,3 +209,16 @@ jobs: dist/*.AppImage dist/*.asc retention-days: 2 + + notify-export: + if: ${{ always() }} + needs: [ cura-installer-create ] + + uses: ultimaker/cura/.github/workflows/notify.yml@main + with: + success: ${{ contains(join(needs.*.result, ','), 'success') }} + success_title: "Create the Cura distributions" + success_body: "Installers for ${{ inputs.cura_conan_version }}" + failure_title: "Failed to create the Cura distributions" + failure_body: "Failed to create at least 1 installer for ${{ inputs.cura_conan_version }}" + secrets: inherit diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 3c950671c4..cc3d9df21b 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -71,7 +71,7 @@ jobs: needs: [ conan-recipe-version ] steps: - - name: Checkout CuraEngine + - name: Checkout uses: actions/checkout@v3 - name: Setup Python and pip diff --git a/conandata.yml b/conandata.yml index a5cecdbeeb..6042f357b9 100644 --- a/conandata.yml +++ b/conandata.yml @@ -73,6 +73,7 @@ - "zeroconf" - "fcntl" - "stl" + - "serial" collect_all: - "cura" - "UM" @@ -164,6 +165,7 @@ - "zeroconf" - "fcntl" - "stl" + - "serial" collect_all: - "cura" - "UM" @@ -255,6 +257,7 @@ - "zeroconf" - "fcntl" - "stl" + - "serial" collect_all: - "cura" - "UM" diff --git a/packaging/AppImage/AppRun b/packaging/AppImage/AppRun index 5a134fa12d..d2beac8745 100644 --- a/packaging/AppImage/AppRun +++ b/packaging/AppImage/AppRun @@ -14,3 +14,7 @@ export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb export OPENSSL_CONF="$scriptdir/openssl.cnf" $scriptdir/Ultimaker-Cura "$@" + +# If this variable is set on Zorin OS 16 Cura would crash +# unset `QT_STYLE_OVERRIDE` as a precaution +unset QT_STYLE_OVERRIDE \ No newline at end of file diff --git a/plugins/ModelChecker/model_checker.svg b/plugins/ModelChecker/model_checker.svg index ce9594302e..e63e082e27 100644 --- a/plugins/ModelChecker/model_checker.svg +++ b/plugins/ModelChecker/model_checker.svg @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index 46d05511cf..a80f304aaa 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -286,6 +286,7 @@ UM.Dialog { id: definitionsModel containerId: manager.selectedScriptDefinitionId + onContainerIdChanged: definitionsModel.setAllVisible(true) showAll: true } diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d8f6ad05cd..823b2f0b4f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8040,7 +8040,7 @@ "description": "Alternate wall directions every other layer and inset. Useful for materials that can build up stress, like for metal printing.", "type": "bool", "default_value": false, - "enabled": false, + "enabled": true, "settable_per_mesh": true, "settable_per_extruder": true }, diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 9b6f5bf609..c77545bc03 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -92,6 +92,7 @@ UM.ManagementPage minimumHeight: UM.Theme.getSize("modal_window_minimum").height maximumWidth: minimumWidth * 3 maximumHeight: minimumHeight * 3 + backgroundColor: UM.Theme.getColor("main_background") } UM.ConfirmRemoveDialog diff --git a/resources/qml/Preferences/RenameDialog.qml b/resources/qml/Preferences/RenameDialog.qml index 6e4c628114..7bcd65ed5d 100644 --- a/resources/qml/Preferences/RenameDialog.qml +++ b/resources/qml/Preferences/RenameDialog.qml @@ -23,7 +23,7 @@ UM.Dialog property string explanation: catalog.i18nc("@info", "Please provide a new name.") title: dialogTitle - + backgroundColor: UM.Theme.getColor("main_background") minimumWidth: UM.Theme.getSize("small_popup_dialog").width minimumHeight: UM.Theme.getSize("small_popup_dialog").height width: minimumWidth diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 87cb271ed4..bc5826fe7c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -43,7 +43,6 @@ Item qualityType = Cura.MachineManager.activeQualityType } else { qualityType = Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category) - print(Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category)) } Cura.IntentManager.selectIntent(model.intent_category, qualityType) } diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 64a6db0573..fd8f22a3fe 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index 5c2f5635fc..0723122770 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index bc3928bab4..7ad6967e6b 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index 9dd15079c7..add681b5c6 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index 7e22a08939..fbf7d65477 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index e298848a90..07b91499e4 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = BB 0.8 [values] brim_replaces_support = False -layer_height = 0.4 material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index f52206e9b3..6177272235 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,11 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False -layer_height = 0.3 material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True -support_infill_sparse_thickness = 0.3 support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg index fd9ec86036..048708b0d1 100644 --- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg @@ -11,5 +11,4 @@ weight = -1 global_quality = True [values] -layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height +layer_height = 0.15 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg index 3522f0b5a0..a67d97a78e 100644 --- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg @@ -11,5 +11,4 @@ weight = 1 global_quality = True [values] -layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height +layer_height = 0.06 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg index 5955a587f4..4a68719014 100644 --- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 87415ecb05..577362391f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 97b9e33f60..416a175c81 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index 85e3e2530a..1df9f6b97b 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index 5bcaf96f5f..7495130aa9 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index 7b31e48283..308d26bf62 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg index 3742eec814..5d2618a02d 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg index 4c7dbe5b28..88d6049ff9 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg index ff65fd5c57..eccccc6d42 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index e57c078d70..e2450cd6b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index def9d111c1..24f007b99b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index f69ecfbb94..b98235718b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 17b3dd2467..40dcd5da35 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index 47dcbe57fa..d5397c44eb 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg index 34d2946524..8ab6de530f 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg index 14b0a3bb4e..a3153e8718 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg index ed099f85bd..ef68e808dc 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 34696fb35e..7fd5d797cd 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -48,7 +48,6 @@ "lining": "border_main", "viewport_overlay": "background_1", - "primary": [12, 169, 227, 255], "primary_text": "text_default", "secondary": [95, 95, 95, 255], @@ -81,7 +80,7 @@ "text": "text_default", "text_detail": [255, 255, 255, 172], "text_link": "accent_1", - "text_inactive": [255, 255, 255, 88], + "text_inactive": [118, 118, 118, 255], "text_hover": [255, 255, 255, 204], "text_scene": [255, 255, 255, 162], "text_scene_hover": [255, 255, 255, 204], diff --git a/resources/themes/cura-light/icons/default/Download.svg b/resources/themes/cura-light/icons/default/Download.svg index cbe0da2a99..fb94cd78b4 100644 --- a/resources/themes/cura-light/icons/default/Download.svg +++ b/resources/themes/cura-light/icons/default/Download.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/icons/default/People.svg b/resources/themes/cura-light/icons/default/People.svg index 8632b37f7c..6692cbb427 100644 --- a/resources/themes/cura-light/icons/default/People.svg +++ b/resources/themes/cura-light/icons/default/People.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/icons/default/Settings.svg b/resources/themes/cura-light/icons/default/Settings.svg index 204f2a5b6f..22000feb16 100644 --- a/resources/themes/cura-light/icons/default/Settings.svg +++ b/resources/themes/cura-light/icons/default/Settings.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/themes/cura-light/icons/high/Certificate.svg b/resources/themes/cura-light/icons/high/Certificate.svg index b588bddd8b..4d2c5ba0cf 100644 --- a/resources/themes/cura-light/icons/high/Certificate.svg +++ b/resources/themes/cura-light/icons/high/Certificate.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/themes/cura-light/icons/high/Settings.svg b/resources/themes/cura-light/icons/high/Settings.svg index 1cd2ff324e..23774a3beb 100644 --- a/resources/themes/cura-light/icons/high/Settings.svg +++ b/resources/themes/cura-light/icons/high/Settings.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 83eb13f0cb..e7622bc685 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -218,7 +218,7 @@ "lining": [192, 193, 194, 255], "viewport_overlay": [246, 246, 246, 255], - "primary": [25, 110, 240, 255], + "primary": "accent_1", "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], "text_selection": [156, 195, 255, 127], @@ -269,7 +269,7 @@ "text": [25, 25, 25, 255], "text_disabled": [180, 180, 180, 255], "text_detail": [174, 174, 174, 128], - "text_link": [25, 110, 240, 255], + "text_link": "accent_1", "text_inactive": [174, 174, 174, 255], "text_medium": [128, 128, 128, 255], "text_scene": [102, 102, 102, 255],