Merge remote-tracking branch 'upstream/master' into dagoma_bicolor

cura/API/Account.py

@@ -112,9 +112,6 @@ class Account(QObject):
         :param service_name: A unique name for your service, such as `plugins` or `backups`
         :param state: One of SyncState
         """
-
-        Logger.info("Service {service} enters sync state {state}", service = service_name, state = state)
-
         prev_state = self._sync_state
 
         self._sync_services[service_name] = state

cura/CuraApplication.py

@@ -886,8 +886,9 @@ class CuraApplication(QtApplication):
 
         # Initialize camera tool
         camera_tool = controller.getTool("CameraTool")
-        camera_tool.setOrigin(Vector(0, 100, 0))
-        camera_tool.setZoomRange(0.1, 2000)
+        if camera_tool:
+            camera_tool.setOrigin(Vector(0, 100, 0))
+            camera_tool.setZoomRange(0.1, 2000)
 
         # Initialize camera animations
         self._camera_animation = CameraAnimation.CameraAnimation()
@@ -1909,7 +1910,6 @@ class CuraApplication(QtApplication):
             return
         selection_pass = cast(SelectionPass, self.getRenderer().getRenderPass("selection"))
         if not selection_pass:  # If you right-click before the rendering has been initialised there might not be a selection pass yet.
-            print("--------------ding! Got the crash.")
             return
         node = self.getController().getScene().findObject(selection_pass.getIdAtPosition(x, y))
         if not node:

cura/Machines/Models/QualitySettingsModel.py

@@ -100,7 +100,8 @@ class QualitySettingsModel(ListModel):
         # the settings in that quality_changes_group.
         if quality_changes_group is not None:
             container_registry = ContainerRegistry.getInstance()
-            global_containers = container_registry.findContainers(id = quality_changes_group.metadata_for_global["id"])
+            metadata_for_global = quality_changes_group.metadata_for_global
+            global_containers = container_registry.findContainers(id = metadata_for_global["id"])
             global_container = None if len(global_containers) == 0 else global_containers[0]
             extruders_containers = {pos: container_registry.findContainers(id = quality_changes_group.metadata_per_extruder[pos]["id"]) for pos in quality_changes_group.metadata_per_extruder}
             extruders_container = {pos: None if not containers else containers[0] for pos, containers in extruders_containers.items()}

cura/OAuth2/AuthorizationRequestServer.py

@@ -2,6 +2,7 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from http.server import HTTPServer
+from socketserver import ThreadingMixIn
 from typing import Callable, Any, TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -9,7 +10,7 @@ if TYPE_CHECKING:
     from cura.OAuth2.AuthorizationHelpers import AuthorizationHelpers
 
 
-class AuthorizationRequestServer(HTTPServer):
+class AuthorizationRequestServer(ThreadingMixIn, HTTPServer):
     """The authorization request callback handler server.
 
     This subclass is needed to be able to pass some data to the request handler. This cannot be done on the request

cura/OAuth2/LocalAuthorizationServer.py

@@ -1,6 +1,6 @@
 # Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
-
+import sys
 import threading
 from typing import Any, Callable, Optional, TYPE_CHECKING
 
@@ -71,7 +71,7 @@ class LocalAuthorizationServer:
             self._web_server.setState(state)
 
             # Start the server on a new thread.
-            self._web_server_thread = threading.Thread(None, self._web_server.serve_forever, daemon = self._daemon)
+            self._web_server_thread = threading.Thread(None, self._serve_forever, daemon = self._daemon)
             self._web_server_thread.start()
 
     def stop(self) -> None:
@@ -81,9 +81,28 @@ class LocalAuthorizationServer:
 
         if self._web_server:
             try:
+                self._web_server.shutdown()
                 self._web_server.server_close()
             except OSError:
                 # OS error can happen if the socket was already closed. We really don't care about that case.
                 pass
         self._web_server = None
         self._web_server_thread = None
+
+    def _serve_forever(self) -> None:
+        """
+        If the platform is windows, this function calls the serve_forever function of the _web_server, catching any
+        OSErrors that may occur in the thread, thus making the reported message more log-friendly.
+        If it is any other platform, it just calls the serve_forever function immediately.
+
+        :return: None
+        """
+        if self._web_server:
+            if sys.platform == "win32":
+                try:
+                    self._web_server.serve_forever()
+                except OSError as e:
+                    Logger.warning(str(e))
+            else:
+                # Leave the default behavior in non-windows platforms
+                self._web_server.serve_forever()

cura/Scene/CuraSceneController.py

@@ -6,6 +6,7 @@ from PyQt5.QtWidgets import QApplication
 from UM.Scene.Camera import Camera
 from cura.UI.ObjectsModel import ObjectsModel
 from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel
+from cura.Scene.CuraSceneNode import CuraSceneNode
 
 from UM.Application import Application
 from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
@@ -43,6 +44,26 @@ class CuraSceneController(QObject):
         self._change_timer.start()
 
     def updateMaxBuildPlate(self, *args):
+        global_stack = Application.getInstance().getGlobalContainerStack()
+        if global_stack:
+            scene_has_support_meshes = self._sceneHasSupportMeshes()  # TODO: see if this can be cached
+
+            if scene_has_support_meshes != global_stack.getProperty("support_meshes_present", "value"):
+                # Adjust the setting without having the setting value in an InstanceContainer
+                setting_definitions = global_stack.definition.findDefinitions(key="support_meshes_present")
+                if setting_definitions:
+                    # Recreate the setting definition because the default_value is readonly
+                    definition_dict = setting_definitions[0].serialize_to_dict()
+                    definition_dict["enabled"] = False  # The enabled property has a value that would need to be evaluated
+                    definition_dict["default_value"] = scene_has_support_meshes
+                    relations = setting_definitions[0].relations  # Relations are wiped when deserializing from a dict
+                    setting_definitions[0].deserialize(definition_dict)
+
+                    # Restore relations and notify them that the setting has changed
+                    for relation in relations:
+                        setting_definitions[0].relations.append(relation)
+                        global_stack.propertyChanged.emit(relation.target.key, "enabled")
+
         max_build_plate = self._calcMaxBuildPlate()
         changed = False
         if max_build_plate != self._max_build_plate:
@@ -72,6 +93,15 @@ class CuraSceneController(QObject):
                 max_build_plate = max(build_plate_number, max_build_plate)
         return max_build_plate
 
+    def _sceneHasSupportMeshes(self):
+        root = Application.getInstance().getController().getScene().getRoot()
+        for node in root.getAllChildren():
+            if isinstance(node, CuraSceneNode):
+                per_mesh_stack = node.callDecoration("getStack")
+                if per_mesh_stack and per_mesh_stack.getProperty("support_mesh", "value"):
+                    return True
+        return False
+
     @pyqtSlot(int)
     def changeSelection(self, index):
         """Either select or deselect an item"""

cura/Scene/CuraSceneNode.py

@@ -38,6 +38,12 @@ class CuraSceneNode(SceneNode):
     def isSelectable(self) -> bool:
         return super().isSelectable() and self.callDecoration("getBuildPlateNumber") == cura.CuraApplication.CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate
 
