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

Merge remote-tracking branch 'origin/5.1' into 5.1

Browse Source
This commit is contained in:
jellespijker 2022-07-05 14:07:11 +02:00
commit baec0e75f7
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/cura-installer.yml vendored
View File

@ -158,12 +158,16 @@ jobs:
run: | run: |
. ./cura_inst/bin/activate_github_actions_env.sh . ./cura_inst/bin/activate_github_actions_env.sh
. ./cura_inst/bin/activate_github_actions_version_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) - name: Set Environment variables for Cura (Powershell)
if: ${{ runner.os == 'Windows' }} if: ${{ runner.os == 'Windows' }}
run: | run: |
.\cura_inst\Scripts\activate_github_actions_env.ps1 .\cura_inst\Scripts\activate_github_actions_env.ps1
.\cura_inst\Scripts\activate_github_actions_version_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 - name: Create the Cura dist
run: pyinstaller ./cura_inst/Ultimaker-Cura.spec run: pyinstaller ./cura_inst/Ultimaker-Cura.spec

1
resources/definitions/alfawise_u30.def.json
View File

@ -40,6 +40,7 @@
"machine_max_feedrate_y": { "default_value": 200 }, "machine_max_feedrate_y": { "default_value": 200 },
"machine_max_feedrate_z": { "default_value": 5 }, "machine_max_feedrate_z": { "default_value": 5 },
"machine_max_feedrate_e": { "default_value": 100 }, "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_x": { "default_value": 500 },
"machine_max_acceleration_y": { "default_value": 500 }, "machine_max_acceleration_y": { "default_value": 500 },
"machine_max_acceleration_z": { "default_value": 10 }, "machine_max_acceleration_z": { "default_value": 10 },

2
resources/qml/Cura.qml
View File

@ -311,8 +311,6 @@ UM.MainWindow
property int mouseY: base.mouseY property int mouseY: base.mouseY
property bool tallerThanParent: height > parent.height property bool tallerThanParent: height > parent.height
z: 1 // Ensure toolbar and toolpanels are drawn on top
anchors anchors
{ {
verticalCenter: tallerThanParent ? undefined : parent.verticalCenter verticalCenter: tallerThanParent ? undefined : parent.verticalCenter