Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11

cura/OAuth2/AuthorizationHelpers.py

@@ -48,8 +48,8 @@ class AuthorizationHelpers:
             }
         try:
             return self.parseTokenResponse(requests.post(self._token_url, data = data))  # type: ignore
-        except requests.exceptions.ConnectionError:
+        except requests.exceptions.ConnectionError as connection_error:
-            return AuthenticationResponse(success=False, err_message="Unable to connect to remote server")
+            return AuthenticationResponse(success = False, err_message = f"Unable to connect to remote server: {connection_error}")
 
     def getAccessTokenUsingRefreshToken(self, refresh_token: str) -> "AuthenticationResponse":
         """Request the access token from the authorization server using a refresh token.

plugins/PostProcessingPlugin/scripts/PauseAtHeight.py

@@ -456,8 +456,8 @@ class PauseAtHeight(Script):
                         prepend_gcode += self.putValue(G = 1, E = -retraction_amount, F = 6000) + "\n"
 
                     #Move the head back
-                    prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
                     prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
+                    prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
                     if retraction_amount != 0:
                         prepend_gcode += self.putValue(G = 1, E = retraction_amount, F = 6000) + "\n"
 
@@ -491,7 +491,7 @@ class PauseAtHeight(Script):
 
                     # Move the head back
                     if current_z < 15:
-                        prepend_gcode += self.putValue(G = 1, Z = current_z + 1, F = 300) + "\n"
+                        prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
                     prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
                     prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + " ; move back down to resume height\n"
                     if retraction_amount != 0:

resources/qml/Preferences/Materials/MaterialsView.qml

@@ -39,14 +39,14 @@ TabView
         }
         if (!base.containerId || !base.editingEnabled || !base.currentMaterialNode)
         {
-            return ""
+            return "";
         }
         var linkedMaterials = Cura.ContainerManager.getLinkedMaterials(base.currentMaterialNode, true);
         if (linkedMaterials.length == 0)
         {
-            return ""
+            return "";
         }
-        return linkedMaterials;
+        return linkedMaterials.join(", ");
     }
 
     function getApproximateDiameter(diameter)

resources/qml/WelcomePages/WhatsNewContent.qml

@@ -4,6 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
+import QtGraphicalEffects 1.12 // For the DropShadow
 
 import UM 1.3 as UM
 import Cura 1.1 as Cura
@@ -91,6 +92,13 @@ Item
                         source: manager.getSubpageImageSource(index)
                     }
 
+                    DropShadow {
+                        anchors.fill: subpageImage
+                        radius: UM.Theme.getSize("monitor_shadow_radius").width
+                        color: UM.Theme.getColor("first_run_shadow")
+                        source: subpageImage
+                    }
+
                     Cura.ScrollableTextArea
                     {
                         id: subpageText

resources/themes/cura-light/icons/deprecated_icons.json

@@ -168,7 +168,7 @@
         "size": "default"
     },
     "pencil": {
-		"new_icon": "Pencil",
+        "new_icon": "Pen",
         "size": "default"
     },
     "printing_guideline": {