+    def isSupportMesh(self) -> bool:
+        per_mesh_stack = self.callDecoration("getStack")
+        if not per_mesh_stack:
+            return False
+        return per_mesh_stack.getProperty("support_mesh", "value")
+
     def getPrintingExtruder(self) -> Optional[ExtruderStack]:
         """Get the extruder used to print this node. If there is no active node, then the extruder in position zero is returned
 

cura/Settings/ExtruderManager.py

@@ -302,6 +302,7 @@ class ExtruderManager(QObject):
 
         for extruder in self.getMachineExtruders(machine_id):
             ContainerRegistry.getInstance().removeContainer(extruder.userChanges.getId())
+            ContainerRegistry.getInstance().removeContainer(extruder.definitionChanges.getId())
             ContainerRegistry.getInstance().removeContainer(extruder.getId())
         if machine_id in self._extruder_trains:
             del self._extruder_trains[machine_id]

cura/Settings/MachineManager.py

@@ -488,7 +488,11 @@ class MachineManager(QObject):
 
     @pyqtProperty(bool, notify = printerConnectedStatusChanged)
     def activeMachineIsGroup(self) -> bool:
-        return bool(self._printer_output_devices) and len(self._printer_output_devices[0].printers) > 1
+        if self.activeMachine is None:
+            return False
+
+        group_size = int(self.activeMachine.getMetaDataEntry("group_size", "-1"))
+        return group_size > 1
 
     @pyqtProperty(bool, notify = printerConnectedStatusChanged)
     def activeMachineHasNetworkConnection(self) -> bool:
@@ -720,6 +724,8 @@ class MachineManager(QObject):
         containers = CuraContainerRegistry.getInstance().findInstanceContainersMetadata(type = "user", machine = machine_id)
         for container in containers:
             CuraContainerRegistry.getInstance().removeContainer(container["id"])
+        machine_stack = CuraContainerRegistry.getInstance().findContainerStacks(type = "machine", name = machine_id)[0]
+        CuraContainerRegistry.getInstance().removeContainer(machine_stack.definitionChanges.getId())
         CuraContainerRegistry.getInstance().removeContainer(machine_id)
 
         # If the printer that is being removed is a network printer, the hidden printers have to be also removed

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -466,10 +466,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                 extruder_info.intent_info = instance_container_info_dict[intent_id]
 
             if not machine_conflict and containers_found_dict["machine"]:
-                if position not in global_stack.extruders:
+                if int(position) >= len(global_stack.extrurderList):
                     continue
 
-                existing_extruder_stack = global_stack.extruders[position]
+                existing_extruder_stack = global_stack.extruderList[int(position)]
                 # check if there are any changes at all in any of the container stacks.
                 id_list = self._getContainerIdListFromSerialized(serialized)
                 for index, container_id in enumerate(id_list):

plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from UM.Application import Application
@@ -114,7 +114,7 @@ class FirmwareUpdateCheckerJob(Job):
                 # notify the user when no new firmware version is available.
                 if (checked_version != "") and (checked_version != current_version):
                     Logger.log("i", "Showing firmware update message for new version: {version}".format(version = current_version))
-                    message = FirmwareUpdateCheckerMessage(machine_id, self._machine_name,
+                    message = FirmwareUpdateCheckerMessage(machine_id, self._machine_name, current_version,
                                                            self._lookups.getRedirectUserUrl())
                     message.actionTriggered.connect(self._callback)
                     message.show()

plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from UM.i18n import i18nCatalog
@@ -11,11 +11,12 @@ i18n_catalog = i18nCatalog("cura")
 class FirmwareUpdateCheckerMessage(Message):
     STR_ACTION_DOWNLOAD = "download"
 
-    def __init__(self, machine_id: int, machine_name: str, download_url: str) -> None:
+    def __init__(self, machine_id: int, machine_name: str, latest_version: str, download_url: str) -> None:
         super().__init__(i18n_catalog.i18nc(
             "@info Don't translate {machine_name}, since it gets replaced by a printer name!",
-            "New features are available for your {machine_name}! It is recommended to update the firmware on your printer.").format(
-            machine_name = machine_name),
+            "New features or bug-fixes may be available for your {machine_name}! If not already at the latest version, "
+            "it is recommended to update the firmware on your printer to version {latest_version}.").format(
+            machine_name = machine_name, latest_version = latest_version),
             title = i18n_catalog.i18nc(
                 "@info:title The %s gets replaced with the printer name.",
                 "New %s firmware available") % machine_name)

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -32,10 +32,7 @@ Item
         var type = currentMeshType
 
         // set checked state of mesh type buttons
-        normalButton.checked = type === normalMeshType
-        supportMeshButton.checked = type === supportMeshType
-        overhangMeshButton.checked = type === infillMeshType || type === cuttingMeshType
-        antiOverhangMeshButton.checked = type === antiOverhangMeshType
+        updateMeshTypeCheckedState(type)
 
         // update active type label
         for (var button in meshTypeButtons.children)
@@ -49,9 +46,19 @@ Item
         visibility_handler.addSkipResetSetting(currentMeshType)
     }
 
+    function updateMeshTypeCheckedState(type)
+    {
+        // set checked state of mesh type buttons
+        normalButton.checked = type === normalMeshType
+        supportMeshButton.checked = type === supportMeshType
+        overlapMeshButton.checked = type === infillMeshType || type === cuttingMeshType
+        antiOverhangMeshButton.checked = type === antiOverhangMeshType
+    }
+
     function setMeshType(type)
     {
         UM.ActiveTool.setProperty("MeshType", type)
+        updateMeshTypeCheckedState(type)
     }
 
     UM.I18nCatalog { id: catalog; name: "cura"}
@@ -95,7 +102,7 @@ Item
 
             Button
             {
-                id: overhangMeshButton
+                id: overlapMeshButton
                 text: catalog.i18nc("@label", "Modify settings for overlaps")
                 iconSource: UM.Theme.getIcon("pos_modify_overlaps");
                 property bool needBorder: true

plugins/PostProcessingPlugin/scripts/Stretch.py

@@ -289,6 +289,13 @@ class Stretcher:
                 self.layergcode = self.layergcode + sout + "\n"
                 ipos = ipos + 1
             else:
+                # The command is intended to be passed through unmodified via
+                # the comment field. In the case of an extruder only move, though,
+                # the extruder and potentially the feed rate are modified.
+                # We need to update self.outpos accordingly so that subsequent calls
+                # to stepToGcode() knows about the extruder and feed rate change.
+                self.outpos.step_e = layer_steps[i].step_e
+                self.outpos.step_f = layer_steps[i].step_f
                 self.layergcode = self.layergcode + layer_steps[i].comment + "\n"
 
     def workOnSequence(self, orig_seq, modif_seq):

plugins/SliceInfoPlugin/SliceInfo.py

@@ -101,7 +101,7 @@ class SliceInfo(QObject, Extension):
 
         user_modified_setting_keys = set()  # type: Set[str]
 
-        for stack in [global_stack] + list(global_stack.extruders.values()):
+        for stack in [global_stack] + global_stack.extruderList:
             # Get all settings in user_changes and quality_changes
             all_keys = stack.userChanges.getAllKeys() | stack.qualityChanges.getAllKeys()
             user_modified_setting_keys |= all_keys
@@ -152,7 +152,7 @@ class SliceInfo(QObject, Extension):
 
             # add extruder specific data to slice info
             data["extruders"] = []
-            extruders = list(global_stack.extruders.values())
+            extruders = global_stack.extruderList
             extruders = sorted(extruders, key = lambda extruder: extruder.getMetaDataEntry("position"))
 
             for extruder in extruders:

plugins/Toolbox/src/CloudSync/CloudPackageChecker.py

@@ -62,7 +62,6 @@ class CloudPackageChecker(QObject):
 
     def _getUserSubscribedPackages(self) -> None:
         self._application.getCuraAPI().account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.SYNCING)
-        Logger.debug("Requesting subscribed packages metadata from server.")
         url = CloudApiModel.api_url_user_packages
         self._application.getHttpRequestManager().get(url,
                                                       callback = self._onUserPackagesRequestFinished,

plugins/UFPWriter/UFPWriter.py

@@ -97,7 +97,7 @@ class UFPWriter(MeshWriter):
             Logger.log("w", "The material extension: %s was already added", material_extension)
 
         added_materials = []
-        for extruder_stack in global_stack.extruders.values():
+        for extruder_stack in global_stack.extruderList:
             material = extruder_stack.material
             try:
                 material_file_name = material.getMetaData()["base_file"] + ".xml.fdm_material"

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -74,7 +74,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
             b"name": cluster.friendly_name.encode() if cluster.friendly_name else b"",
             b"firmware_version": cluster.host_version.encode() if cluster.host_version else b"",
             b"printer_type": cluster.printer_type.encode() if cluster.printer_type else b"",
-            b"cluster_size": b"1"  # cloud devices are always clusters of at least one
+            b"cluster_size": str(cluster.printer_count).encode() if cluster.printer_count else b"1"
         }
 
         super().__init__(

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py

@@ -91,8 +91,6 @@ class CloudOutputDeviceManager:
         if self._syncing:
             return
 
-        Logger.info("Syncing cloud printer clusters")
-
         self._syncing = True
         self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.SYNCING)
         self._api.getClusters(self._onGetRemoteClustersFinished, self._onGetRemoteClusterFailed)
@@ -165,7 +163,11 @@ class CloudOutputDeviceManager:
                 self._connectToActiveMachine()
             return
 
-        new_devices.sort(key = lambda x: x.name.lower())
+        # Sort new_devices on online status first, alphabetical second.
+        # Since the first device might be activated in case there is no active printer yet,
+        # it would be nice to prioritize online devices
+        online_cluster_names = {c.friendly_name.lower() for c in clusters if c.is_online and not c.friendly_name is None}
+        new_devices.sort(key = lambda x: ("a{}" if x.name.lower() in online_cluster_names else "b{}").format(x.name.lower()))
 
         image_path = os.path.join(
             CuraApplication.getInstance().getPluginRegistry().getPluginPath("UM3NetworkPrinting") or "",
@@ -270,6 +272,7 @@ class CloudOutputDeviceManager:
         machine.setName(device.name)
         machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key)
         machine.setMetaDataEntry("group_name", device.name)
+        machine.setMetaDataEntry("group_size", device.clusterSize)
         machine.setMetaDataEntry("removal_warning", self.I18N_CATALOG.i18nc(
             "@label ({} is printer name)",
             "{} will be removed until the next account sync. <br> To remove {} permanently, "

plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py

@@ -20,9 +20,6 @@ class ToolPathUploader:
     # The HTTP codes that should trigger a retry.
     RETRY_HTTP_CODES = {500, 502, 503, 504}
 
-    # The amount of bytes to send per request
-    BYTES_PER_REQUEST = 256 * 1024
-
     def __init__(self, http: HttpRequestManager, print_job: CloudPrintJobResponse, data: bytes,
                  on_finished: Callable[[], Any], on_progress: Callable[[int], Any], on_error: Callable[[], Any]
                  ) -> None:
@@ -44,7 +41,6 @@ class ToolPathUploader:
         self._on_progress = on_progress
         self._on_error = on_error
 
-        self._sent_bytes = 0
         self._retries = 0
         self._finished = False
 
@@ -54,50 +50,34 @@ class ToolPathUploader:
 
         return self._print_job
 
-    def _chunkRange(self) -> Tuple[int, int]:
-        """Determines the bytes that should be uploaded next.
-
-        :return: A tuple with the first and the last byte to upload.
-        """
-        last_byte = min(len(self._data), self._sent_bytes + self.BYTES_PER_REQUEST)
-        return self._sent_bytes, last_byte
-
     def start(self) -> None:
         """Starts uploading the mesh."""
 
         if self._finished:
             # reset state.
-            self._sent_bytes = 0
             self._retries = 0
             self._finished = False
-        self._uploadChunk()
+        self._upload()
 
     def stop(self):
         """Stops uploading the mesh, marking it as finished."""
 
-        Logger.log("i", "Stopped uploading")
-        self._finished = True
-
-    def _uploadChunk(self) -> None:
-        """Uploads a chunk of the mesh to the cloud."""
+        Logger.log("i", "Finished uploading")
+        self._finished = True  # Signal to any ongoing retries that we should stop retrying.
+        self._on_finished()
 
+    def _upload(self) -> None:
+        """
+        Uploads the print job to the cloud printer.
+        """
         if self._finished:
             raise ValueError("The upload is already finished")
 
-        first_byte, last_byte = self._chunkRange()
-        content_range = "bytes {}-{}/{}".format(first_byte, last_byte - 1, len(self._data))
-
-        headers = {
-            "Content-Type": cast(str, self._print_job.content_type),
-            "Content-Range": content_range
-        }  # type: Dict[str, str]
-
-        Logger.log("i", "Uploading %s to %s", content_range, self._print_job.upload_url)
-
+        Logger.log("i", "Uploading print to {upload_url}".format(upload_url = self._print_job.upload_url))
         self._http.put(
             url = cast(str, self._print_job.upload_url),
-            headers_dict = headers,
-            data = self._data[first_byte:last_byte],
+            headers_dict = {"Content-Type": cast(str, self._print_job.content_type)},
+            data = self._data,
             callback = self._finishedCallback,
             error_callback = self._errorCallback,
             upload_progress_callback = self._progressCallback
@@ -109,10 +89,9 @@ class ToolPathUploader:
         :param bytes_sent: The amount of bytes sent in the current request.
         :param bytes_total: The amount of bytes to send in the current request.
         """
