From 35fce917c6b7f8410fc2ed633e10355d7e92f45e Mon Sep 17 00:00:00 2001
From: "c.lamboo" <casperlamboo@gmail.com>
Date: Fri, 15 Jul 2022 07:25:54 +0200
Subject: [PATCH 1/2] Use `UM.Window` in the material sync dialog and the
 preference pages

CURA-9428
---
 resources/qml/Preferences/Materials/MaterialsSyncDialog.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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" }

From 73e7ba4046eda31711ec4058db7c078cdc8eae5b Mon Sep 17 00:00:00 2001
From: "j.spijker@ultimaker.com" <jelle spijker>
Date: Fri, 15 Jul 2022 10:13:39 +0200
Subject: [PATCH 2/2] Remove 5.1.0-beta from workflow

Contributes to CURA-9365
---
 conandata.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/conandata.yml b/conandata.yml
index 756cb09db3..48968b300e 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"