diff --git a/conandata.yml b/conandata.yml index 6e2a5f4f27..e2ae2756b5 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 /(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 /(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 /(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" }