-        Logger.log("i", "Progress callback %s / %s", bytes_sent, bytes_total)
+        Logger.debug("Cloud upload progress %s / %s", bytes_sent, bytes_total)
         if bytes_total:
-            total_sent = self._sent_bytes + bytes_sent
-            self._on_progress(int(total_sent / len(self._data) * 100))
+            self._on_progress(int(bytes_sent / len(self._data) * 100))
 
     ## Handles an error uploading.
     def _errorCallback(self, reply: QNetworkReply, error: QNetworkReply.NetworkError) -> None:
@@ -136,7 +115,7 @@ class ToolPathUploader:
             self._retries += 1
             Logger.log("i", "Retrying %s/%s request %s", self._retries, self.MAX_RETRIES, reply.url().toString())
             try:
-                self._uploadChunk()
+                self._upload()
             except ValueError:  # Asynchronously it could have completed in the meanwhile.
                 pass
             return
@@ -148,16 +127,5 @@ class ToolPathUploader:
 
         Logger.log("d", "status_code: %s, Headers: %s, body: %s", status_code,
                    [bytes(header).decode() for header in reply.rawHeaderList()], bytes(reply.readAll()).decode())
-        self._chunkUploaded()
 
-    def _chunkUploaded(self) -> None:
-        """Handles a chunk of data being uploaded, starting the next chunk if needed."""
-
-        # We got a successful response. Let's start the next chunk or report the upload is finished.
-        first_byte, last_byte = self._chunkRange()
-        self._sent_bytes += last_byte - first_byte
-        if self._sent_bytes >= len(self._data):
-            self.stop()
-            self._on_finished()
-        else:
-            self._uploadChunk()
+        self.stop()

plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterResponse.py

@@ -11,7 +11,7 @@ class CloudClusterResponse(BaseModel):
 
     def __init__(self, cluster_id: str, host_guid: str, host_name: str, is_online: bool, status: str,
                  host_internal_ip: Optional[str] = None, host_version: Optional[str] = None,
-                 friendly_name: Optional[str] = None, printer_type: str = "ultimaker3", **kwargs) -> None:
+                 friendly_name: Optional[str] = None, printer_type: str = "ultimaker3", printer_count: int = 1, **kwargs) -> None:
         """Creates a new cluster response object.
 
         :param cluster_id: The secret unique ID, e.g. 'kBEeZWEifXbrXviO8mRYLx45P8k5lHVGs43XKvRniPg='.
@@ -23,6 +23,7 @@ class CloudClusterResponse(BaseModel):
         :param host_internal_ip: The internal IP address of the host printer.
         :param friendly_name: The human readable name of the host printer.
         :param printer_type: The machine type of the host printer.
+        :param printer_count: The amount of printers in the print cluster. 1 for a single printer
         """
 
         self.cluster_id = cluster_id
@@ -34,6 +35,7 @@ class CloudClusterResponse(BaseModel):
         self.host_internal_ip = host_internal_ip
         self.friendly_name = friendly_name
         self.printer_type = printer_type
+        self.printer_count = printer_count
         super().__init__(**kwargs)
 
     # Validates the model, raising an exception if the model is invalid.

plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py

@@ -125,9 +125,6 @@ class ClusterPrintJobStatus(BaseModel):
         model.updateOwner(self.owner)
         model.updateState(self.status)
         model.setCompatibleMachineFamilies(self.compatible_machine_families)
-        model.updateTimeTotal(self.time_total)
-        model.updateTimeElapsed(self.time_elapsed)
-        model.updateOwner(self.owner)
 
         status_set_by_impediment = False
         for impediment in self.impediments_to_printing:

plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py

@@ -21,6 +21,15 @@ def getMetaData() -> Dict[str, Any]:
             ("quality_changes", 4000011):    ("quality_changes", 4000013,    upgrade.upgradeInstanceContainer),
             ("quality", 4000011):            ("quality", 4000013,            upgrade.upgradeInstanceContainer),
             ("user", 4000011):               ("user", 4000013,               upgrade.upgradeInstanceContainer),
