Merge branch '3.4'

cura/Settings/CuraContainerStack.py

@@ -39,8 +39,8 @@ from . import Exceptions
 #   This also means that operations on the stack that modifies the container ordering is prohibited and
 #   will raise an exception.
 class CuraContainerStack(ContainerStack):
-    def __init__(self, container_id: str, *args, **kwargs):
-        super().__init__(container_id, *args, **kwargs)
+    def __init__(self, container_id: str):
+        super().__init__(container_id)
 
         self._container_registry = ContainerRegistry.getInstance()
 

cura/Settings/CuraStackBuilder.py

@@ -98,8 +98,7 @@ class CuraStackBuilder:
                 position = position,
                 variant_container = extruder_variant_container,
                 material_container = material_container,
-                quality_container = application.empty_quality_container,
-                global_stack = new_global_stack,
+                quality_container = application.empty_quality_container
             )
             new_extruder.setNextStack(new_global_stack)
             new_global_stack.addExtruder(new_extruder)
@@ -138,7 +137,7 @@ class CuraStackBuilder:
     @classmethod
     def createExtruderStack(cls, new_stack_id: str, extruder_definition: DefinitionContainerInterface, machine_definition_id: str,
                             position: int,
-                            variant_container, material_container, quality_container, global_stack) -> ExtruderStack:
+                            variant_container, material_container, quality_container) -> ExtruderStack:
         from cura.CuraApplication import CuraApplication
         application = CuraApplication.getInstance()
         registry = application.getContainerRegistry()

cura/Settings/ExtruderStack.py

@@ -25,8 +25,8 @@ if TYPE_CHECKING:
 #
 #
 class ExtruderStack(CuraContainerStack):
-    def __init__(self, container_id: str, *args, **kwargs):
-        super().__init__(container_id, *args, **kwargs)
+    def __init__(self, container_id: str):
+        super().__init__(container_id)
 
         self.addMetaDataEntry("type", "extruder_train") # For backward compatibility
 

cura/Settings/GlobalStack.py

@@ -23,8 +23,8 @@ from .CuraContainerStack import CuraContainerStack
 ##  Represents the Global or Machine stack and its related containers.
 #
 class GlobalStack(CuraContainerStack):
-    def __init__(self, container_id: str, *args, **kwargs):
-        super().__init__(container_id, *args, **kwargs)
+    def __init__(self, container_id: str):
+        super().__init__(container_id)
 
         self.addMetaDataEntry("type", "machine")  # For backward compatibility