diff options
author | Jelle Spijker <j.spijker@ultimaker.com> | 2022-07-15 11:33:04 +0300 |
---|---|---|
committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-07-15 11:33:04 +0300 |
commit | c731ac7dfeb53fcab343a09206a179087e38780f (patch) | |
tree | a7f3885738046065a006e8989602187bdb626959 | |
parent | 310fb48f876b49a694c90a8023c74e657f080806 (diff) | |
parent | 73e7ba4046eda31711ec4058db7c078cdc8eae5b (diff) |
Merge branch '5.1' into CURA-9459_standard_default_install_path
# Conflicts:
# conandata.yml
-rw-r--r-- | .github/workflows/conan-package.yml | 3 | ||||
-rw-r--r-- | .github/workflows/notify.yml | 4 | ||||
-rw-r--r-- | conandata.yml | 12 | ||||
-rw-r--r-- | resources/qml/Preferences/Materials/MaterialsSyncDialog.qml | 4 |
4 files changed, 16 insertions, 7 deletions
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index a96afaedab..666ea5fe40 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -61,7 +61,6 @@ jobs: recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'macos-10.15' python_version: '3.10.x' - conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true secrets: inherit @@ -75,7 +74,6 @@ jobs: recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'ubuntu-20.04' python_version: '3.10.x' - conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true secrets: inherit @@ -89,7 +87,6 @@ jobs: recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'windows-2022' python_version: '3.10.x' - conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true secrets: inherit diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml index 3d421905d0..370b54c78b 100644 --- a/.github/workflows/notify.yml +++ b/.github/workflows/notify.yml @@ -36,7 +36,7 @@ jobs: uses: rtCamp/action-slack-notify@v2 env: SLACK_USERNAME: ${{ github.repository }} - SLACK_COLOR: #00ff00 + SLACK_COLOR: green SLACK_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true SLACK_TITLE: ${{ inputs.success_title }} SLACK_MESSAGE: ${{ inputs.success_body }} @@ -47,7 +47,7 @@ jobs: uses: rtCamp/action-slack-notify@v2 env: SLACK_USERNAME: ${{ github.repository }} - SLACK_COLOR: #ff0000 + SLACK_COLOR: red SLACK_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true SLACK_TITLE: ${{ inputs.failure_title }} SLACK_MESSAGE: ${{ inputs.failure_body }} diff --git a/conandata.yml b/conandata.yml index 29f45ad9b9..3ac6b274de 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,3 +1,15 @@ +--- +# Usage: defaults to None +# If you're on a release branch create an entry for that **version** e.q.: `5.1.0` update the requirements (use pinned versions, not latest) +# also create a beta entry for that **version** e.q.: `5.1.0-beta`, update the requirements (use the <dep_name>/(latest)@ultimaker/stable) +# +# If you're working on a feature/bugfix branch from a release branch, create an entry for that **channel**, update the requirements (use +# the <dep_name>/(latest)@ultimaker/stable) +# +# If you're working on a feature/bugfix branch from a main branch, it is optional to create an entry for that **channel**, update the +# requirements (use the <dep_name>/(latest)@ultimaker/testing) +# +# Subject to change in the future! "None": requirements: - "arcus/(latest)@ultimaker/testing" diff --git a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml index eb8b46dbad..4fd82b3e02 100644 --- a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml +++ b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml @@ -8,9 +8,9 @@ import QtQuick.Layouts 1.15 import QtQuick.Window 2.1 import Cura 1.1 as Cura -import UM 1.5 as UM +import UM 1.6 as UM -Window +UM.Window { id: materialsSyncDialog property variant catalog: UM.I18nCatalog { name: "cura" } |