+
+            # Setting version 12 was also used during the 4.6 beta, but had no changes.
+            ("preferences", 6000012):        ("preferences", 6000013,        upgrade.upgradePreferences),
+            ("machine_stack", 4000012):      ("machine_stack", 4000013,      upgrade.upgradeStack),
+            ("extruder_train", 4000012):     ("extruder_train", 4000013,     upgrade.upgradeStack),
+            ("definition_changes", 4000012): ("definition_changes", 4000013, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000012):    ("quality_changes", 4000013,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000012):            ("quality", 4000013,            upgrade.upgradeInstanceContainer),
+            ("user", 4000012):               ("user", 4000013,               upgrade.upgradeInstanceContainer),
         },
         "sources": {
             "preferences": {

plugins/VersionUpgrade/VersionUpgrade46bto46/VersionUpgrade46bto46.py

@@ -1,86 +0,0 @@
-# Copyright (c) 2020 Ultimaker B.V.
-# Cura is released under the terms of the LGPLv3 or higher.
-
-import configparser
-from typing import Tuple, List
-import io
-from UM.VersionUpgrade import VersionUpgrade
-
-class VersionUpgrade46bto46(VersionUpgrade):
-    def getCfgVersion(self, serialised: str) -> int:
-        parser = configparser.ConfigParser(interpolation = None)
-        parser.read_string(serialised)
-        format_version = int(parser.get("general", "version"))  # Explicitly give an exception when this fails. That means that the file format is not recognised.
-        setting_version = int(parser.get("metadata", "setting_version", fallback = "0"))
-        return format_version * 1000000 + setting_version
-
-    def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
-        """
-        Upgrades preferences to have the new version number.
-        :param serialized: The original contents of the preferences file.
-        :param filename: The file name of the preferences file.
-        :return: A list of new file names, and a list of the new contents for
-        those files.
-        """
-        parser = configparser.ConfigParser(interpolation = None)
-        parser.read_string(serialized)
-
-        # Update version number.
-        parser["metadata"]["setting_version"] = "13"
-
-        result = io.StringIO()
-        parser.write(result)
-        return [filename], [result.getvalue()]
-
-    def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
-        """
-        Upgrades instance containers to have the new version number.
-
-        This changes the maximum deviation setting if that setting was present
-        in the profile.
-        :param serialized: The original contents of the instance container.
-        :param filename: The original file name of the instance container.
-        :return: A list of new file names, and a list of the new contents for
-        those files.
-        """
-        parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ())
-        parser.read_string(serialized)
-
-        # Update version number.
-        parser["metadata"]["setting_version"] = "13"
-
-        if "values" in parser:
-            # Maximum Deviation's effect was corrected. Previously the deviation
-            # ended up being only half of what the user had entered. This was
-            # fixed in Cura 4.7 so there we need to halve the deviation that the
-            # user had entered.
-            if "meshfix_maximum_deviation" in parser["values"]:
-                maximum_deviation = parser["values"]["meshfix_maximum_deviation"]
-                if maximum_deviation.startswith("="):
-                    maximum_deviation = maximum_deviation[1:]
-                maximum_deviation = "=(" + maximum_deviation + ") / 2"
-                parser["values"]["meshfix_maximum_deviation"] = maximum_deviation
-
-        result = io.StringIO()
-        parser.write(result)
-        return [filename], [result.getvalue()]
-
-    def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
-        """
-        Upgrades stacks to have the new version number.
-        :param serialized: The original contents of the stack.
-        :param filename: The original file name of the stack.
-        :return: A list of new file names, and a list of the new contents for
-        those files.
-        """
-        parser = configparser.ConfigParser(interpolation = None)
-        parser.read_string(serialized)
-
-        # Update version number.
-        if "metadata" not in parser:
-            parser["metadata"] = {}
-        parser["metadata"]["setting_version"] = "13"
-
-        result = io.StringIO()
-        parser.write(result)
-        return [filename], [result.getvalue()]

plugins/VersionUpgrade/VersionUpgrade46bto46/__init__.py

@@ -1,59 +0,0 @@
-# Copyright (c) 2020 Ultimaker B.V.
-# Cura is released under the terms of the LGPLv3 or higher.
-
-from typing import Any, Dict, TYPE_CHECKING
-
-from . import VersionUpgrade46bto46
-
-if TYPE_CHECKING:
-    from UM.Application import Application
-
-upgrade = VersionUpgrade46bto46.VersionUpgrade46bto46()
-
-def getMetaData() -> Dict[str, Any]:
-    return {
-        "version_upgrade": {
-            # From                           To                              Upgrade function
-            ("preferences", 6000012):        ("preferences", 6000013,        upgrade.upgradePreferences),
-            ("machine_stack", 4000012):      ("machine_stack", 4000013,      upgrade.upgradeStack),
-            ("extruder_train", 4000012):     ("extruder_train", 4000013,     upgrade.upgradeStack),
-            ("definition_changes", 4000012): ("definition_changes", 4000013, upgrade.upgradeInstanceContainer),
-            ("quality_changes", 4000012):    ("quality_changes", 4000013,    upgrade.upgradeInstanceContainer),
-            ("quality", 4000012):            ("quality", 4000013,            upgrade.upgradeInstanceContainer),
-            ("user", 4000012):               ("user", 4000013,               upgrade.upgradeInstanceContainer),
-        },
-        "sources": {
-            "preferences": {
-                "get_version": upgrade.getCfgVersion,
-                "location": {"."}
-            },
-            "machine_stack": {
-                "get_version": upgrade.getCfgVersion,
-                "location": {"./machine_instances"}
-            },
-            "extruder_train": {
-                "get_version": upgrade.getCfgVersion,
-                "location": {"./extruders"}
-            },
-            "definition_changes": {
-                "get_version": upgrade.getCfgVersion,
-                "location": {"./definition_changes"}
-            },
-            "quality_changes": {
-                "get_version": upgrade.getCfgVersion,
-                "location": {"./quality_changes"}
-            },
-            "quality": {
-                "get_version": upgrade.getCfgVersion,
-                "location": {"./quality"}
-            },
-            "user": {
-                "get_version": upgrade.getCfgVersion,
-                "location": {"./user"}
-            }
-        }
-    }
-
-
-def register(app: "Application") -> Dict[str, Any]:
-    return {"version_upgrade": upgrade}

plugins/VersionUpgrade/VersionUpgrade46bto46/plugin.json

@@ -1,8 +0,0 @@
-{
-    "name": "Version Upgrade 4.6-beta to 4.6.0",
-    "author": "Ultimaker B.V.",
-    "version": "1.0.0",
-    "description": "Upgrades configurations from Cura 4.6-BETA to Cura 4.6.",
-    "api": "7.2.0",
-    "i18n-catalog": "cura"
-}

resources/definitions/fdmprinter.def.json

@@ -219,6 +219,16 @@
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false
                 },
