From d7f103c9fecea40a25a0ffca134378d8bb003be0 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 5 Jul 2022 12:23:53 +0200 Subject: [PATCH 1/5] dirty fix build number --- .github/workflows/cura-installer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index adb263abdd..d799af1b14 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -181,7 +181,7 @@ jobs: - 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" "0" "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" makensis /V2 /P4 Ultimaker-Cura.nsi working-directory: dist From f01f97830d96f1ec1812fa4c70c05cdeb8897a54 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 5 Jul 2022 12:39:14 +0200 Subject: [PATCH 2/5] dirty version hack --- .github/workflows/cura-installer.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index d799af1b14..705c29f757 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -158,12 +158,16 @@ jobs: run: | . ./cura_inst/bin/activate_github_actions_env.sh . ./cura_inst/bin/activate_github_actions_version_env.sh + echo "$CURA_VERSION_FULL=5.1.0-beta" >> $GITHUB_ENV + echo "$CURA_VERSION_BUILD=0" >> $GITHUB_ENV - name: Set Environment variables for Cura (Powershell) if: ${{ runner.os == 'Windows' }} run: | .\cura_inst\Scripts\activate_github_actions_env.ps1 .\cura_inst\Scripts\activate_github_actions_version_env.ps1 + echo "$Env:CURA_VERSION_FULL=5.1.0-beta" >> $Env:GITHUB_ENV + echo "$Env:CURA_VERSION_BUILD=0" >> $Env:GITHUB_ENV - name: Create the Cura dist run: pyinstaller ./cura_inst/Ultimaker-Cura.spec @@ -181,7 +185,7 @@ jobs: - 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" "0" "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-${{ runner.os }}-${{ runner.arch }}.exe" makensis /V2 /P4 Ultimaker-Cura.nsi working-directory: dist From f4c21631ed5e3604a2e53d02c99fccf458319bce Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 5 Jul 2022 12:56:17 +0200 Subject: [PATCH 3/5] removed pound sign from name --- .github/workflows/cura-installer.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 705c29f757..6cecbbc83b 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -158,16 +158,16 @@ jobs: run: | . ./cura_inst/bin/activate_github_actions_env.sh . ./cura_inst/bin/activate_github_actions_version_env.sh - echo "$CURA_VERSION_FULL=5.1.0-beta" >> $GITHUB_ENV - echo "$CURA_VERSION_BUILD=0" >> $GITHUB_ENV + echo "CURA_VERSION_FULL=5.1.0-beta" >> $GITHUB_ENV + echo "CURA_VERSION_BUILD=0" >> $GITHUB_ENV - name: Set Environment variables for Cura (Powershell) if: ${{ runner.os == 'Windows' }} run: | .\cura_inst\Scripts\activate_github_actions_env.ps1 .\cura_inst\Scripts\activate_github_actions_version_env.ps1 - echo "$Env:CURA_VERSION_FULL=5.1.0-beta" >> $Env:GITHUB_ENV - echo "$Env:CURA_VERSION_BUILD=0" >> $Env:GITHUB_ENV + echo "Env:CURA_VERSION_FULL=5.1.0-beta" >> $Env:GITHUB_ENV + echo "Env:CURA_VERSION_BUILD=0" >> $Env:GITHUB_ENV - name: Create the Cura dist run: pyinstaller ./cura_inst/Ultimaker-Cura.spec From bafffa994c5b8e0bf0782a0d177456bc26b58560 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 5 Jul 2022 13:43:20 +0200 Subject: [PATCH 4/5] Fix toolbar being drawn over monitor page CURA-9401 --- resources/qml/Cura.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index d22e5a1526..2ec342f502 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -311,8 +311,6 @@ UM.MainWindow property int mouseY: base.mouseY property bool tallerThanParent: height > parent.height - z: 1 // Ensure toolbar and toolpanels are drawn on top - anchors { verticalCenter: tallerThanParent ? undefined : parent.verticalCenter From 905104159bc1ea8d59c961e7fcb04b60c0edf701 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 5 Jul 2022 13:51:32 +0200 Subject: [PATCH 5/5] Fix incorrect z_hop speed for alfawise Fixes #12641 --- resources/definitions/alfawise_u30.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/alfawise_u30.def.json b/resources/definitions/alfawise_u30.def.json index 3bfc1aaa4e..b76a1773c5 100644 --- a/resources/definitions/alfawise_u30.def.json +++ b/resources/definitions/alfawise_u30.def.json @@ -40,6 +40,7 @@ "machine_max_feedrate_y": { "default_value": 200 }, "machine_max_feedrate_z": { "default_value": 5 }, "machine_max_feedrate_e": { "default_value": 100 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, "machine_max_acceleration_x": { "default_value": 500 }, "machine_max_acceleration_y": { "default_value": 500 }, "machine_max_acceleration_z": { "default_value": 10 },