Merge branch 'master' into marketplace_redesign

Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.

plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml

@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Ultimaker B.V.
+// Copyright (C) 2022 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
@@ -49,6 +49,8 @@ Item
             id: searchBar
             Layout.fillWidth: true
             implicitHeight: createNewProjectButton.height
+            leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
+            focus: true
             onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field.
         }
 

plugins/SentryLogger/SentryLogger.py

@@ -11,7 +11,6 @@ try:
 except ImportError:
     pass
 from typing import Optional
-import os
 
 
 class SentryLogger(LogOutput):

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -650,7 +650,6 @@ class XmlMaterialProfile(InstanceContainer):
                 machine_id_list = product_id_map.get(identifier.get("product"), [])
                 if not machine_id_list:
                     machine_id_list = self.getPossibleDefinitionIDsFromName(identifier.get("product"))
-
                 for machine_id in machine_id_list:
                     definitions = ContainerRegistry.getInstance().findDefinitionContainersMetadata(id = machine_id)
                     if not definitions:
@@ -1068,6 +1067,8 @@ class XmlMaterialProfile(InstanceContainer):
         id_list = {name.lower().replace(" ", ""),  # simply removing all spaces
                    name.lower().replace(" ", "_"),  # simply replacing all spaces with underscores
                    "_".join(merged_name_parts),
+                   name.replace(" ", ""),
+                   name.replace(" ", "_")
                    }
         id_list = list(id_list)
         return id_list