+                "machine_always_write_active_tool":
+                {
+                    "label": "Always Write Active Tool",
+                    "description": "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands.",
+                    "default_value": false,
+                    "type": "bool",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": false
+                },
                 "machine_center_is_zero":
                 {
                     "label": "Is Center Origin",
@@ -877,7 +887,7 @@
                             "maximum_value_warning": "3 * machine_nozzle_size",
                             "default_value": 0.4,
                             "type": "float",
-                            "enabled": "(support_enable or support_tree_enable)",
+                            "enabled": "(support_enable or support_tree_enable or support_meshes_present)",
                             "value": "line_width",
                             "limit_to_extruder": "support_infill_extruder_nr",
                             "settable_per_mesh": false,
@@ -893,7 +903,7 @@
                             "minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
                             "maximum_value_warning": "2 * machine_nozzle_size",
                             "type": "float",
-                            "enabled": "(support_enable or support_tree_enable) and support_interface_enable",
+                            "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_interface_enable",
                             "limit_to_extruder": "support_interface_extruder_nr",
                             "value": "line_width",
                             "settable_per_mesh": false,
@@ -910,7 +920,7 @@
                                     "minimum_value_warning": "0.4 * machine_nozzle_size",
                                     "maximum_value_warning": "2 * machine_nozzle_size",
                                     "type": "float",
-                                    "enabled": "(support_enable or support_tree_enable) and support_roof_enable",
+                                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_roof_enable",
                                     "limit_to_extruder": "support_roof_extruder_nr",
                                     "value": "extruderValue(support_roof_extruder_nr, 'support_interface_line_width')",
                                     "settable_per_mesh": false,
@@ -926,7 +936,7 @@
                                     "minimum_value_warning": "0.4 * machine_nozzle_size",
                                     "maximum_value_warning": "2 * machine_nozzle_size",
                                     "type": "float",
-                                    "enabled": "(support_enable or support_tree_enable) and support_bottom_enable",
+                                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_bottom_enable",
                                     "limit_to_extruder": "support_bottom_extruder_nr",
                                     "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_line_width')",
                                     "settable_per_mesh": false,
@@ -2836,7 +2846,7 @@
                             "maximum_value_warning": "150",
                             "default_value": 60,
                             "value": "speed_print",
-                            "enabled": "support_enable or support_tree_enable",
+                            "enabled": "support_enable or support_tree_enable or support_meshes_present",
                             "settable_per_mesh": false,
                             "limit_to_extruder": "support_extruder_nr",
                             "settable_per_extruder": true,
@@ -2853,7 +2863,7 @@
                                     "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
                                     "value": "speed_support",
-                                    "enabled": "support_enable or support_tree_enable",
+                                    "enabled": "support_enable or support_tree_enable or support_meshes_present",
                                     "limit_to_extruder": "support_infill_extruder_nr",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
@@ -2868,7 +2878,7 @@
                                     "minimum_value": "0.1",
                                     "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
-                                    "enabled": "support_interface_enable and (support_enable or support_tree_enable)",
+                                    "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                     "limit_to_extruder": "support_interface_extruder_nr",
                                     "value": "speed_support / 1.5",
                                     "settable_per_mesh": false,
@@ -2885,7 +2895,7 @@
                                             "minimum_value": "0.1",
                                             "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                             "maximum_value_warning": "150",
-                                            "enabled": "support_roof_enable and (support_enable or support_tree_enable)",
+                                            "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                             "limit_to_extruder": "support_roof_extruder_nr",
                                             "value": "extruderValue(support_roof_extruder_nr, 'speed_support_interface')",
                                             "settable_per_mesh": false,
@@ -2901,7 +2911,7 @@
                                             "minimum_value": "0.1",
                                             "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                             "maximum_value_warning": "150",
-                                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
+                                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                             "limit_to_extruder": "support_bottom_extruder_nr",
                                             "value": "extruderValue(support_bottom_extruder_nr, 'speed_support_interface')",
                                             "settable_per_mesh": false,
@@ -3176,7 +3186,7 @@
                             "maximum_value_warning": "10000",
                             "default_value": 3000,
                             "value": "acceleration_print",
-                            "enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable)",
+                            "enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": false,
                             "limit_to_extruder": "support_extruder_nr",
                             "settable_per_extruder": true,
@@ -3193,7 +3203,7 @@
                                     "minimum_value": "0.1",
                                     "minimum_value_warning": "100",
                                     "maximum_value_warning": "10000",
-                                    "enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable)",
+                                    "enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable or support_meshes_present)",
                                     "limit_to_extruder": "support_infill_extruder_nr",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
@@ -3209,7 +3219,7 @@
                                     "minimum_value": "0.1",
                                     "minimum_value_warning": "100",
                                     "maximum_value_warning": "10000",
-                                    "enabled": "resolveOrValue('acceleration_enabled') and support_interface_enable and (support_enable or support_tree_enable)",
+                                    "enabled": "resolveOrValue('acceleration_enabled') and support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                     "limit_to_extruder": "support_interface_extruder_nr",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true,
@@ -3226,7 +3236,7 @@
                                             "minimum_value": "0.1",
                                             "minimum_value_warning": "100",
                                             "maximum_value_warning": "10000",
-                                            "enabled": "acceleration_enabled and support_roof_enable and (support_enable or support_tree_enable)",
+                                            "enabled": "acceleration_enabled and support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                             "limit_to_extruder": "support_roof_extruder_nr",
                                             "settable_per_mesh": false,
                                             "settable_per_extruder": true
@@ -3242,7 +3252,7 @@
                                             "minimum_value": "0.1",
                                             "minimum_value_warning": "100",
                                             "maximum_value_warning": "10000",
-                                            "enabled": "acceleration_enabled and support_bottom_enable and (support_enable or support_tree_enable)",
+                                            "enabled": "acceleration_enabled and support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                             "limit_to_extruder": "support_bottom_extruder_nr",
                                             "settable_per_mesh": false,
                                             "settable_per_extruder": true
@@ -3461,7 +3471,7 @@
                             "maximum_value_warning": "50",
                             "default_value": 20,
                             "value": "jerk_print",
-                            "enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable)",
+                            "enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
                             "limit_to_extruder": "support_extruder_nr",
@@ -3477,7 +3487,7 @@
                                     "value": "jerk_support",
                                     "minimum_value": "0",
                                     "maximum_value_warning": "50",
-                                    "enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable)",
+                                    "enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable or support_meshes_present)",
                                     "limit_to_extruder": "support_infill_extruder_nr",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
@@ -3492,7 +3502,7 @@
                                     "value": "jerk_support",
                                     "minimum_value": "0",
                                     "maximum_value_warning": "50",
-                                    "enabled": "resolveOrValue('jerk_enabled') and support_interface_enable and (support_enable or support_tree_enable)",
+                                    "enabled": "resolveOrValue('jerk_enabled') and support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                     "limit_to_extruder": "support_interface_extruder_nr",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true,
@@ -3508,7 +3518,7 @@
                                             "value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')",
                                             "minimum_value": "0",
                                             "maximum_value_warning": "50",
-                                            "enabled": "resolveOrValue('jerk_enabled') and support_roof_enable and (support_enable or support_tree_enable)",
+                                            "enabled": "resolveOrValue('jerk_enabled') and support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                             "limit_to_extruder": "support_roof_extruder_nr",
                                             "settable_per_mesh": false,
                                             "settable_per_extruder": true
@@ -3523,7 +3533,7 @@
                                             "value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')",
                                             "minimum_value": "0",
                                             "maximum_value_warning": "50",
-                                            "enabled": "resolveOrValue('jerk_enabled') and support_bottom_enable and (support_enable or support_tree_enable)",
+                                            "enabled": "resolveOrValue('jerk_enabled') and support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                             "limit_to_extruder": "support_bottom_extruder_nr",
                                             "settable_per_mesh": false,
                                             "settable_per_extruder": true
@@ -3767,7 +3777,7 @@
                     "description": "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure.",
                     "type": "bool",
                     "default_value": true,
-                    "enabled": "retraction_enable and (support_enable or support_tree_enable)",
+                    "enabled": "retraction_enable and (support_enable or support_tree_enable or support_meshes_present)",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
@@ -4097,7 +4107,7 @@
                     "type": "extruder",
                     "default_value": "0",
                     "value": "int(defaultExtruderPosition())",
-                    "enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false,
                     "children": {
@@ -4108,7 +4118,7 @@
                             "type": "extruder",
                             "default_value": "0",
                             "value": "support_extruder_nr",
-                            "enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
+                            "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
                             "settable_per_mesh": false,
                             "settable_per_extruder": false
                         },
@@ -4119,7 +4129,7 @@
                             "type": "extruder",
                             "default_value": "0",
                             "value": "support_extruder_nr",
-                            "enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
+                            "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
                             "settable_per_mesh": false,
                             "settable_per_extruder": false
                         },
@@ -4130,7 +4140,7 @@
                             "type": "extruder",
                             "default_value": "0",
                             "value": "support_extruder_nr",
-                            "enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
+                            "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
                             "settable_per_mesh": false,
                             "settable_per_extruder": false,
                             "children":
@@ -4142,7 +4152,7 @@
                                     "type": "extruder",
                                     "default_value": "0",
                                     "value": "support_interface_extruder_nr",
-                                    "enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
+                                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": false
                                 },
@@ -4153,7 +4163,7 @@
                                     "type": "extruder",
                                     "default_value": "0",
                                     "value": "support_interface_extruder_nr",
-                                    "enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
+                                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": false
                                 }
@@ -4207,7 +4217,7 @@
                         "gyroid": "Gyroid"
                     },
                     "default_value": "zigzag",
-                    "enabled": "support_enable or support_tree_enable",
+                    "enabled": "support_enable or support_tree_enable or support_meshes_present",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -4222,7 +4232,7 @@
                     "maximum_value_warning": "0 if (support_skip_some_zags and support_pattern == 'zigzag') else 3",
                     "type": "int",
                     "value": "1 if support_tree_enable else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)",
-                    "enabled": "support_enable or support_tree_enable",
+                    "enabled": "support_enable or support_tree_enable or support_meshes_present",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -4234,7 +4244,7 @@
                     "type": "bool",
                     "default_value": false,
                     "value": "support_pattern == 'cross' or support_pattern == 'gyroid'",
-                    "enabled": "(support_enable or support_tree_enable) and (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -4245,7 +4255,7 @@
                     "description": "Connect the ZigZags. This will increase the strength of the zig zag support structure.",
                     "type": "bool",
                     "default_value": true,
-                    "enabled": "(support_enable or support_tree_enable) and support_pattern == 'zigzag'",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_pattern == 'zigzag'",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -4260,7 +4270,7 @@
                     "maximum_value_warning": "100",
                     "default_value": 15,
                     "value": "15 if support_enable else 0 if support_tree_enable else 15",
-                    "enabled": "support_enable or support_tree_enable",
+                    "enabled": "support_enable or support_tree_enable or support_meshes_present",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
@@ -4275,7 +4285,7 @@
                             "minimum_value": "0",
                             "minimum_value_warning": "support_line_width",
                             "default_value": 2.66,
-                            "enabled": "support_enable or support_tree_enable",
+                            "enabled": "support_enable or support_tree_enable or support_meshes_present",
                             "value": "0 if support_infill_rate == 0 else (support_line_width * 100) / support_infill_rate * (2 if support_pattern == 'grid' else (3 if support_pattern == 'triangles' else 1))",
                             "limit_to_extruder": "support_infill_extruder_nr",
                             "settable_per_mesh": false,
@@ -4290,7 +4300,7 @@
                             "minimum_value": "0",
                             "minimum_value_warning": "support_line_width",
                             "default_value": 2.66,
-                            "enabled": "support_enable or support_tree_enable",
+                            "enabled": "support_enable or support_tree_enable or support_meshes_present",
                             "value": "support_line_distance",
                             "limit_to_extruder": "support_infill_extruder_nr",
                             "settable_per_mesh": false,
@@ -4304,7 +4314,7 @@
                     "description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees.",
                     "type": "[int]",
                     "default_value": "[ ]",
-                    "enabled": "(support_enable or support_tree_enable) and support_pattern != 'concentric' and support_infill_rate > 0",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_pattern != 'concentric' and support_infill_rate > 0",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -4315,7 +4325,7 @@
                     "description": "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate.",
                     "type": "bool",
                     "default_value": false,
-                    "enabled": "support_enable or support_tree_enable",
+                    "enabled": "support_enable or support_tree_enable or support_meshes_present",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -4329,7 +4339,7 @@
                     "default_value": 8.0,
                     "minimum_value": "0.0",
                     "maximum_value_warning": "50.0",
-                    "enabled": "(support_enable or support_tree_enable) and support_brim_enable",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_brim_enable",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "limit_to_extruder": "support_infill_extruder_nr",
@@ -4344,7 +4354,7 @@
                             "minimum_value": "0",
                             "maximum_value_warning": "50 / skirt_brim_line_width",
                             "value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
-                            "enabled": "(support_enable or support_tree_enable) and support_brim_enable",
+                            "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_brim_enable",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
                             "limit_to_extruder": "support_infill_extruder_nr"
@@ -4361,7 +4371,7 @@
                     "maximum_value_warning": "machine_nozzle_size",
                     "default_value": 0.1,
                     "limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
-                    "enabled": "support_enable or support_tree_enable",
+                    "enabled": "support_enable or support_tree_enable or support_meshes_present",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -4374,7 +4384,7 @@
                             "maximum_value_warning": "machine_nozzle_size",
                             "default_value": 0.1,
                             "type": "float",
-                            "enabled": "support_enable or support_tree_enable",
+                            "enabled": "support_enable or support_tree_enable or support_meshes_present",
                             "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')",
                             "limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr",
                             "settable_per_mesh": true
@@ -4390,7 +4400,7 @@
                             "value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0",
                             "limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr",
                             "type": "float",
-                            "enabled": "(support_enable or support_tree_enable) and resolveOrValue('support_type') == 'everywhere'",
+                            "enabled": "(support_enable or support_tree_enable or support_meshes_present) and resolveOrValue('support_type') == 'everywhere'",
                             "settable_per_mesh": true
                         }
                     }
@@ -4405,7 +4415,7 @@
                     "maximum_value_warning": "1.5 * machine_nozzle_tip_outer_diameter",
                     "default_value": 0.7,
                     "limit_to_extruder": "support_infill_extruder_nr",
-                    "enabled": "support_enable or support_tree_enable",
+                    "enabled": "support_enable or support_tree_enable or support_meshes_present",
                     "settable_per_mesh": true
                 },
                 "support_xy_overrides_z":
@@ -4420,7 +4430,7 @@
                     },
                     "default_value": "z_overrides_xy",
                     "limit_to_extruder": "support_infill_extruder_nr",
-                    "enabled": "support_enable",
+                    "enabled": "support_enable or support_meshes_present",
                     "settable_per_mesh": true
                 },
                 "support_xy_distance_overhang":
@@ -4435,7 +4445,7 @@
                     "default_value": 0.2,
                     "value": "machine_nozzle_size / 2",
                     "limit_to_extruder": "support_infill_extruder_nr",
-                    "enabled": "support_enable and support_xy_overrides_z == 'z_overrides_xy'",
+                    "enabled": "(support_enable or support_meshes_present) and support_xy_overrides_z == 'z_overrides_xy'",
                     "settable_per_mesh": true
                 },
                 "support_bottom_stair_step_height":
@@ -4448,7 +4458,7 @@
                     "limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr",
                     "minimum_value": "0",
                     "maximum_value_warning": "1.0",
-                    "enabled": "support_enable",
+                    "enabled": "support_enable or support_meshes_present",
                     "settable_per_mesh": true
                 },
                 "support_bottom_stair_step_width":
@@ -4461,7 +4471,7 @@
                     "limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
                     "minimum_value": "0",
                     "maximum_value_warning": "10.0",
-                    "enabled": "support_enable",
+                    "enabled": "support_enable or support_meshes_present",
                     "settable_per_mesh": true
                 },
                 "support_join_distance":
@@ -4474,7 +4484,7 @@
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "minimum_value_warning": "0",
                     "maximum_value_warning": "10",
-                    "enabled": "support_enable",
+                    "enabled": "support_enable or support_meshes_present",
                     "settable_per_mesh": true
                 },
                 "support_offset":
@@ -4487,7 +4497,7 @@
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "minimum_value_warning": "-1 * machine_nozzle_size",
                     "maximum_value_warning": "10 * machine_nozzle_size",
-                    "enabled": "support_enable",
+                    "enabled": "support_enable or support_meshes_present",
                     "settable_per_mesh": true
                 },
                 "support_infill_sparse_thickness":
@@ -4501,7 +4511,7 @@
                     "maximum_value_warning": "0.75 * machine_nozzle_size",
                     "maximum_value": "resolveOrValue('layer_height') * 8",
                     "value": "resolveOrValue('layer_height')",
-                    "enabled": "(support_enable or support_tree_enable) and support_infill_rate > 0",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_infill_rate > 0",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false
                 },
@@ -4514,7 +4524,7 @@
                     "minimum_value": "0",
                     "maximum_value_warning": "1 if (support_pattern == 'cross' or support_pattern == 'lines' or support_pattern == 'zigzag' or support_pattern == 'concentric') else 5",
                     "maximum_value": "999999 if support_line_distance == 0 else (20 - math.log(support_line_distance) / math.log(2))",
-                    "enabled": "(support_enable or support_tree_enable) and support_infill_rate > 0",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_infill_rate > 0",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false
                 },
@@ -4527,7 +4537,7 @@
                     "default_value": 1,
                     "minimum_value": "0.0001",
                     "minimum_value_warning": "3 * resolveOrValue('layer_height')",
-                    "enabled": "(support_enable or support_tree_enable) and support_infill_rate > 0 and gradual_support_infill_steps > 0",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_infill_rate > 0 and gradual_support_infill_steps > 0",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false
                 },
@@ -4540,7 +4550,7 @@
                     "default_value": 0.0,
                     "minimum_value": "0",
                     "maximum_value_warning": "5",
-                    "enabled": "support_enable",
+                    "enabled": "support_enable or support_meshes_present",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": true
                 },
@@ -4551,7 +4561,7 @@
                     "type": "bool",
                     "default_value": false,
                     "limit_to_extruder": "support_interface_extruder_nr",
-                    "enabled": "support_enable or support_tree_enable",
+                    "enabled": "support_enable or support_tree_enable or support_meshes_present",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -4563,7 +4573,7 @@
                             "default_value": false,
                             "value": "extruderValue(support_roof_extruder_nr, 'support_interface_enable')",
                             "limit_to_extruder": "support_roof_extruder_nr",
-                            "enabled": "support_enable or support_tree_enable",
+                            "enabled": "support_enable or support_tree_enable or support_meshes_present",
                             "settable_per_mesh": true
                         },
                         "support_bottom_enable":
@@ -4574,7 +4584,7 @@
                             "default_value": false,
                             "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_enable')",
                             "limit_to_extruder": "support_bottom_extruder_nr",
-                            "enabled": "support_enable or support_tree_enable",
+                            "enabled": "support_enable or support_tree_enable or support_meshes_present",
                             "settable_per_mesh": true
                         }
                     }
@@ -4590,7 +4600,7 @@
                     "minimum_value_warning": "0.2 + layer_height",
                     "maximum_value_warning": "10",
                     "limit_to_extruder": "support_interface_extruder_nr",
-                    "enabled": "support_interface_enable and (support_enable or support_tree_enable)",
+                    "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -4606,7 +4616,7 @@
                             "maximum_value_warning": "10",
                             "value": "extruderValue(support_roof_extruder_nr, 'support_interface_height')",
                             "limit_to_extruder": "support_roof_extruder_nr",
-                            "enabled": "support_roof_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": true
                         },
                         "support_bottom_height":
@@ -4621,7 +4631,7 @@
                             "minimum_value_warning": "min(support_bottom_distance + layer_height, support_bottom_stair_step_height)",
                             "maximum_value_warning": "10",
                             "limit_to_extruder": "support_bottom_extruder_nr",
-                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": true
                         }
                     }
@@ -4635,7 +4645,7 @@
                     "minimum_value": "0",
                     "maximum_value_warning": "support_interface_height",
                     "limit_to_extruder": "support_interface_extruder_nr",
-                    "enabled": "support_interface_enable and (support_enable or support_tree_enable)",
+                    "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
                     "settable_per_mesh": true
                 },
                 "support_interface_density":
@@ -4648,7 +4658,7 @@
                     "minimum_value": "0",
                     "maximum_value_warning": "100",
                     "limit_to_extruder": "support_interface_extruder_nr",
-                    "enabled": "support_interface_enable and (support_enable or support_tree_enable)",
+                    "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "children":
@@ -4663,7 +4673,7 @@
                             "minimum_value": "0",
                             "maximum_value": "100",
                             "limit_to_extruder": "support_roof_extruder_nr",
-                            "enabled": "support_roof_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "value": "extruderValue(support_roof_extruder_nr, 'support_interface_density')",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
@@ -4680,7 +4690,7 @@
                                     "minimum_value_warning": "support_roof_line_width - 0.0001",
                                     "value": "0 if support_roof_density == 0 else (support_roof_line_width * 100) / support_roof_density * (2 if support_roof_pattern == 'grid' else (3 if support_roof_pattern == 'triangles' else 1))",
                                     "limit_to_extruder": "support_roof_extruder_nr",
-                                    "enabled": "support_roof_enable and (support_enable or support_tree_enable)",
+                                    "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
                                 }
@@ -4696,7 +4706,7 @@
                             "minimum_value": "0",
                             "maximum_value": "100",
                             "limit_to_extruder": "support_bottom_extruder_nr",
-                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_density')",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,
@@ -4713,7 +4723,7 @@
                                     "minimum_value_warning": "support_bottom_line_width - 0.0001",
                                     "value": "0 if support_bottom_density == 0 else (support_bottom_line_width * 100) / support_bottom_density * (2 if support_bottom_pattern == 'grid' else (3 if support_bottom_pattern == 'triangles' else 1))",
                                     "limit_to_extruder": "support_bottom_extruder_nr",
-                                    "enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
+                                    "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
                                     "settable_per_mesh": false,
                                     "settable_per_extruder": true
                                 }
@@ -4736,7 +4746,7 @@
                     },
                     "default_value": "concentric",
                     "limit_to_extruder": "support_interface_extruder_nr",
-                    "enabled": "support_interface_enable and (support_enable or support_tree_enable)",
+                    "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "children":
@@ -4757,7 +4767,7 @@
                             "default_value": "concentric",
                             "value": "extruderValue(support_roof_extruder_nr, 'support_interface_pattern')",
                             "limit_to_extruder": "support_roof_extruder_nr",
-                            "enabled": "support_roof_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
                         },
@@ -4777,7 +4787,7 @@
                             "default_value": "concentric",
                             "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_pattern')",
                             "limit_to_extruder": "support_bottom_extruder_nr",
-                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
                         }
@@ -4793,7 +4803,7 @@
                     "minimum_value": "0",
                     "minimum_value_warning": "minimum_support_area",
                     "limit_to_extruder": "support_interface_extruder_nr",
-                    "enabled": "support_interface_enable and (support_enable or support_tree_enable)",
+                    "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -4808,7 +4818,7 @@
                             "minimum_value": "0",
                             "minimum_value_warning": "minimum_support_area",
                             "limit_to_extruder": "support_roof_extruder_nr",
-                            "enabled": "support_roof_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": true
                         },
                         "minimum_bottom_area": 
@@ -4822,7 +4832,7 @@
                             "minimum_value": "0",
                             "minimum_value_warning": "minimum_support_area",
                             "limit_to_extruder": "support_bottom_extruder_nr",
-                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": true
                         }
                     }
@@ -4836,7 +4846,7 @@
                     "default_value": 0.0,
                     "maximum_value": "extruderValue(support_extruder_nr, 'support_offset')",
                     "limit_to_extruder": "support_interface_extruder_nr",
-                    "enabled": "support_interface_enable and (support_enable or support_tree_enable)",
+                    "enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "children":
@@ -4851,7 +4861,7 @@
                             "value": "extruderValue(support_roof_extruder_nr, 'support_interface_offset')",
                             "maximum_value": "extruderValue(support_extruder_nr, 'support_offset')",
                             "limit_to_extruder": "support_roof_extruder_nr",
-                            "enabled": "support_roof_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
                         },
@@ -4865,7 +4875,7 @@
                             "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_offset')",
                             "maximum_value": "extruderValue(support_extruder_nr, 'support_offset')",
                             "limit_to_extruder": "support_bottom_extruder_nr",
-                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
+                            "enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
                         }
@@ -4878,7 +4888,7 @@
                     "type": "[int]",
                     "default_value": "[ ]",
                     "limit_to_extruder": "support_interface_extruder_nr",
-                    "enabled": "(support_enable or support_tree_enable) and support_interface_enable and support_interface_pattern != 'concentric'",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_interface_enable and support_interface_pattern != 'concentric'",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "children":
@@ -4891,7 +4901,7 @@
                             "default_value": "[ ]",
                             "value": "support_interface_angles",
                             "limit_to_extruder": "support_roof_extruder_nr",
-                            "enabled": "(support_enable or support_tree_enable) and support_roof_enable and support_roof_pattern != 'concentric'",
+                            "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_roof_enable and support_roof_pattern != 'concentric'",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
                         },
@@ -4903,7 +4913,7 @@
                             "default_value": "[ ]",
                             "value": "support_interface_angles",
                             "limit_to_extruder": "support_bottom_extruder_nr",
-                            "enabled": "(support_enable or support_tree_enable) and support_bottom_enable and support_bottom_pattern != 'concentric'",
+                            "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_bottom_enable and support_bottom_pattern != 'concentric'",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
                         }
@@ -4915,7 +4925,7 @@
                     "description": "When enabled, the print cooling fan speed is altered for the skin regions immediately above the support.",
                     "type": "bool",
                     "default_value": false,
-                    "enabled": "support_enable or support_tree_enable",
+                    "enabled": "support_enable or support_tree_enable or support_meshes_present",
                     "settable_per_mesh": false
                 },
                 "support_supported_skin_fan_speed":
@@ -4927,7 +4937,7 @@
                     "maximum_value": "100",
                     "default_value": 100,
                     "type": "float",
-                    "enabled": "(support_enable or support_tree_enable) and support_fan_enable",
+                    "enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_fan_enable",
                     "settable_per_mesh": false
                 },
                 "support_use_towers":
@@ -4993,6 +5003,17 @@
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false,
                     "settable_globally": false
+                },
+                "support_meshes_present":
+                {
+                    "label": "Scene Has Support Meshes",
+                    "description": "There are support meshes present in the scene. This setting is controlled by Cura.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": false,
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": false
                 }
             }
         },
@@ -5163,7 +5184,7 @@
                     "description": "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions.",
                     "type": "bool",
                     "default_value": true,
-                    "enabled": "resolveOrValue('adhesion_type') == 'brim' and (support_enable or support_tree_enable)",
+                    "enabled": "resolveOrValue('adhesion_type') == 'brim' and (support_enable or support_tree_enable or support_meshes_present)",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
                     "limit_to_extruder": "support_infill_extruder_nr"
@@ -5947,7 +5968,7 @@
                     "description": "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle.",
                     "type": "bool",
                     "default_value": true,
-                    "enabled": "not (support_enable or support_tree_enable)",
+                    "enabled": "not (support_enable or support_tree_enable or support_meshes_present)",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
@@ -6359,7 +6380,7 @@
                     "description": "Skip some support line connections to make the support structure easier to break away. This setting is applicable to the Zig Zag support infill pattern.",
                     "type": "bool",
                     "default_value": false,
-                    "enabled": "support_enable and (support_pattern == 'zigzag')",
+                    "enabled": "(support_enable  or support_meshes_present) and support_pattern == 'zigzag'",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -6373,7 +6394,7 @@
                     "default_value": 20,
                     "minimum_value": "0",
                     "minimum_value_warning": "support_line_distance",
-                    "enabled": "support_enable and (support_pattern == 'zigzag') and support_skip_some_zags",
+                    "enabled": "(support_enable or support_meshes_present) and support_pattern == 'zigzag' and support_skip_some_zags",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
@@ -6388,7 +6409,7 @@
                             "value": "0 if support_line_distance == 0 else round(support_skip_zag_per_mm / support_line_distance)",
                             "minimum_value": "1",
                             "minimum_value_warning": "3",
-                            "enabled": "support_enable and (support_pattern == 'zigzag') and support_skip_some_zags",
+                            "enabled": "(support_enable or support_meshes_present) and support_pattern == 'zigzag' and support_skip_some_zags",
                             "limit_to_extruder": "support_infill_extruder_nr",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true

resources/definitions/smoothie.def.json

@@ -0,0 +1,37 @@
+{
+    "version": 2,
+    "name": "Smoothie Custom Printer",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "grk3010",
+        "manufacturer": "Custom",
+        "file_formats": "text/x-gcode",
+        "machine_extruder_trains":
+        {
+            "0": "custom_extruder_1",
+            "1": "custom_extruder_2",
+            "2": "custom_extruder_3",
+            "3": "custom_extruder_4",
+            "4": "custom_extruder_5",
+            "5": "custom_extruder_6",
+            "6": "custom_extruder_7",
+            "7": "custom_extruder_8"
+        },
+        "first_start_actions": ["MachineSettingsAction"]
+    },
+    "overrides": {
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_always_write_active_tool": {
+            "default_value": true
+        },
+        "machine_start_gcode": {
+            "default_value": "G28 X0 Y0 ; Home X Y\nM375; Load Bed Leveling Grid\nG1 X300 Y275 F15000 ; Move to bed center\nM280 S3.0 ; Deploy probe pin\n## NOTE: Adjust \"ZX.XX\" after G30 to be the Z-offset (in mm) between the probe and the nozzle\n## This is how you adjust nozzle printing height!\nG30 Z1.25 ; Move down to find bed & set Z home offset\nM280 S7.0 ; Retract probe\nG1 Z15.0 F600 ; move extruder up 15mm\nT0; Activate Extruder 1"
+        },
+        "machine_end_gcode": {
+            "default_value": "G28 X0 Y0; Home X and Y\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM107; turn off fans\nM84 ; disable motors"
+        }
+    }
+}

resources/qml/ActionButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2020 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
@@ -98,7 +98,7 @@ Button
                 target: buttonText
                 property: "width"
                 value: button.fixedWidthMode ? button.width - button.leftPadding - button.rightPadding
-                                             : ((maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined)
+                                             : ((maximumWidth != 0 && button.contentWidth > maximumWidth) ? maximumWidth : undefined)
             }
         }
 

resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml

@@ -96,7 +96,7 @@ Item
             id: configurationList
             spacing: UM.Theme.getSize("narrow_margin").height
             width: container.width - ((height > container.maximumHeight) ? container.ScrollBar.vertical.background.width : 0) //Make room for scroll bar if there is any.
-            height: childrenRect.height
+            height: contentHeight
             interactive: false  // let the ScrollView process scroll events.
 
             section.property: "modelData.printerType"

resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml

@@ -4,6 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Controls.Styles 1.4
+import QtQuick.Layouts 1.3
 
 import UM 1.2 as UM
 import Cura 1.0 as Cura
@@ -37,70 +38,68 @@ Cura.ExpandablePopup
     headerItem: Item
     {
         // Horizontal list that shows the extruders and their materials
-        ListView
+        RowLayout
         {
-            id: extrudersList
-
-            orientation: ListView.Horizontal
             anchors.fill: parent
-            model: extrudersModel
-            visible: Cura.MachineManager.activeMachine.hasMaterials
-
-            delegate: Item
+            Repeater
             {
-                height: parent.height
-                width: Math.round(ListView.view.width / extrudersModel.count)
-
-                // Extruder icon. Shows extruder index and has the same color as the active material.
-                Cura.ExtruderIcon
+                model: extrudersModel
+                delegate: Item
                 {
-                    id: extruderIcon
-                    materialColor: model.color
-                    extruderEnabled: model.enabled
-                    height: parent.height
-                    width: height
-                }
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
 
-                // Label for the brand of the material
-                Label
-                {
-                    id: typeAndBrandNameLabel
-
-                    text: model.material_brand + " " + model.material
-                    elide: Text.ElideRight
-                    font: UM.Theme.getFont("default")
-                    color: UM.Theme.getColor("text")
-                    renderType: Text.NativeRendering
-
-                    anchors
+                    // Extruder icon. Shows extruder index and has the same color as the active material.
+                    Cura.ExtruderIcon
                     {
-                        top: extruderIcon.top
-                        left: extruderIcon.right
-                        leftMargin: UM.Theme.getSize("default_margin").width
-                        right: parent.right
-                        rightMargin: UM.Theme.getSize("default_margin").width
+                        id: extruderIcon
+                        materialColor: model.color
+                        extruderEnabled: model.enabled
+                        height: parent.height
+                        width: height
                     }
-                }
-                // Label that shows the name of the variant
-                Label
-                {
-                    id: variantLabel
 
-                    visible: Cura.MachineManager.activeMachine.hasVariants
-
-                    text: model.variant
-                    elide: Text.ElideRight
-                    font: UM.Theme.getFont("default_bold")
-                    color: UM.Theme.getColor("text")
-                    renderType: Text.NativeRendering
-
-                    anchors
+                    // Label for the brand of the material
+                    Label
                     {
-                        left: extruderIcon.right
-                        leftMargin: UM.Theme.getSize("default_margin").width
-                        top: typeAndBrandNameLabel.bottom
-                        right: parent.right
-                        rightMargin:  UM.Theme.getSize("default_margin").width
+                        id: typeAndBrandNameLabel
+
+                        text: model.material_brand + " " + model.material
+                        elide: Text.ElideRight
+                        font: UM.Theme.getFont("default")
+                        color: UM.Theme.getColor("text")
+                        renderType: Text.NativeRendering
+
+                        anchors
+                        {
+                            top: extruderIcon.top
+                            left: extruderIcon.right
+                            leftMargin: UM.Theme.getSize("default_margin").width
+                            right: parent.right
+                            rightMargin: UM.Theme.getSize("default_margin").width
+                        }
+                    }
+                    // Label that shows the name of the variant
+                    Label
+                    {
+                        id: variantLabel
+
+                        visible: Cura.MachineManager.activeMachine.hasVariants
+
+                        text: model.variant
+                        elide: Text.ElideRight
+                        font: UM.Theme.getFont("default_bold")
+                        color: UM.Theme.getColor("text")
+                        renderType: Text.NativeRendering
+
+                        anchors
+                        {
+                            left: extruderIcon.right
+                            leftMargin: UM.Theme.getSize("default_margin").width
+                            top: typeAndBrandNameLabel.bottom
+                            right: parent.right
+                            rightMargin:  UM.Theme.getSize("default_margin").width
+                        }
                     }
                 }
             }

resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml

@@ -73,8 +73,6 @@ Item
             height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height
             hoverEnabled: true
 
-            baselineOffset: null // If we don't do this, there is a binding loop. WHich is a bit weird, since we override the contentItem anyway...
-
             contentItem: RowLayout
             {
                 spacing: 0

resources/qml/PrinterSelector/MachineSelector.qml

@@ -38,12 +38,23 @@ Cura.ExpandablePopup
     readonly property string connectionStatusMessage: {
         if (connectionStatus == "printer_cloud_not_available")
         {
-            if(Cura.API.connectionStatus.isInternetReachable){
-                return catalog.i18nc("@status", "The cloud connection is currently unavailable. Please check your internet connection and sign in to connect to the cloud printer.")
-            } else {
+            if(Cura.API.connectionStatus.isInternetReachable)
+            {
+                if (Cura.API.account.isLoggedIn)
+                {
+                    return catalog.i18nc("@status", "The cloud printer is offline. Please check if the printer is turned on and connected to the internet.")
+                }
+                else
+                {
+                    return catalog.i18nc("@status", "The cloud connection is currently unavailable. Please sign in to connect to the cloud printer.")
+                }
+            } else
+            {
                 return catalog.i18nc("@status", "The cloud connection is currently unavailable. Please check your internet connection.")
             }
-        } else {
+        }
+        else
+        {
             return ""
         }
     }