Merge branch 'master' into feature_unify_pause_at_height

cura/Settings/MachineManager.py

@@ -325,7 +325,7 @@ class MachineManager(QObject):
         # that situation will be fixed (and not occur again, since it switches it out to the preferred variant instead!)
         machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()]
         for extruder in self._global_container_stack.extruderList:
-            variant_name = self._global_container_stack.variant.getName()
+            variant_name = extruder.variant.getName()
             variant_node = machine_node.variants.get(variant_name)
             if variant_node is None:
                 Logger.log("w", "An extruder has an unknown variant, switching it to the preferred variant")
@@ -1523,10 +1523,14 @@ class MachineManager(QObject):
 
             # Yes, we can find this in a single line of code. This makes it easier to read and it has the benefit
             # that it doesn't lump key errors together for the crashlogs
+            try:
                 machine_node = container_tree.machines[definition_id]
                 variant_node = machine_node.variants[variant_name]
                 material_node = variant_node.materials[material_base_file]
                 quality_node = material_node.qualities[quality_id]
+            except KeyError as e:
+                Logger.error("Can't set the intent category '{category}' since the profile '{profile}' in the stack is not supported according to the container tree.".format(category = intent_category, profile = e))
+                continue
 
             for intent_node in quality_node.intents.values():
                 if intent_node.intent_category == intent_category:  # Found an intent with the correct category.

cura/UI/TextManager.py

@@ -28,7 +28,11 @@ class TextManager(QObject):
 
     def _loadChangeLogText(self) -> str:
         # Load change log texts and organize them with a dict
+        try:
             file_path = Resources.getPath(Resources.Texts, "change_log.txt")
+        except FileNotFoundError:
+            # I have no idea how / when this happens, but we're getting crash reports about it.
+            return ""
         change_logs_dict = {}  # type: Dict[Version, Dict[str, List[str]]]
         with open(file_path, "r", encoding = "utf-8") as f:
             open_version = None  # type: Optional[Version]

cura_app.py

@@ -1,12 +1,20 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2019 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
+# Remove the working directory from sys.path.
+# This fixes a security issue where Cura could import Python packages from the
+# current working directory, and therefore be made to execute locally installed
+# code (e.g. in the user's home directory where AppImages by default run from).
+# See issue CURA-7081.
+import sys
+if "" in sys.path:
+    sys.path.remove("")
+
 import argparse
 import faulthandler
 import os
-import sys
 
 # Workaround for a race condition on certain systems where there
 # is a race condition between Arcus and PyQt. Importing Arcus
@@ -51,13 +59,16 @@ if with_sentry_sdk:
     except IndexError:
         pass
 
+    # Errors to be ignored by Sentry
+    ignore_errors = [KeyboardInterrupt, MemoryError]
     sentry_sdk.init("https://5034bf0054fb4b889f82896326e79b13@sentry.io/1821564",
                     before_send = CrashHandler.sentryBeforeSend,
                     environment = sentry_env,
                     release = "cura%s" % ApplicationMetadata.CuraVersion,
                     default_integrations = False,
                     max_breadcrumbs = 300,
-                    server_name = "cura")
+                    server_name = "cura",
+                    ignore_errors = ignore_errors)
 
 if not known_args["debug"]:
     def get_cura_dir_path():

plugins/3MFReader/ThreeMFReader.py

@@ -86,7 +86,7 @@ class ThreeMFReader(MeshReader):
 
     ##  Convenience function that converts a SceneNode object (as obtained from libSavitar) to a scene node.
     #   \returns Scene node.
-    def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode) -> Optional[SceneNode]:
+    def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]:
         self._object_count += 1
         node_name = "Object %s" % self._object_count
 
@@ -104,6 +104,10 @@ class ThreeMFReader(MeshReader):
         vertices = numpy.resize(data, (int(data.size / 3), 3))
         mesh_builder.setVertices(vertices)
         mesh_builder.calculateNormals(fast=True)
+        if file_name:
+            # The filename is used to give the user the option to reload the file if it is changed on disk
+            # It is only set for the root node of the 3mf file
+            mesh_builder.setFileName(file_name)
         mesh_data = mesh_builder.build()
 
         if len(mesh_data.getVertices()):
@@ -171,7 +175,7 @@ class ThreeMFReader(MeshReader):
             scene_3mf = parser.parse(archive.open("3D/3dmodel.model").read())
             self._unit = scene_3mf.getUnit()
             for node in scene_3mf.getSceneNodes():
-                um_node = self._convertSavitarNodeToUMNode(node)
+                um_node = self._convertSavitarNodeToUMNode(node, file_name)
                 if um_node is None:
                     continue
                 # compensate for original center position, if object(s) is/are not around its zero position

plugins/AMFReader/AMFReader.py

@@ -118,7 +118,7 @@ class AMFReader(MeshReader):
                     mesh.merge_vertices()
                     mesh.remove_unreferenced_vertices()
                     mesh.fix_normals()
-                    mesh_data = self._toMeshData(mesh)
+                    mesh_data = self._toMeshData(mesh, file_name)
 
                     new_node = CuraSceneNode()
                     new_node.setSelectable(True)
@@ -147,7 +147,13 @@ class AMFReader(MeshReader):
 
         return group_node
 
-    def _toMeshData(self, tri_node: trimesh.base.Trimesh) -> MeshData:
+    ##  Converts a Trimesh to Uranium's MeshData.
+    #   \param tri_node A Trimesh containing the contents of a file that was
+    #   just read.
+    #   \param file_name The full original filename used to watch for changes
+    #   \return Mesh data from the Trimesh in a way that Uranium can understand
+    #   it.
+    def _toMeshData(self, tri_node: trimesh.base.Trimesh, file_name: str = "") -> MeshData:
         tri_faces = tri_node.faces
         tri_vertices = tri_node.vertices
 
@@ -169,5 +175,5 @@ class AMFReader(MeshReader):
         indices = numpy.asarray(indices, dtype = numpy.int32)
         normals = calculateNormalsFromIndexedVertices(vertices, indices, face_count)
 
-        mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals)
+        mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals,file_name = file_name)
         return mesh_data

plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -421,7 +421,10 @@ class CuraEngineBackend(QObject, Backend):
 
         if job.getResult() == StartJobResult.NothingToSlice:
             if self._application.platformActivity:
-                self._error_message = Message(catalog.i18nc("@info:status", "Nothing to slice because none of the models fit the build volume or are assigned to a disabled extruder. Please scale or rotate models to fit, or enable an extruder."),
+                self._error_message = Message(catalog.i18nc("@info:status", "Please review settings and check if your models:"
+                                                                            "\n- Fit within the build volume"
+                                                                            "\n- Are assigned to an enabled extruder"
+                                                                            "\n- Are not all set as modifier meshes"),
                                               title = catalog.i18nc("@info:title", "Unable to slice"))
                 self._error_message.show()
                 self.setState(BackendState.Error)

plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py

@@ -44,6 +44,7 @@ class FirmwareUpdateCheckerJob(Job):
         try:
             # CURA-6698 Create an SSL context and use certifi CA certificates for verification.
             context = ssl.SSLContext(protocol = ssl.PROTOCOL_TLSv1_2)
+            context.verify_mode = ssl.CERT_REQUIRED
             context.load_verify_locations(cafile = certifi.where())
 
             request = urllib.request.Request(url, headers = self._headers)

plugins/ImageReader/ImageReader.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import numpy
@@ -96,7 +96,7 @@ class ImageReader(MeshReader):
         texel_width = 1.0 / (width_minus_one) * scale_vector.x
         texel_height = 1.0 / (height_minus_one) * scale_vector.z
 
-        height_data = numpy.zeros((height, width), dtype=numpy.float32)
+        height_data = numpy.zeros((height, width), dtype = numpy.float32)
 
         for x in range(0, width):
             for y in range(0, height):
@@ -112,7 +112,7 @@ class ImageReader(MeshReader):
             height_data = 1 - height_data
 
         for _ in range(0, blur_iterations):
-            copy = numpy.pad(height_data, ((1, 1), (1, 1)), mode= "edge")
+            copy = numpy.pad(height_data, ((1, 1), (1, 1)), mode = "edge")
 
             height_data += copy[1:-1, 2:]
             height_data += copy[1:-1, :-2]
@@ -165,7 +165,7 @@ class ImageReader(MeshReader):
         offsetsz = numpy.array(offsetsz, numpy.float32).reshape(-1, 1) * texel_height
 
         # offsets for each texel quad
-        heightmap_vertex_offsets = numpy.concatenate([offsetsx, numpy.zeros((offsetsx.shape[0], offsetsx.shape[1]), dtype=numpy.float32), offsetsz], 1)
+        heightmap_vertex_offsets = numpy.concatenate([offsetsx, numpy.zeros((offsetsx.shape[0], offsetsx.shape[1]), dtype = numpy.float32), offsetsz], 1)
         heightmap_vertices += heightmap_vertex_offsets.repeat(6, 0).reshape(-1, 6, 3)
 
         # apply height data to y values
@@ -174,7 +174,7 @@ class ImageReader(MeshReader):
         heightmap_vertices[:, 2, 1] = heightmap_vertices[:, 3, 1] = height_data[1:, 1:].reshape(-1)
         heightmap_vertices[:, 4, 1] = height_data[:-1, 1:].reshape(-1)
 
-        heightmap_indices = numpy.array(numpy.mgrid[0:heightmap_face_count * 3], dtype=numpy.int32).reshape(-1, 3)
+        heightmap_indices = numpy.array(numpy.mgrid[0:heightmap_face_count * 3], dtype = numpy.int32).reshape(-1, 3)
 
         mesh._vertices[0:(heightmap_vertices.size // 3), :] = heightmap_vertices.reshape(-1, 3)
         mesh._indices[0:(heightmap_indices.size // 3), :] = heightmap_indices
@@ -223,7 +223,7 @@ class ImageReader(MeshReader):
             mesh.addFaceByPoints(geo_width, 0, y, geo_width, 0, ny, geo_width, he1, ny)
             mesh.addFaceByPoints(geo_width, he1, ny, geo_width, he0, y, geo_width, 0, y)
 
-        mesh.calculateNormals(fast=True)
+        mesh.calculateNormals(fast = True)
 
         scene_node.setMeshData(mesh.build())
 

plugins/ImageReader/ImageReaderUI.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import os
@@ -33,9 +33,9 @@ class ImageReaderUI(QObject):
         self.base_height = 0.4
         self.peak_height = 2.5
         self.smoothing = 1
-        self.lighter_is_higher = False;
+        self.lighter_is_higher = False
-        self.use_transparency_model = True;
+        self.use_transparency_model = True
-        self.transmittance_1mm = 50.0; # based on pearl PLA
+        self.transmittance_1mm = 50.0  # based on pearl PLA
 
         self._ui_lock = threading.Lock()
         self._cancelled = False
@@ -85,7 +85,7 @@ class ImageReaderUI(QObject):
             Logger.log("d", "Creating ImageReader config UI")
             path = os.path.join(PluginRegistry.getInstance().getPluginPath("ImageReader"), "ConfigUI.qml")
             self._ui_view = Application.getInstance().createQmlComponent(path, {"manager": self})
-            self._ui_view.setFlags(self._ui_view.flags() & ~Qt.WindowCloseButtonHint & ~Qt.WindowMinimizeButtonHint & ~Qt.WindowMaximizeButtonHint);
+            self._ui_view.setFlags(self._ui_view.flags() & ~Qt.WindowCloseButtonHint & ~Qt.WindowMinimizeButtonHint & ~Qt.WindowMaximizeButtonHint)
             self._disable_size_callbacks = False
 
     @pyqtSlot()

plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py

@@ -71,7 +71,7 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
 
         # Add all instances that are not added, but are in visibility list
         for item in visible:
-            if settings.getInstance(item) is not None:  # Setting was not added already.
+            if settings.getInstance(item) is None:  # Setting was not added already.
                 definition = self._stack.getSettingDefinition(item)
                 if definition:
                     new_instance = SettingInstance(definition, settings)

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -49,18 +49,6 @@ Item
         visibility_handler.addSkipResetSetting(currentMeshType)
     }
 
-    function setOverhangsMeshType()
-    {
-        if (infillOnlyCheckbox.checked)
-        {
-            setMeshType(infillMeshType)
-        }
-        else
-        {
-            setMeshType(cuttingMeshType)
-        }
-    }
-
     function setMeshType(type)
     {
         UM.ActiveTool.setProperty("MeshType", type)
@@ -140,26 +128,43 @@ Item
             verticalAlignment: Text.AlignVCenter
         }
 
-        CheckBox
+
+        ComboBox
         {
-            id: infillOnlyCheckbox
+            id: infillOnlyComboBox
+            width: parent.width / 2 - UM.Theme.getSize("default_margin").width
 
-            text: catalog.i18nc("@action:checkbox", "Infill only");
+            model: ListModel
+            {
+                id: infillOnlyComboBoxModel
 
-            style: UM.Theme.styles.checkbox;
+                Component.onCompleted: {
+                    append({ text: catalog.i18nc("@item:inlistbox", "Infill mesh only") })
+                    append({ text: catalog.i18nc("@item:inlistbox", "Cutting mesh") })
+                }
+            }
 
             visible: currentMeshType === infillMeshType || currentMeshType === cuttingMeshType
-            onClicked: setOverhangsMeshType()
+
+
+            onActivated:
+            {
+                if (index == 0){
+                    setMeshType(infillMeshType)
+                } else {
+                    setMeshType(cuttingMeshType)
+                }
+            }
 
             Binding
             {
-                target: infillOnlyCheckbox
+                target: infillOnlyComboBox
-                property: "checked"
+                property: "currentIndex"
-                value: currentMeshType === infillMeshType
+                value: currentMeshType === infillMeshType ? 0 : 1
             }
         }
 
-        Column // Settings Dialog
+        Column // List of selected Settings to override for the selected object
         {
             // This is to ensure that the panel is first increasing in size up to 200 and then shows a scrollbar.
             // It kinda looks ugly otherwise (big panel, no content on it)

plugins/PerObjectSettingsTool/PerObjectSettingsTool.py

@@ -82,6 +82,7 @@ class PerObjectSettingsTool(Tool):
             selected_object.addDecorator(SettingOverrideDecorator())
             stack = selected_object.callDecoration("getStack")
 
+        settings_visibility_changed = False
         settings = stack.getTop()
         for property_key in ["infill_mesh", "cutting_mesh", "support_mesh", "anti_overhang_mesh"]:
             if property_key != mesh_type:
@@ -97,17 +98,20 @@ class PerObjectSettingsTool(Tool):
 
         for property_key in ["top_bottom_thickness", "wall_thickness"]:
             if mesh_type == "infill_mesh":
-                if not settings.getInstance(property_key):
+                if settings.getInstance(property_key) is None:
                     definition = stack.getSettingDefinition(property_key)
                     new_instance = SettingInstance(definition, settings)
                     new_instance.setProperty("value", 0)
                     new_instance.resetState()  # Ensure that the state is not seen as a user state.
                     settings.addInstance(new_instance)
-                    visible = self.visibility_handler.getVisible()
+                    settings_visibility_changed = True
-                    visible.add(property_key)
+
-                    self.visibility_handler.setVisible(visible)
             elif old_mesh_type == "infill_mesh" and settings.getInstance(property_key) and settings.getProperty(property_key, "value") == 0:
                 settings.removeInstance(property_key)
+                settings_visibility_changed = True
+
+        if settings_visibility_changed:
+            self.visibility_handler.forceVisibilityChanged()
 
         self.propertyChanged.emit()
         return True

plugins/PostProcessingPlugin/PostProcessingPlugin.qml

@@ -484,15 +484,53 @@ UM.Dialog
         onClicked: dialog.accept()
     }
 
-    Cura.SecondaryButton
+    Item
     {
         objectName: "postProcessingSaveAreaButton"
         visible: activeScriptsList.count > 0
         height: UM.Theme.getSize("action_button").height
         width: height
-        tooltip: catalog.i18nc("@info:tooltip", "Change active post-processing scripts")
+
+        Cura.SecondaryButton
+        {
+            height: UM.Theme.getSize("action_button").height
+            tooltip:
+            {
+                var tipText = catalog.i18nc("@info:tooltip", "Change active post-processing scripts.");
+                if (activeScriptsList.count > 0)
+                {
+                    tipText += "<br><br>" + catalog.i18ncp("@info:tooltip",
+                        "The following script is active:",
+                        "The following scripts are active:",
+                        activeScriptsList.count
+                    ) + "<ul>";
+                    for(var i = 0; i < activeScriptsList.count; i++)
+                    {
+                        tipText += "<li>" + manager.getScriptLabelByKey(manager.scriptList[i]) + "</li>";
+                    }
+                    tipText += "</ul>";
+                }
+                return tipText
+            }
+            toolTipContentAlignment: Cura.ToolTip.ContentAlignment.AlignLeft
             onClicked: dialog.show()
             iconSource: "postprocessing.svg"
-        fixedWidthMode: true
+            fixedWidthMode: false
+        }
+
+        Cura.NotificationIcon
+        {
+            id: activeScriptCountIcon
+            visible: activeScriptsList.count > 0
+            anchors
+            {
+                top: parent.top
+                right: parent.right
+                rightMargin: (-0.5 * width) | 0
+                topMargin: (-0.5 * height) | 0
+            }
+
+            labelText: activeScriptsList.count
+        }
     }
 }

plugins/Toolbox/resources/qml/components/ToolboxFooter.qml

@@ -42,7 +42,7 @@ Item
             rightMargin: UM.Theme.getSize("wide_margin").width
         }
         height: UM.Theme.getSize("toolbox_footer_button").height
-        text: catalog.i18nc("@info:button", "Quit Cura")
+        text: catalog.i18nc("@info:button, %1 is the application name", "Quit %1").arg(CuraApplication.applicationDisplayName)
         onClicked: toolbox.restart()
     }
 

plugins/TrimeshReader/TrimeshReader.py

@@ -108,7 +108,7 @@ class TrimeshReader(MeshReader):
             mesh.merge_vertices()
             mesh.remove_unreferenced_vertices()
             mesh.fix_normals()
-            mesh_data = self._toMeshData(mesh)
+            mesh_data = self._toMeshData(mesh, file_name)
 
             file_base_name = os.path.basename(file_name)
             new_node = CuraSceneNode()
@@ -133,9 +133,10 @@ class TrimeshReader(MeshReader):
     ##  Converts a Trimesh to Uranium's MeshData.
     #   \param tri_node A Trimesh containing the contents of a file that was
     #   just read.
+    #   \param file_name The full original filename used to watch for changes
     #   \return Mesh data from the Trimesh in a way that Uranium can understand
     #   it.
-    def _toMeshData(self, tri_node: trimesh.base.Trimesh) -> MeshData:
+    def _toMeshData(self, tri_node: trimesh.base.Trimesh, file_name: str = "") -> MeshData:
         tri_faces = tri_node.faces
         tri_vertices = tri_node.vertices
 
@@ -157,5 +158,5 @@ class TrimeshReader(MeshReader):
         indices = numpy.asarray(indices, dtype = numpy.int32)
         normals = calculateNormalsFromIndexedVertices(vertices, indices, face_count)
 
-        mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals)
+        mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals, file_name = file_name)
         return mesh_data

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 from time import time
+import os
 from typing import List, Optional, cast
 
 from PyQt5.QtCore import QObject, QUrl, pyqtProperty, pyqtSignal, pyqtSlot
@@ -191,8 +192,9 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
     def _onPrintJobCreated(self, job: ExportFileJob) -> None:
         output = job.getOutput()
         self._tool_path = output  # store the tool path to prevent re-uploading when printing the same file again
+        file_name = job.getFileName()
         request = CloudPrintJobUploadRequest(
-            job_name=job.getFileName(),
+            job_name=os.path.splitext(file_name)[0],
             file_size=len(output),
             content_type=job.getMimeType(),
         )

public_key.pem

@@ -1,13 +1,13 @@
 -----BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEA8k8IJsNNM097VM2pJ5vxkHcLhHf76JCB0iyvqpUuIgl8Zcp78Go+
+MIICCgKCAgEA46oyH0gbP7CxKFdfA2g3iz+CI3ukzD9vc9QWJI8OuF/MQhn0aCaW
-WtVkbVBZPPfSSB8GwjEtxvZeWj3i6e3nfreuuzq2sw6Gh860wMiQbNgL+rYCU3m9
+HPpAi28qrOWHapSmmUniCky0/5et7XLiiIpFtU7Fmisih+iiEK7f7iAWoFWfMCfy
-XxvC0kXgZt+oYs13N5LTePV7BG4goa/JOcN8dsu2ptZKfgH6TPhwshMeOGr/RoGr
+P5QFEGyj9XnKv1Vu2s/040miv0DqLZssBHKkMO4NnUkVQ3cBEBAmDHYyQr/uOari
-Jw1DrpvVeq/yTkrEHQHdtHr81GDghfK1vzxYQCt94MOFQCeShhtIC/jHelenJA94
+mLrMBS0umnfdT/ONngsHgQ+OfTiCeNtQKhBMHf1P2egGPVgXb7wrRih04tFa8kRa
-EpXqcWwCzFDfCQ3aXmCNHnMAsTHer7DWDfvsaUFyvJznrxkuQZIOQydGCNWhePTw
+1dHrMiqG7BHgSrOBuX51y5wE0jiFC6VIwIEFlLTgiW3ORBZ0wp+GbrmPqLUFuXQ3
-nGiaMydchknr9TT3F+W/yuCs4u5GdZsz7S+1qbG4hblXo6dV6CTzkdKhh/MzONPC
+CFW1n42qQ1HrfK2ThGnu9pvdZlkXfh5BRAC2YXa4PYzEV/7kbfx1uhSRMKaxihWt
-w6u1QBHUeTWN98zcTdtGIn53jjZEyYTodPnw/p4xLHVCju78a7uwm5U0rahcs6gw
+8Su4eyw+68o8phrpYuCK6e+VocaP16B/P8l4v9j4Ej82p6Ebv+UQ3d9a83dTouEH
-658glo3uT41mmTrXTBIVTV+4f/dSrwJVpNfTy/E4wi6fiuFeN8ojqXqN+NbIymfJ
+C49wSKhKj5MusK/i/RauQnsr/96mp8CJx7fR8t4eOxBXUvSJR8GBJvFW9lj6nEnt
-aKar/Jf/nM3QpEYaPz7yyn8PW8MZ7iomqnsPzyQGE1aymuEbw0ipTzMB7Oy/DfuU
+6T23ls8O7jY28O8PXwJz3WpkszNpu3rwoJJ5w2f/U++UwpIvWRNUWO/eFbeqxQ8L
-d4JU8FFuVuWJj3zNaXW7U/ggzbt5vkdIP/VNVfNZf741J/yKRbCI0+j4mthbruVQ
+J8UFYAR1HFJdDUzRejjCpZ5RnsErtfFBPkbMzV6MsD/HJJxKyS7Efw6XKt5tGN1S
-Ka4aB2EVp1ozisHMaALg5tAeUgrQDZjGnVmSQLt+yFUUbG4e0XFQBb8CAwEAAQ==
+2xJiubmrVDPZTY2B7AXI6tg/acEIzGkyDPVQPG5CX8UzsX3nt71HXBUCAwEAAQ==
 -----END RSA PUBLIC KEY-----

requirements.txt

@@ -0,0 +1,33 @@
+colorlog
+mypy==0.740
+PyQt5==5.10
+numpy==1.15.4
+scipy==1.2.0
+shapely[vectorized]==1.6.4.post2
+appdirs==1.4.3
+certifi==2019.11.28
+cffi==1.13.1
+chardet==3.0.4
+cryptography==2.8
+decorator==4.4.0
+idna==2.8
+netifaces==0.10.9
+networkx==2.3
+numpy-stl==2.10.1
+packaging==18.0
+pycollada==0.6
+pycparser==2.19
+pyparsing==2.4.2
+pyserial==3.4
+python-dateutil==2.8.0
+python-utils==2.3.0
+requests==2.22.0
+sentry-sdk==0.13.5
+six==1.12.0
+trimesh==3.2.33
+typing==3.7.4
+twisted==19.10.0
+urllib3==1.25.6
+PyYAML==5.1.2
+zeroconf==0.24.1
+comtypes==1.1.7

resources/definitions/dagoma_discoeasy200.def.json

@@ -7,24 +7,32 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "discoeasy200.stl",
+        "platform": "dagoma_discoeasy200.stl",
-        "platform_offset": [ 105, -59, 280],
+        "platform_offset": [0, -57.3, -11],
         "has_machine_quality": true,
         "has_materials": true,
+        "preferred_material": "chromatik_pla",
         "machine_extruder_trains":
         {
-            "0": "dagoma_discoeasy200_extruder_0"
+            "0": "dagoma_discoeasy200_extruder_0",
+            "1": "dagoma_discoeasy200_extruder_1"
         }
     },
     "overrides": {
+        "machine_extruder_count": {
+            "default_value": 2
+        },
+        "machine_extruders_share_heater": {
+            "default_value": true
+        },
         "machine_width": {
-            "default_value": 211
+            "default_value": 205
         },
         "machine_height": {
             "default_value": 205
         },
         "machine_depth": {
-            "default_value": 211
+            "default_value": 205
         },
         "machine_center_is_zero": {
             "default_value": false
@@ -66,6 +74,9 @@
         },
         "layer_height_0": {
             "default_value": 0.26
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
         }
     }
 }

resources/definitions/dagoma_discoultimate.def.json

@@ -0,0 +1,82 @@
+{
+    "name": "Dagoma DiscoUltimate",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Dagoma",
+        "manufacturer": "Dagoma",
+        "file_formats": "text/x-gcode",
+        "platform": "dagoma_discoultimate.stl",
+        "platform_offset": [0, -58.5, -11],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "preferred_material": "chromatik_pla",
+        "machine_extruder_trains":
+        {
+            "0": "dagoma_discoultimate_extruder_0",
+            "1": "dagoma_discoultimate_extruder_1"
+        }
+    },
+    "overrides": {
+        "machine_extruder_count": {
+            "default_value": 2
+        },
+        "machine_extruders_share_heater": {
+            "default_value": true
+        },
+        "machine_width": {
+            "default_value": 205
+        },
+        "machine_height": {
+            "default_value": 205
+        },
+        "machine_depth": {
+            "default_value": 205
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [-17, -70],
+                [-17, 40],
+                [17, 40],
+                [17, -70]
+            ]
+        },
+        "gantry_height": {
+            "value": "10"
+        },
+        "machine_start_gcode": {
+            "default_value": ";Gcode by Cura\nG90\nM106 S255\nG28 X Y\nG1 X50\nM109 R90\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 F3000\nG90\nG28 X Y\nM107\nM84\n"
+        },
+        "default_material_print_temperature": {
+            "default_value": 205
+        },
+        "speed_print": {
+            "default_value": 60
+        },
+        "retraction_amount": {
+            "default_value": 3.5
+        },
+        "retraction_speed": {
+            "default_value": 50
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "skirt_line_count": {
+            "default_value": 2
+        },
+        "layer_height_0": {
+            "default_value": 0.26
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
+        }
+    }
+}

resources/definitions/dagoma_magis.def.json

@@ -7,10 +7,11 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "neva.stl",
+        "platform": "dagoma_magis.stl",
-        "platform_offset": [ 0, 0, 0],
+        "platform_offset": [0, -28, -35],
         "has_machine_quality": true,
         "has_materials": true,
+        "preferred_material": "chromatik_pla",
         "machine_extruder_trains":
         {
             "0": "dagoma_magis_extruder_0"
@@ -69,6 +70,9 @@
         },
         "layer_height_0": {
             "default_value": 0.26
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
         }
     }
 }

resources/definitions/dagoma_neva.def.json

@@ -7,10 +7,11 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "neva.stl",
+        "platform": "dagoma_neva.stl",
-        "platform_offset": [ 0, 0, 0],
+        "platform_offset": [0, -28, -35],
         "has_machine_quality": true,
         "has_materials": true,
+        "preferred_material": "chromatik_pla",
         "machine_extruder_trains":
         {
             "0": "dagoma_neva_extruder_0"
@@ -69,6 +70,9 @@
         },
         "layer_height_0": {
             "default_value": 0.26
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
         }
     }
 }

resources/definitions/dxu.def.json

@@ -0,0 +1,182 @@
+{
+    "version": 2,
+    "name": "DXU",
+    "inherits": "ultimaker2_plus",
+    "metadata": {
+        "visible": true,
+        "author": "TheUltimakerCommunity",
+        "manufacturer": "DXU",
+        "category": "Other",
+        "has_variants": true,
+        "has_materials": true,
+        "has_machine_materials": false,
+        "has_machine_quality": false,
+        "has_variant_materials": false,
+        "weight": 0,
+        "file_formats": "text/x-gcode",
+        "icon": "icon_ultimaker.png",
+        "platform": "ultimaker2_platform.obj",
+        "platform_texture": "dxu_backplate.png",
+        "platform_offset": [1.5, 0, 0],
+        "machine_extruder_trains":
+        {
+            "0": "dxu_extruder1",
+            "1": "dxu_extruder2"
+        },
+        "supported_actions": ["MachineSettingsAction", "UpgradeFirmware"]
+    },
+    "overrides": {
+        "machine_name": { 
+			"default_value": "dxu" 
+		},
+        "machine_width": {
+            "default_value": 238
+        },
+        "machine_depth": {
+            "default_value": 223
+        },
+        "machine_height": {
+            "default_value": 203
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+		"material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_nozzle_heat_up_speed": {
+            "default_value": 3.5
+        },
+        "machine_nozzle_cool_down_speed": {
+            "default_value": 1.5
+        },
+        "machine_min_cool_heat_time_window":
+        {
+            "default_value": 15.0
+        },
+        "machine_show_variants": {
+            "default_value": true
+        },
+        "machine_nozzle_head_distance": {
+            "default_value": 5
+        },
+        "machine_nozzle_expansion_angle": {
+            "default_value": 45
+        },
+        "machine_heat_zone_length": {
+            "default_value": 20
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "speed_infill": {
+            "value": "speed_print"
+        },
+        "speed_wall_x": {
+            "value": "speed_wall"
+        },
+        "layer_height_0": {
+            "value": "round(machine_nozzle_size / 1.5, 2)"
+        },
+        "line_width": {
+            "value": "round(machine_nozzle_size * 0.875, 2)"
+        },
+        "speed_support": {
+            "value": "speed_wall_0"
+        },
+        "machine_max_feedrate_x": {
+            "default_value": 300
+        },
+        "machine_max_feedrate_y": {
+            "default_value": 300
+        },
+        "machine_max_feedrate_z": {
+            "default_value": 40
+        },
+        "machine_max_feedrate_e": {
+            "default_value": 45
+        },
+        "machine_acceleration": {
+            "default_value": 3000
+        },
+        "retraction_amount": {
+            "default_value": 6.5
+        },
+        "retraction_speed": {
+            "default_value": 25
+        },
+        "switch_extruder_retraction_amount": {
+            "value": "retraction_amount",
+            "enabled": false
+        },
+        "switch_extruder_retraction_speeds": {
+            "value": "retraction_speed",
+            "enabled": false
+        },
+        "switch_extruder_retraction_speed": {
+            "value": "retraction_retract_speed",
+            "enabled": false
+        },
+        "switch_extruder_prime_speed": {
+            "value": "retraction_prime_speed",
+            "enabled": false
+        },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [ -44, 14 ],
+                [ -44, -34 ],
+                [ 64, 14 ],
+                [ 64, -34 ]
+            ]
+        },
+        "machine_use_extruder_offset_to_offset_coords": {
+            "default_value": false
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode" : {
+            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T{initial_extruder_nr} ;reset filament diameter\\nG28 ;home all\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM104 T{initial_extruder_nr} S{material_standby_temperature, initial_extruder_nr}\\nG0 X25 Y20 F7200\\nG0 Z20 F2400\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG0 X210 Y20 F7200\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nG1 E0 F1500\\nM400 ;finish all moves\\nT{initial_extruder_nr}\\n;end of startup sequence\\n\""
+        },
+        "machine_end_gcode" : {
+            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\""
+        },
+        "machine_extruder_count": {
+            "default_value": 2
+        },
+        "extruder_prime_pos_abs": { "default_value": false },
+        "extruder_prime_pos_x": { "default_value": 0.0, "enabled": false },
+        "extruder_prime_pos_y": { "default_value": 0.0, "enabled": false },
+        "extruder_prime_pos_z": { "default_value": 0.0, "enabled": false },
+        "layer_start_x": {
+            "default_value": 180.0,
+            "enabled": false
+        },
+        "layer_start_y": {
+            "default_value": 160.0,
+            "enabled": false
+        },
+        "prime_tower_position_x": {
+            "value": "180"
+        },
+        "prime_tower_position_y": {
+            "value": "160"
+        },
+		"material_adhesion_tendency": {
+            "enabled": true
+		},
+        "machine_disallowed_areas": {
+            "default_value": [
+                [[-120,  112.5], [ -101,  112.5], [ -101,  106.5], [-120,  106.5]],
+                [[ 120,  112.5], [ 120,  106.5], [ 86,  106.5], [ 86,  112.5]],
+                [[-120, -112.5], [-120, -106.5], [ -101, -106.5], [ -101, -112.5]],
+                [[ 120, -112.5], [ 86, -112.5], [ 86, -106.5], [ 120, -106.5]],
+                [[ 120,  -112.5], [ 120,  -72.5], [ 93,  -72.5], [ 93,  -112.5]]
+            ]
+        }
+    }
+}

resources/definitions/dxu_dual.def.json

@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "DXU Dual",
+    "inherits": "dxu",
+    "overrides": {
+        "machine_start_gcode" : {
+            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\""
+        },
+        "machine_end_gcode" : {
+            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\""
+        },
+        "prime_tower_enable": {
+			"default_value": true
+		}
+    }
+}

resources/definitions/fdmprinter.def.json

@@ -1981,6 +1981,7 @@
                     "default_value": 1,
                     "value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
                     "minimum_value": "0",
+                    "maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
                     "enabled": "top_layers > 0 or bottom_layers > 0",
                     "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true,
@@ -1994,6 +1995,7 @@
                             "type": "float",
                             "default_value": 1,
                             "value": "skin_preshrink",
+                            "maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
                             "minimum_value": "0",
                             "enabled": "top_layers > 0 or bottom_layers > 0",
                             "limit_to_extruder": "top_bottom_extruder_nr",
@@ -2007,6 +2009,7 @@
                             "type": "float",
                             "default_value": 1,
                             "value": "skin_preshrink",
+                            "maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
                             "minimum_value": "0",
                             "enabled": "top_layers > 0 or bottom_layers > 0",
                             "limit_to_extruder": "top_bottom_extruder_nr",
@@ -2095,7 +2098,7 @@
                     "minimum_value": "0",
                     "maximum_value": "machine_height",
                     "type": "float",
-                    "value": "0",
+                    "value": "0 if infill_sparse_density > 0 else 0",
                     "limit_to_extruder": "infill_extruder_nr",
                     "enabled": "infill_sparse_density > 0",
                     "settable_per_mesh": true,
@@ -2444,7 +2447,7 @@
                 "material_flush_purge_speed":
                 {
                     "label": "Flush Purge Speed",
-                    "description": "Material Station internal value",
+                    "description": "How fast to prime the material after switching to a different material.",
                     "type": "float",
                     "default_value": 0.5,
                     "enabled": false
@@ -2452,23 +2455,23 @@
                 "material_flush_purge_length":
                 {
                     "label": "Flush Purge Length",
-                    "description": "Material Station internal value",
+                    "description": "How much material to use to purge the previous material out of the nozzle (in length of filament) when switching to a different material.",
                     "type": "float",
                     "default_value": 60,
                     "enabled": false
                 },
                 "material_end_of_filament_purge_speed":
                 {
-                    "label": "End Of Filament Purge Speed",
+                    "label": "End of Filament Purge Speed",
-                    "description": "Material Station internal value",
+                    "description": "How fast to prime the material after replacing an empty spool with a fresh spool of the same material.",
                     "type": "float",
                     "default_value": 0.5,
                     "enabled": false
                 },
                 "material_end_of_filament_purge_length":
                 {
-                    "label": "End Of Filament Purge Length",
+                    "label": "End of Filament Purge Length",
-                    "description": "Material Station internal value",
+                    "description": "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material.",
                     "type": "float",
                     "default_value": 20,
                     "enabled": false
@@ -2476,7 +2479,7 @@
                 "material_maximum_park_duration":
                 {
                     "label": "Maximum Park Duration",
-                    "description": "Material Station internal value",
+                    "description": "How long the material can be kept out of dry storage safely.",
                     "type": "float",
                     "default_value": 300,
                     "enabled": false
@@ -2484,7 +2487,7 @@
                 "material_no_load_move_factor":
                 {
                     "label": "No Load Move Factor",
-                    "description": "Material Station internal value",
+                    "description": "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch.",
                     "type": "float",
                     "default_value": 0.940860215,
                     "enabled": false

resources/definitions/flyingbear_base.def.json

@@ -0,0 +1,134 @@
+{
+	"name": "Flying Bear Base Printer",
+	"version": 2,
+	"inherits": "fdmprinter",   
+	"metadata": {
+		"visible": false,
+		"author": "oducceu",
+		"manufacturer": "Flying Bear",
+		"file_formats": "text/x-gcode",
+		"first_start_actions": ["MachineSettingsAction"],
+
+		"machine_extruder_trains": { "0": "flyingbear_base_extruder_0" },
+
+		"has_materials": true,
+		"preferred_material": "generic_pla",
+
+		"has_variants": true,
+		"variants_name": "Nozzle Size",
+		"preferred_variant_name": "0.4mm Nozzle",
+
+		"has_machine_quality": true,
+		"preferred_quality_type": "normal",
+
+		"exclude_materials": ["Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_PLA_Glitter", "Vertex_Delta_PLA_Mat", "Vertex_Delta_PLA_Satin", "Vertex_Delta_PLA_Wood", "Vertex_Delta_TPU", "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_bam", "generic_cffcpe", "generic_cffpa", "generic_cpe", "generic_cpe_plus", "generic_gffcpe", "generic_gffpa", "generic_hips", "generic_nylon", "generic_pc", "generic_petg", "generic_pla", "generic_pp", "generic_pva", "generic_tough_pla", "generic_tpu", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", "leapfrog_abs_natural", "leapfrog_epla_natural", "leapfrog_pva_natural", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "structur3d_dap100silicone", "tizyx_abs", "tizyx_flex", "tizyx_petg", "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "zyyx_pro_flex", "zyyx_pro_pla"]
+	},
+	"overrides": {
+		"machine_name": 			{ "default_value": "Flying Bear Base Printer" },
+		
+		"machine_start_gcode": 			{ "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\n;Code for nozzle cleaning and flow normalization\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.4 Y20 Z0.28 F5000.0\nG1 X10.4 Y170.0 Z0.28 F1500.0 E15\nG1 X10.1 Y170.0 Z0.28 F5000.0\nG1 X10.1 Y40 Z0.28 F1500.0 E30\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" },
+
+		"machine_end_gcode": 			{ "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" },
+ 
+		"machine_heated_bed": 			{ "default_value": true },
+		"machine_shape": 			{ "default_value": "rectangular" },
+		"machine_buildplate_type": 		{ "value": "glass" },
+		"machine_center_is_zero": 		{ "default_value": false },
+
+		"material_diameter": 			{ "default_value": 1.75 },
+
+		"layer_height_0": 			{ "value": 0.2 },
+		"line_width": 				{ "value": "machine_nozzle_size" },
+		"skin_line_width": 			{ "value": "machine_nozzle_size" },
+		"infill_line_width": 			{ "value": "line_width + 0.1" },
+		"skirt_brim_line_width": 		{ "value": "line_width + 0.1" },
+		"support_interface_line_width": 	{ "value": "line_width - 0.1" },
+
+		"wall_thickness": 			{ "value": "line_width * 3" },
+		"wall_0_wipe_dist": 			{ "value": 0.0 },
+		"top_bottom_thickness": 		{ "value":  "layer_height_0 + layer_height * 3 if layer_height > 0.15 else 0.8" },
+		"optimize_wall_printing_order": 	{ "value": true },
+		"travel_compensate_overlapping_walls_0_enabled": { "value": false },
+		"fill_perimeter_gaps": 			{ "value": "'everywhere'" },
+		"filter_out_tiny_gaps": 		{ "value": false },
+		"fill_outline_gaps": 			{ "value": false },
+	   	"z_seam_type": 				{ "value": "'sharpest_corner'" },
+		"z_seam_corner": 			{ "value": "'z_seam_corner_weighted'" },
+
+		"infill_sparse_density": 		{ "value": 20 },
+		"infill_pattern": 			{ "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+		"infill_overlap": 			{ "value": 30 },
+		"skin_overlap": 			{ "value": 10 },
+		"infill_wipe_dist": 			{ "value": 0.0 },
+		"infill_before_walls": 			{ "value": false },
+		"infill_enable_travel_optimization": 	{ "value": true },
+
+		"material_initial_print_temperature": 	{ "value": "material_print_temperature" },
+		"material_final_print_temperature": 	{ "value": "material_print_temperature" },
+		"material_flow": 			{ "value": 100 },
+		"retraction_enable": 			{ "value": true },
+		"retraction_min_travel": 		{ "value": 1.5 },
+		"retraction_count_max": 		{ "value": 100 },
+		"retraction_extrusion_window": 		{ "value": 10 },
+
+		"speed_print": 				{ "value": 60 } ,
+		"speed_infill": 			{ "value": "speed_print" },
+		"speed_wall": 				{ "value": "speed_print / 2" },
+		"speed_wall_0": 			{ "value": "speed_wall" },
+		"speed_wall_x": 			{ "value": "speed_print" },
+		"speed_roofing": 			{ "value": "speed_topbottom" },
+		"speed_topbottom": 			{ "value": "speed_print / 2" },
+		"speed_support": 			{ "value": "speed_print" },
+		"speed_support_interface": 		{ "value": "speed_topbottom" },
+		"speed_prime_tower": 			{ "value": "speed_topbottom" },
+		"speed_travel": 			{ "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
+		"speed_layer_0": 			{ "value": 20 },
+		"speed_print_layer_0": 			{ "value": "speed_layer_0" },
+		"speed_travel_layer_0": 		{ "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
+		"skirt_brim_speed": 			{ "value": "speed_layer_0" },
+		"speed_z_hop": 				{ "value": 5 },
+
+		"retraction_combing": 			{ "value": "'off' if retraction_hop_enabled else 'noskin'" },
+		"travel_retract_before_outer_wall": 	{ "value": true },
+		"retraction_combing_max_distance": 	{ "value": 30 },
+		"travel_avoid_other_parts": 		{ "value": true },
+		"travel_avoid_supports": 		{ "value": true },
+		"retraction_hop_enabled": 		{ "value": false },
+		"retraction_hop": 			{ "value": 0.2 },
+
+		"cool_fan_enabled": 			{ "value": true },
+		"cool_fan_full_at_height": 		{ "value": "layer_height_0 + 2 * layer_height" },
+		"cool_min_layer_time": 			{ "value": 10 },
+
+		"support_angle": 			{ "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
+		"support_pattern": 			{ "value": "'zigzag'" },
+		"support_infill_rate": 			{ "value": "0 if support_tree_enable else 20" },
+		"support_z_distance": 			{ "value": "layer_height if layer_height >= 0.16 else layer_height*2" },
+		"support_xy_distance": 			{ "value": "wall_line_width_0 * 2" },
+		"support_xy_overrides_z": 		{ "value": "'xy_overrides_z'" },
+		"support_xy_distance_overhang": 	{ "value": "wall_line_width_0" },
+		"minimum_support_area": 		{ "value": 5 },
+		"minimum_interface_area": 		{ "value": 10 },
+		"support_interface_enable": 		{ "value": true },
+		"support_interface_height": 		{ "value": "layer_height * 4" },
+		"support_interface_skip_height": 	{ "value": 0.2 },
+		"support_interface_density": 		{ "value": 33 },
+		"support_interface_pattern": 		{ "value": "'grid'" },
+		"support_wall_count": 			{ "value": 1 },
+		"support_brim_enable": 			{ "value": true },
+		"support_brim_width": 			{ "value": 4 },
+		"support_use_towers": 			{ "value": false },
+
+		"adhesion_type": 			{ "value": "'skirt'" },
+		"skirt_line_count": 			{ "value": 3 },
+		"skirt_gap": 				{ "value": 10 },
+		"skirt_brim_minimal_length": 		{ "value": 50 },
+		"brim_replaces_support": 		{ "value": false },
+
+		"meshfix_maximum_resolution": 		{ "value": 0.05 },
+		"meshfix_maximum_travel_resolution": 	{ "value": "meshfix_maximum_resolution" },
+
+		"adaptive_layer_height_variation": 	{ "value": 0.04 },
+		"adaptive_layer_height_variation_step": { "value": 0.04 }
+   }
+}

resources/definitions/flyingbear_ghost_4s.def.json

@@ -0,0 +1,54 @@
+{
+	"name": "Flying Bear Ghost 4S",
+	"version": 2,
+	"inherits": "flyingbear_base",   
+	"metadata": {
+		"visible": true,
+		"author": "oducceu",
+
+		"platform": "flyingbear_platform.obj",
+		"platform_texture": "flyingbear_platform.png",
+
+		"quality_definition": "flyingbear_base"
+
+	},
+
+	"overrides": {
+		"machine_name": 		{ "default_value": "Flying Bear Ghost 4S" },
+		"machine_width": 		{ "default_value": 255 },
+		"machine_depth": 		{ "default_value": 210 },
+		"machine_height": 		{ "default_value": 210 },
+
+		"machine_steps_per_mm_x": 	{ "default_value": 80 },
+		"machine_steps_per_mm_y": 	{ "default_value": 80 },
+		"machine_steps_per_mm_z": 	{ "default_value": 400 },
+		"machine_steps_per_mm_e": 	{ "default_value": 400 },
+
+		"machine_max_feedrate_x": 	{ "value": 200 },
+		"machine_max_feedrate_y": 	{ "value": 200 },
+		"machine_max_feedrate_z": 	{ "value": 20 },
+		"machine_max_feedrate_e": 	{ "value": 70 },
+
+		"acceleration_enabled": 	{ "value": false },
+		"jerk_enabled": 		{ "value": false },
+
+		"machine_max_acceleration_x": 	{ "value": 1000 },
+		"machine_max_acceleration_y": 	{ "value": 1000 },
+		"machine_max_acceleration_z": 	{ "value": 100 },
+		"machine_max_acceleration_e": 	{ "value": 1000 },
+		"machine_acceleration": 	{ "value": 1000 },
+
+		"machine_max_jerk_xy": 		{ "value": 20 },
+		"machine_max_jerk_z": 		{ "value": 0.4 },
+		"machine_max_jerk_e": 		{ "value": 5.0 },
+
+		"acceleration_print": 		{ "value": 1000 },
+		"acceleration_travel": 		{ "value": 1000 },
+		"acceleration_travel_layer_0": 	{ "value": "acceleration_travel" },
+		"acceleration_roofing": 	{ "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
+
+		"jerk_print": 			{ "value": 20 },
+		"jerk_travel": 			{ "value": "jerk_print" },
+		"jerk_travel_layer_0": 		{ "value": "jerk_travel" }
+   }
+}

resources/definitions/mbot3d_grid2plus.def.json

@@ -0,0 +1,57 @@
+{
+    "name": "MBot3D Grid 2+",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Magicfirm",
+        "manufacturer": "Magicfirm",
+        "file_formats": "application/x3g",
+        "machine_x3g_variant": "r1",
+        "machine_extruder_trains":
+        {
+            "0": "mbot3d_grid2_extruder_0"
+        }
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "MBot3D Grid 2+" },
+        "machine_start_gcode": {
+            "default_value": "M136\nG162 X Y F2000\nG161 Z F900\nG92 X0 Y0 Z-5 A0 B0\nG1 Z0.0 F900\nG161 Z F100\nM132 X Y Z A B\nG1 X125 Y115 Z10 F450\nG1 X0 Y115 Z10 F2000.0\nM133 T0\nG1 X20 Y115 Z0.5 F800\nG1 X0 Y115 Z0.5 F600 A12\nG92 A0\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "M18 A B(Turn off A and B steppers)\nG1 Z190 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\nM104 S0 T0\nM72 P1  ( Play Ta-Da song )\nM73 P100 (end  build progress )\nM137 (build end)\n"
+        },
+        "machine_width": { "default_value": 235 },
+        "machine_depth": { "default_value": 210 },
+        "machine_height": { "default_value": 190 },
+        "machine_heated_bed": { "default_value": true },
+        "machine_center_is_zero": { "default_value": true },
+        "machine_gcode_flavor": { "default_value": "Makerbot" },        
+        "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] },
+        "gantry_height": { "value": 10 },
+        "machine_steps_per_mm_x": { "default_value": 88.888889 },
+        "machine_steps_per_mm_y": { "default_value": 88.888889 },
+        "machine_steps_per_mm_z": { "default_value": 400 },
+        "machine_steps_per_mm_e": { "default_value": 96.27520187033366 },
+        "retraction_amount": { "default_value": 0.7 },
+        "retraction_speed": { "default_value": 15 },
+        "speed_print": { "default_value": 50 },
+        "speed_wall": { "value": 25 },
+        "speed_wall_x": { "value": 35 },
+        "speed_travel": { "value": 80 },
+        "speed_layer_0": { "value": 15 },
+        "support_interface_enable": { "default_value": true },
+        "support_interface_height": { "default_value": 0.8 },
+        "support_interface_density": { "default_value": 80 },
+        "support_interface_pattern": { "default_value": "grid" },
+        "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" },
+        "retract_at_layer_change": { "default_value": true },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "travel_avoid_other_parts": { "default_value": false },
+        "raft_airgap": { "default_value": 0.15 },
+        "raft_margin": { "default_value": 6 }
+    }
+}

resources/definitions/mbot3d_grid2plus_dual.def.json

@@ -0,0 +1,58 @@
+{
+    "name": "MBot3D Grid 2+ Dual",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Magicfirm",
+        "manufacturer": "Magicfirm",
+        "file_formats": "application/x3g",
+        "machine_x3g_variant": "z",
+        "machine_extruder_trains":
+        {
+            "0": "mbot3d_grid2_extruder_left",
+            "1": "mbot3d_grid2_extruder_right"
+        }
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "MBot3D Grid 2+ Dual" },
+        "machine_start_gcode": {
+            "default_value": "M136\nG162 X Y F2000\nG161 Z F900\nG92 X0 Y0 Z-5 A0 B0\nG1 Z0.0 F900\nG161 Z F100\nM132 X Y Z A B\nG1 X125 Y115 Z10 F450\nG1 X0 Y115 Z10 F2000.0\nM133 T0\nG1 X20 Y115 Z0.5 F800\nG1 X0 Y115 Z0.5 F600 A12\nG92 A0\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "M18 A B(Turn off A and B steppers)\nG1 Z190 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\nM104 S0 T0\nM72 P1  ( Play Ta-Da song )\nM73 P100 (end  build progress )\nM137 (build end)\n"
+        },
+        "machine_width": { "default_value": 235 },
+        "machine_depth": { "default_value": 210 },
+        "machine_height": { "default_value": 190 },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_center_is_zero": { "default_value": true },
+        "machine_gcode_flavor": { "default_value": "Makerbot" },
+        "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] },
+        "gantry_height": { "value": 10 },
+        "machine_steps_per_mm_x": { "default_value": 88.888889 },
+        "machine_steps_per_mm_y": { "default_value": 88.888889 },
+        "machine_steps_per_mm_z": { "default_value": 400 },
+        "machine_steps_per_mm_e": { "default_value": 96.27520187033366 },
+        "retraction_amount": { "default_value": 0.7 },
+        "retraction_speed": { "default_value": 15 },
+        "speed_print": { "default_value": 50 },
+        "speed_wall": { "value": 25 },
+        "speed_wall_x": { "value": 35 },
+        "speed_travel": { "value": 80 },
+        "speed_layer_0": { "value": 15 },
+        "support_interface_enable": { "default_value": true },
+        "support_interface_height": { "default_value": 0.8 },
+        "support_interface_density": { "default_value": 80 },
+        "support_interface_pattern": { "default_value": "grid" },
+        "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" },
+        "retract_at_layer_change": { "default_value": true },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "travel_avoid_other_parts": { "default_value": false },
+        "raft_airgap": { "default_value": 0.15 },
+        "raft_margin": { "default_value": 6 }
+    }
+}

resources/definitions/mbot3d_grid4.def.json

@@ -0,0 +1,57 @@
+{
+    "version": 2,
+    "name": "MBot3D Grid 4",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "author": "Magicfirm",
+        "manufacturer": "Magicfirm",
+        "category": "Other",
+        "visible": true,
+        "file_formats": "text/x-gcode",
+        "platform_offset": [
+            0,
+            0,
+            0
+        ],
+        "has_materials": true,
+        "machine_extruder_trains":
+        {
+            "0": "mbot3d_grid4_extruder_0"
+        }
+    },
+    "overrides": {
+        "machine_name": {
+            "default_value": "MBot3D Grid 4"
+        },
+        "machine_width": {
+            "default_value": 235
+        },
+        "machine_depth": {
+            "default_value": 210
+        },
+        "machine_height": {
+            "default_value": 190
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "material_flow": {
+            "default_value": 100
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },        
+        "machine_start_gcode": {
+            "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y  ;home X Y axes\nM84 ; disable motors"
+        }
+    }
+}

resources/definitions/mbot3d_grid4_dual.def.json

@@ -0,0 +1,60 @@
+{
+    "version": 2,
+    "name": "MBot3D Grid 4 Dual",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "author": "Magicfirm",
+        "manufacturer": "Magicfirm",
+        "category": "Other",
+        "visible": true,
+        "file_formats": "text/x-gcode",
+        "platform_offset": [
+            0,
+            0,
+            0
+        ],
+        "has_materials": true,
+		"machine_extruder_trains": {
+            "0": "mbot3d_grid4_extruder_left",
+            "1": "mbot3d_grid4_extruder_right"
+        }
+    },
+    "overrides": {
+        "machine_name": {
+            "default_value": "MBot3D Grid 4 Dual"
+        },
+        "machine_width": {
+            "default_value": 210
+        },
+        "machine_depth": {
+            "default_value": 210
+        },
+        "machine_height": {
+            "default_value": 190
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },        
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_extruder_count": {
+            "default_value": 2
+        },
+        "material_flow": {
+            "default_value": 100
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },     
+        "machine_start_gcode": {
+           "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n"
+        },
+        "machine_end_gcode": {
+           "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y  ;home X Y axes\nM84 ; disable motors"
+        }
+    }
+}

resources/definitions/rigid3d.def.json

@@ -1,44 +1,33 @@
 {
-    "name": "Rigid3D",
+    "name": "Rigid3D 2. Nesil",
     "version": 2,
-    "inherits": "fdmprinter",
+    "inherits": "rigid3d_base",
     "metadata": {
 		"visible": true,
-        "author": "Ultimaker",
+		"quality_definition": "rigid3d_base",	
-        "manufacturer": "Rigid3D",
+
-        "file_formats": "text/x-gcode",
+		"preferred_quality_type": "standard"		
-        "platform_offset": [ 0, 0, 0],
+    },
-        "machine_extruder_trains":
+    "overrides": {
-        {
+        "machine_name": { "default_value": "Rigid3D 2. Nesil" },
-            "0": "rigid3d_extruder_0"
+
-        }
+		"machine_heated_bed": { "default_value": true },
+		
+		"machine_width": { "default_value": 250 },
+        "machine_depth": { "default_value": 250 },
+        "machine_height": { "default_value": 210 },
+		
+		"machine_center_is_zero": { "default_value": false },
+		
+		"machine_start_gcode": {"default_value": "  ; -- START GCODE --\n  G21\n  G28 ; Home extruder\n  G29 ; Autolevel bed\n  M107 ; Turn off fan\n  G90 ; Absolute positioning\n  M82 ; Extruder in absolute mode\n  G92 E0 ; Reset extruder position\n  ; -- end of START GCODE --\n\n"},
+        "machine_end_gcode": {"default_value": "  ; -- END GCODE --\n  G1 X0 Y230 ; Get extruder out of way.\n  M107 ; Turn off fan\n  G91 ; Relative positioning\n  G0 Z20 ; Lift extruder up\n  T0\n  G1 E-1 ; Reduce filament pressure\n  M104 T0 S0 ; Turn ectruder heater off\n  G90 ; Absolute positioning\n  G92 E0 ; Reset extruder position\n  M140 S0 ; Disable heated bed\n  M84 ; Turn steppers off\n  ; -- end of END GCODE --\n"},
+		
+		"machine_head_with_fans_polygon": { 
+            "default_value": [
+                 [ -22, -67], [ -22, 51], [ 36, -67], [ 36, 51]
+				 ] 
         },
 
-    "overrides": {
+        "gantry_height": { "value": 20 }
-        "machine_start_gcode": {
-            "default_value": "  ; -- START GCODE --\n  G21\n  G28 ; Home extruder\n  G29 ; Autolevel bed\n  M107 ; Turn off fan\n  G90 ; Absolute positioning\n  M82 ; Extruder in absolute mode\n  G92 E0 ; Reset extruder position\n  ; -- end of START GCODE --\n\n"
-        },
-        "machine_end_gcode": {
-            "default_value": "  ; -- END GCODE --\n  G1 X0 Y230 ; Get extruder out of way.\n  M107 ; Turn off fan\n  G91 ; Relative positioning\n  G0 Z20 ; Lift extruder up\n  T0\n  G1 E-1 ; Reduce filament pressure\n  M104 T0 S0 ; Turn ectruder heater off\n  G90 ; Absolute positioning\n  G92 E0 ; Reset extruder position\n  M140 S0 ; Disable heated bed\n  M84 ; Turn steppers off\n  ; -- end of END GCODE --\n"
-        },
-        "machine_head_with_fans_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] },
-        "skirt_gap": { "default_value": 5.0 },
-        "cool_min_layer_time": { "default_value": 10 },
-        "prime_tower_size": { "default_value": 7.745966692414834 },
-        "layer_height_0": { "default_value": 0.25 },
-        "support_angle": { "default_value": 45 },
-        "retraction_speed": { "default_value": 60.0 },
-        "wall_thickness": { "default_value": 0.8 },
-        "retraction_amount": { "default_value": 1 },
-        "layer_height": { "default_value": 0.25 },
-        "speed_print": { "default_value": 40 },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_heated_bed": { "default_value": true },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_height": { "default_value": 210 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_depth": { "default_value": 250 },
-        "machine_width": { "default_value": 250 },
-        "machine_name": { "default_value": "Rigid3D" }
     }
 }

resources/definitions/rigid3d_3rdgen.def.json

@@ -1,43 +1,33 @@
 {
-    "name": "Rigid3D 3rdGen",
+    "name": "Rigid3D 3. Nesil",
     "version": 2,
-    "inherits": "fdmprinter",
+    "inherits": "rigid3d_base",
     "metadata": {
 		"visible": true,
-        "author": "Ultimaker",
+		"quality_definition": "rigid3d_base",
-        "manufacturer": "Rigid3D",
+
-        "file_formats": "text/x-gcode",
+		"preferred_quality_type": "standard"		
-        "platform_offset": [ 0, 0, 0],
+    },
-        "machine_extruder_trains":
+    "overrides": {
-        {
+        "machine_name": { "default_value": "Rigid3D 3. Nesil" },
-            "0": "rigid3d_3rdgen_extruder_0"
+
-        }
+		"machine_heated_bed": { "default_value": true },
+		
+		"machine_width": { "default_value": 270 },
+        "machine_depth": { "default_value": 290 },
+        "machine_height": { "default_value": 240 },
+		
+		"machine_center_is_zero": { "default_value": false },
+		
+		"machine_start_gcode": {"default_value": "  ; -- START GCODE --\n  G21\n  G28 ; Home extruder\n  G29 ; Autolevel bed\n  M107 ; Turn off fan\n  G90 ; Absolute positioning\n  M82 ; Extruder in absolute mode\n  G92 E0 ; Reset extruder position\n  ; -- end of START GCODE --\n\n"},
+        "machine_end_gcode": {"default_value": "  ; -- END GCODE --\n  G1 X0 Y230 ; Get extruder out of way.\n  M107 ; Turn off fan\n  G91 ; Relative positioning\n  G0 Z20 ; Lift extruder up\n  T0\n  G1 E-1 ; Reduce filament pressure\n  M104 T0 S0 ; Turn extruder heater off\n  G90 ; Absolute positioning\n  G92 E0 ; Reset extruder position\n  M140 S0 ; Disable heated bed\n  M84 ; Turn steppers off\n  ; -- end of END GCODE --\n"},
+		
+		"machine_head_with_fans_polygon": { 
+            "default_value": [
+                 [ -18, -20], [ -18, 45], [ 32, -20], [ 32, 45]
+				 ] 
         },
 
-    "overrides": {
+        "gantry_height": { "value": 20 }
-        "machine_start_gcode": {
-            "default_value": "  ; -- START GCODE --\n  G21\n  G28 ; Home extruder\n  G29 ; Autolevel bed\n  M107 ; Turn off fan\n  G90 ; Absolute positioning\n  M82 ; Extruder in absolute mode\n  G92 E0 ; Reset extruder position\n  ; -- end of START GCODE --\n\n"
-        },
-        "machine_end_gcode": {
-            "default_value": "  ; -- END GCODE --\n  G1 X0 Y230 ; Get extruder out of way.\n  M107 ; Turn off fan\n  G91 ; Relative positioning\n  G0 Z20 ; Lift extruder up\n  T0\n  G1 E-1 ; Reduce filament pressure\n  M104 T0 S0 ; Turn extruder heater off\n  G90 ; Absolute positioning\n  G92 E0 ; Reset extruder position\n  M140 S0 ; Disable heated bed\n  M84 ; Turn steppers off\n  ; -- end of END GCODE --\n"
-        },
-        "machine_head_with_fans_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] },
-        "cool_min_layer_time": { "default_value": 10 },
-        "prime_tower_size": { "default_value": 7.745966692414834 },
-        "skirt_gap": { "default_value": 5.0 },
-        "layer_height_0": { "default_value": 0.25 },
-        "support_angle": { "default_value": 45 },
-        "retraction_speed": { "default_value": 60.0 },
-        "wall_thickness": { "default_value": 0.8 },
-        "retraction_amount": { "default_value": 1 },
-        "layer_height": { "default_value": 0.25 },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_heated_bed": { "default_value": true },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_height": { "default_value": 240 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_depth": { "default_value": 290 },
-        "machine_width": { "default_value": 275 },
-        "machine_name": { "default_value": "Rigid3D 3rd Geneartion" }
     }
 }

resources/definitions/rigid3d_base.def.json

@@ -0,0 +1,274 @@
+{
+    "name": "Rigid3D Base Printer",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+		"visible": false,
+		"author": "Ramazan UTKU",
+		"manufacturer": "Rigid3D",
+        "file_formats": "text/x-gcode",
+		"has_materials": true,
+		"has_machine_quality": true,
+	
+        "machine_extruder_trains":{
+            "0": "rigid3d_base_extruder_0"
+        },
+        "first_start_actions": ["MachineSettingsAction"],
+        "supported_actions":   ["MachineSettingsAction"],
+
+        "preferred_material": "generic_pla_175",
+        "exclude_materials": [
+			"chromatik_pla",
+            "dsm_arnitel2045_175",
+            "dsm_novamid1070_175",
+			"emotiontech_abs",
+			"emotiontech_asax",
+			"emotiontech_hips",
+			"emotiontech_petg",
+			"emotiontech_pla",
+			"emotiontech_pva-m",
+			"emotiontech_pva-oks",
+			"emotiontech_pva-s",
+			"emotiontech_tpu98a",
+            "fabtotum_abs",
+            "fabtotum_nylon",
+            "fabtotum_pla",
+            "fabtotum_tpu",
+            "fiberlogy_hd_pla",
+            "filo3d_pla",
+            "filo3d_pla_green",
+            "filo3d_pla_red",
+            "generic_abs",
+            "generic_bam",
+            "generic_cffcpe",
+            "generic_cffpa",
+            "generic_cpe",
+            "generic_cpe_plus",
+            "generic_gffcpe",
+            "generic_gffpa",
+            "generic_hips",
+            "generic_nylon",
+            "generic_pc",
+            "generic_petg",
+            "generic_pla",
+            "generic_pp",
+            "generic_pva",
+            "generic_tough_pla",
+            "generic_tpu",
+            "imade3d_petg_175",
+            "imade3d_pla_175",
+            "innofill_innoflex60_175",
+			"leapfrog_abs_natural",
+			"leapfrog_epla_natural",
+			"leapfrog_pva_natural",
+            "octofiber_pla",
+            "polyflex_pla",
+            "polymax_pla",
+            "polyplus_pla",
+            "polywood_pla",
+            "structur3d_dap100silicone",
+            "tizyx_abs",
+            "tizyx_flex",
+            "tizyx_petg",
+            "tizyx_pla",
+            "tizyx_pla_bois",
+            "tizyx_pva",
+            "ultimaker_abs_black",
+            "ultimaker_abs_blue",
+            "ultimaker_abs_green",
+            "ultimaker_abs_grey",
+            "ultimaker_abs_orange",
+            "ultimaker_abs_pearl-gold",
+            "ultimaker_abs_red",
+            "ultimaker_abs_silver-metallic",
+            "ultimaker_abs_white",
+            "ultimaker_abs_yellow",
+            "ultimaker_bam",
+            "ultimaker_cpe_black",
+            "ultimaker_cpe_blue",
+            "ultimaker_cpe_dark-grey",
+            "ultimaker_cpe_green",
+            "ultimaker_cpe_light-grey",
+            "ultimaker_cpe_plus_black",
+            "ultimaker_cpe_plus_transparent",
+            "ultimaker_cpe_plus_white",
+            "ultimaker_cpe_red",
+            "ultimaker_cpe_transparent",
+            "ultimaker_cpe_white",
+            "ultimaker_cpe_yellow",
+            "ultimaker_nylon_black",
+            "ultimaker_nylon_transparent",
+            "ultimaker_pc_black",
+            "ultimaker_pc_transparent",
+            "ultimaker_pc_white",
+            "ultimaker_pla_black",
+            "ultimaker_pla_blue",
+            "ultimaker_pla_green",
+            "ultimaker_pla_magenta",
+            "ultimaker_pla_orange",
+            "ultimaker_pla_pearl-white",
+            "ultimaker_pla_red",
+            "ultimaker_pla_silver-metallic",
+            "ultimaker_pla_transparent",
+            "ultimaker_pla_white",
+            "ultimaker_pla_yellow",
+            "ultimaker_pp_transparent",
+            "ultimaker_pva",
+            "ultimaker_tough_pla_black",
+            "ultimaker_tough_pla_green",
+            "ultimaker_tough_pla_red",
+            "ultimaker_tough_pla_white",
+            "ultimaker_tpu_black",
+            "ultimaker_tpu_blue",
+            "ultimaker_tpu_red",
+            "ultimaker_tpu_white",
+            "verbatim_bvoh_175",
+            "Vertex_Delta_ABS",
+            "Vertex_Delta_PET",
+            "Vertex_Delta_PLA",
+            "Vertex_Delta_PLA_Glitter",
+            "Vertex_Delta_PLA_Mat",
+            "Vertex_Delta_PLA_Satin",
+            "Vertex_Delta_PLA_Wood",
+            "Vertex_Delta_TPU",
+            "zyyx_pro_flex",
+            "zyyx_pro_pla"
+        ]
+    },
+    "overrides": {
+		"machine_name": { "default_value": "Rigid3D Base Printer" },
+
+		"material_diameter": { "default_value": 1.75 },
+
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 500 },
+        "machine_max_feedrate_e": { "value": 500 },
+
+        "machine_max_acceleration_x": { "value": 600 },
+        "machine_max_acceleration_y": { "value": 600 },
+        "machine_max_acceleration_z": { "value": 100 },
+        "machine_max_acceleration_e": { "value": 600 },
+        "machine_acceleration": { "value": 600 },
+
+        "machine_max_jerk_xy": { "value": 10.0 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_max_jerk_e": { "value": 5 },
+
+        "acceleration_print": { "value": 600 },
+		
+        "acceleration_travel": { "value": 600 },
+        "acceleration_travel_layer_0": { "value": "acceleration_travel" },
+        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
+
+        "jerk_print": { "value": 10 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+
+        "acceleration_enabled": { "value": false },
+        "jerk_enabled": { "value": false },
+
+        "speed_print": { "value": 40.0 } ,
+        "speed_infill": { "value": "speed_print" },
+        "speed_wall": { "value": "speed_print / 2" },
+        "speed_wall_0": { "value": "speed_print" },
+        "speed_wall_x": { "value": "speed_print" },
+        "speed_topbottom": { "value": "speed_print" },
+        "speed_roofing": { "value": "speed_topbottom" },
+        "speed_travel": { "value": "80.0" },
+        "speed_layer_0": { "value": 15.0 },
+        "speed_print_layer_0": { "value": "speed_layer_0" },
+        "speed_travel_layer_0": { "value": "speed_travel" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_z_hop": { "value": 5 },
+
+        "skirt_brim_speed": { "value": "speed_layer_0" },
+
+        "line_width": { "value": "machine_nozzle_size" },
+
+        "optimize_wall_printing_order": { "value": "True" },
+
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_flow": { "value": 100 },
+
+        "z_seam_type": { "value": "'shortest'" },
+        "z_seam_corner": { "value": "'z_seam_corner_inner'" },
+        
+        "infill_sparse_density": { "value": "15" },
+		"wall_0_wipe_dist": { "value": 0.0 },
+
+        "retraction_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+			"value":30,
+            "maximum_value": 200
+        },
+        "retraction_retract_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+			"value":"retraction_speed",
+            "maximum_value": 200
+        },
+        "retraction_prime_speed": {
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+			"value":"retraction_speed / 2",
+            "maximum_value": 200
+        },
+        
+        "retraction_hop_enabled": { "value": "False" },
+        "retraction_hop": { "value": 0.2 },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
+		"retraction_amount" : { "default_value": 1.0},
+        "retraction_combing_max_distance": { "value": 30 },
+        "travel_avoid_other_parts": { "value": true },
+        "travel_avoid_supports": { "value": true },
+        "travel_retract_before_outer_wall": { "value": false },
+		
+        "small_hole_max_size": { "value": 4.0 },
+		
+        "retraction_enable": { "value": true },
+        "retraction_count_max": { "value": 5 },
+        "retraction_extrusion_window": { "value": "retraction_amount" },
+        "retraction_min_travel": { "value": 0.5 },
+
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_fan_enabled": { "value": true },
+        "cool_min_layer_time": { "value": 10 },
+
+        "adhesion_type": { "value": "'skirt'" },
+        "skirt_gap": { "value": 5.0 },
+        "skirt_line_count": { "value": 2 },
+
+        "adaptive_layer_height_variation": { "value": 0.04 },
+        "adaptive_layer_height_variation_step": { "value": 0.04 },
+
+        "meshfix_maximum_resolution": { "value": "0.05" },
+        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
+
+        "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
+        "support_pattern": { "value": "'zigzag'" },
+        "support_infill_rate": { "value": "0 if support_tree_enable else 20" },
+        "support_use_towers": { "value": false },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" },
+        "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
+        "support_wall_count": { "value": 1 },
+        "support_brim_enable": { "value": true },
+        "support_brim_width": { "value": 4 },
+
+        "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "layer_height * 4" },
+        "support_interface_density": { "value": 70 },
+        "support_interface_pattern": { "value": "'grid'" },
+        "support_interface_skip_height": { "value": 0.2 },
+        "minimum_support_area": { "value": 5 },
+        "minimum_interface_area": { "value": 10 },
+        "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
+        "wall_thickness": {"value": "line_width * 2" },
+		
+		"layer_height_0": {"value": 0.2}
+
+    }
+}

resources/definitions/rigid3d_hobby.def.json

@@ -1,40 +1,159 @@
 {
     "name": "Rigid3D Hobby",
     "version": 2,
-    "inherits": "fdmprinter",
+    "inherits": "rigid3d_base",
     "metadata": {
 		"visible": true,
-        "author": "Ultimaker",
+		"quality_definition": "rigid3d_base",	
-        "manufacturer": "Rigid3D",
+		"preferred_quality_type": "standard",
-        "file_formats": "text/x-gcode",
+
-        "platform_offset": [ 0, 0, 0],
+        "preferred_material": "generic_pla_175",
-        "machine_extruder_trains":
+        "exclude_materials": [
-        {
+			"chromatik_pla",
-            "0": "rigid3d_hobby_extruder_0"
+            "dsm_arnitel2045_175",
-        }
+            "dsm_novamid1070_175",
+			"emotiontech_abs",
+			"emotiontech_asax",
+			"emotiontech_hips",
+			"emotiontech_petg",
+			"emotiontech_pla",
+			"emotiontech_pva-m",
+			"emotiontech_pva-oks",
+			"emotiontech_pva-s",
+			"emotiontech_tpu98a",
+            "fabtotum_abs",
+            "fabtotum_nylon",
+            "fabtotum_pla",
+            "fabtotum_tpu",
+            "fiberlogy_hd_pla",
+            "filo3d_pla",
+            "filo3d_pla_green",
+            "filo3d_pla_red",
+            "generic_abs",
+			"generic_abs_175",
+            "generic_bam",
+            "generic_cffcpe",
+            "generic_cffpa",
+            "generic_cpe",
+			"generic_cpe_175",
+            "generic_cpe_plus",
+            "generic_gffcpe",
+            "generic_gffpa",
+            "generic_hips",
+			"generic_hips_175",
+            "generic_nylon",
+			"generic_nylon_175",
+            "generic_pc",
+			"generic_pc_175",
+            "generic_petg",
+			"generic_petg_175",
+            "generic_pla",
+            "generic_pp",
+            "generic_pva",
+			"generic_pva_175",
+            "generic_tough_pla",
+            "generic_tpu",
+			"generic_tpu_175",
+            "imade3d_petg_175",
+            "imade3d_pla_175",
+            "innofill_innoflex60_175",
+			"leapfrog_abs_natural",
+			"leapfrog_epla_natural",
+			"leapfrog_pva_natural",
+            "octofiber_pla",
+            "polyflex_pla",
+            "polymax_pla",
+            "polyplus_pla",
+            "polywood_pla",
+            "structur3d_dap100silicone",
+            "tizyx_abs",
+            "tizyx_flex",
+            "tizyx_petg",
+            "tizyx_pla",
+            "tizyx_pla_bois",
+            "tizyx_pva",
+            "ultimaker_abs_black",
+            "ultimaker_abs_blue",
+            "ultimaker_abs_green",
+            "ultimaker_abs_grey",
+            "ultimaker_abs_orange",
+            "ultimaker_abs_pearl-gold",
+            "ultimaker_abs_red",
+            "ultimaker_abs_silver-metallic",
+            "ultimaker_abs_white",
+            "ultimaker_abs_yellow",
+            "ultimaker_bam",
+            "ultimaker_cpe_black",
+            "ultimaker_cpe_blue",
+            "ultimaker_cpe_dark-grey",
+            "ultimaker_cpe_green",
+            "ultimaker_cpe_light-grey",
+            "ultimaker_cpe_plus_black",
+            "ultimaker_cpe_plus_transparent",
+            "ultimaker_cpe_plus_white",
+            "ultimaker_cpe_red",
+            "ultimaker_cpe_transparent",
+            "ultimaker_cpe_white",
+            "ultimaker_cpe_yellow",
+            "ultimaker_nylon_black",
+            "ultimaker_nylon_transparent",
+            "ultimaker_pc_black",
+            "ultimaker_pc_transparent",
+            "ultimaker_pc_white",
+            "ultimaker_pla_black",
+            "ultimaker_pla_blue",
+            "ultimaker_pla_green",
+            "ultimaker_pla_magenta",
+            "ultimaker_pla_orange",
+            "ultimaker_pla_pearl-white",
+            "ultimaker_pla_red",
+            "ultimaker_pla_silver-metallic",
+            "ultimaker_pla_transparent",
+            "ultimaker_pla_white",
+            "ultimaker_pla_yellow",
+            "ultimaker_pp_transparent",
+            "ultimaker_pva",
+            "ultimaker_tough_pla_black",
+            "ultimaker_tough_pla_green",
+            "ultimaker_tough_pla_red",
+            "ultimaker_tough_pla_white",
+            "ultimaker_tpu_black",
+            "ultimaker_tpu_blue",
+            "ultimaker_tpu_red",
+            "ultimaker_tpu_white",
+            "verbatim_bvoh_175",
+            "Vertex_Delta_ABS",
+            "Vertex_Delta_PET",
+            "Vertex_Delta_PLA",
+            "Vertex_Delta_PLA_Glitter",
+            "Vertex_Delta_PLA_Mat",
+            "Vertex_Delta_PLA_Satin",
+            "Vertex_Delta_PLA_Wood",
+            "Vertex_Delta_TPU",
+            "zyyx_pro_flex",
+            "zyyx_pro_pla"
+        ]		
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Rigid3D Hobby" },
+
+		"machine_heated_bed": { "default_value": false },
+		
+		"machine_width": { "default_value": 150 },
+        "machine_depth": { "default_value": 150 },
+        "machine_height": { "default_value": 150 },
+		
+		"machine_center_is_zero": { "default_value": false },
+		
+		"machine_start_gcode": {"default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n"},
+        "machine_end_gcode": {"default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n"},
+		
+		"machine_head_with_fans_polygon": { 
+            "default_value": [
+                 [ -16, -30], [ -16, 45], [ 16, -30], [ 16, 45]
+				 ] 
         },
 
-    "overrides": {
+        "gantry_height": { "value": 20 }
-        "machine_head_with_fans_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] },
-        "prime_tower_size": { "default_value": 8.660254037844387 },
-        "skirt_gap": { "default_value": 5.0 },
-        "cool_min_layer_time": { "default_value": 15 },
-        "support_pattern": { "default_value": "grid" },
-        "layer_height_0": { "default_value": 0.25 },
-        "skirt_line_count": { "default_value": 2 },
-        "support_angle": { "default_value": 45 },
-        "retraction_speed": { "default_value": 80 },
-        "wall_thickness": { "default_value": 0.8 },
-        "retraction_amount": { "default_value": 2 },
-        "layer_height": { "default_value": 0.2 },
-        "speed_print": { "default_value": 30 },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_heated_bed": { "default_value": false },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_height": { "default_value": 150 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_depth": { "default_value": 150 },
-        "machine_width": { "default_value": 150 },
-        "machine_name": { "default_value": "Rigid3D Hobby" }
     }
 }

resources/definitions/rigid3d_mucit.def.json

@@ -1,142 +1,161 @@
 {
     "name": "Rigid3D Mucit",
     "version": 2,
-    "inherits": "fdmprinter",
+    "inherits": "rigid3d_base",
     "metadata": {
 		"visible": true,
-        "author": "Rigid3D",
+		"quality_definition": "rigid3d_base",	
-        "manufacturer": "Rigid3D",
+		"preferred_quality_type": "standard",
-        "has_materials": false,
-        "file_formats": "text/x-gcode",
 		"platform": "rigid3d_mucit_platform.stl",
         "platform_offset": [ 0, -19, 0],
-        "preferred_quality_type": "draft",
+
-        "machine_extruder_trains":
+        "preferred_material": "generic_pla_175",
-        {
+        "exclude_materials": [
-            "0": "rigid3d_mucit_extruder_0"
+			"chromatik_pla",
-        }
+            "dsm_arnitel2045_175",
+            "dsm_novamid1070_175",
+			"emotiontech_abs",
+			"emotiontech_asax",
+			"emotiontech_hips",
+			"emotiontech_petg",
+			"emotiontech_pla",
+			"emotiontech_pva-m",
+			"emotiontech_pva-oks",
+			"emotiontech_pva-s",
+			"emotiontech_tpu98a",
+            "fabtotum_abs",
+            "fabtotum_nylon",
+            "fabtotum_pla",
+            "fabtotum_tpu",
+            "fiberlogy_hd_pla",
+            "filo3d_pla",
+            "filo3d_pla_green",
+            "filo3d_pla_red",
+            "generic_abs",
+			"generic_abs_175",
+            "generic_bam",
+            "generic_cffcpe",
+            "generic_cffpa",
+            "generic_cpe",
+			"generic_cpe_175",
+            "generic_cpe_plus",
+            "generic_gffcpe",
+            "generic_gffpa",
+            "generic_hips",
+			"generic_hips_175",
+            "generic_nylon",
+			"generic_nylon_175",
+            "generic_pc",
+			"generic_pc_175",
+            "generic_petg",
+			"generic_petg_175",
+            "generic_pla",
+            "generic_pp",
+            "generic_pva",
+			"generic_pva_175",
+            "generic_tough_pla",
+            "generic_tpu",
+			"generic_tpu_175",
+            "imade3d_petg_175",
+            "imade3d_pla_175",
+            "innofill_innoflex60_175",
+			"leapfrog_abs_natural",
+			"leapfrog_epla_natural",
+			"leapfrog_pva_natural",
+            "octofiber_pla",
+            "polyflex_pla",
+            "polymax_pla",
+            "polyplus_pla",
+            "polywood_pla",
+            "structur3d_dap100silicone",
+            "tizyx_abs",
+            "tizyx_flex",
+            "tizyx_petg",
+            "tizyx_pla",
+            "tizyx_pla_bois",
+            "tizyx_pva",
+            "ultimaker_abs_black",
+            "ultimaker_abs_blue",
+            "ultimaker_abs_green",
+            "ultimaker_abs_grey",
+            "ultimaker_abs_orange",
+            "ultimaker_abs_pearl-gold",
+            "ultimaker_abs_red",
+            "ultimaker_abs_silver-metallic",
+            "ultimaker_abs_white",
+            "ultimaker_abs_yellow",
+            "ultimaker_bam",
+            "ultimaker_cpe_black",
+            "ultimaker_cpe_blue",
+            "ultimaker_cpe_dark-grey",
+            "ultimaker_cpe_green",
+            "ultimaker_cpe_light-grey",
+            "ultimaker_cpe_plus_black",
+            "ultimaker_cpe_plus_transparent",
+            "ultimaker_cpe_plus_white",
+            "ultimaker_cpe_red",
+            "ultimaker_cpe_transparent",
+            "ultimaker_cpe_white",
+            "ultimaker_cpe_yellow",
+            "ultimaker_nylon_black",
+            "ultimaker_nylon_transparent",
+            "ultimaker_pc_black",
+            "ultimaker_pc_transparent",
+            "ultimaker_pc_white",
+            "ultimaker_pla_black",
+            "ultimaker_pla_blue",
+            "ultimaker_pla_green",
+            "ultimaker_pla_magenta",
+            "ultimaker_pla_orange",
+            "ultimaker_pla_pearl-white",
+            "ultimaker_pla_red",
+            "ultimaker_pla_silver-metallic",
+            "ultimaker_pla_transparent",
+            "ultimaker_pla_white",
+            "ultimaker_pla_yellow",
+            "ultimaker_pp_transparent",
+            "ultimaker_pva",
+            "ultimaker_tough_pla_black",
+            "ultimaker_tough_pla_green",
+            "ultimaker_tough_pla_red",
+            "ultimaker_tough_pla_white",
+            "ultimaker_tpu_black",
+            "ultimaker_tpu_blue",
+            "ultimaker_tpu_red",
+            "ultimaker_tpu_white",
+            "verbatim_bvoh_175",
+            "Vertex_Delta_ABS",
+            "Vertex_Delta_PET",
+            "Vertex_Delta_PLA",
+            "Vertex_Delta_PLA_Glitter",
+            "Vertex_Delta_PLA_Mat",
+            "Vertex_Delta_PLA_Satin",
+            "Vertex_Delta_PLA_Wood",
+            "Vertex_Delta_TPU",
+            "zyyx_pro_flex",
+            "zyyx_pro_pla"
+        ]		
     },
     "overrides": {
         "machine_name": { "default_value": "Rigid3D Mucit" },
-        "z_seam_type": {
+
-            "default_value": "random"
+		"machine_heated_bed": { "default_value": false },
+		
+		"machine_width": { "default_value": 150 },
+        "machine_depth": { "default_value": 150 },
+        "machine_height": { "default_value": 150 },
+		
+		"machine_center_is_zero": { "default_value": false },
+		
+		"machine_start_gcode": {"default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n"},
+        "machine_end_gcode": {"default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n"},
+		
+		"machine_head_with_fans_polygon": { 
+            "default_value": [
+                 [ -20, 102], [ -20, -45], [ 45, -45], [ 45, 102]
+				 ] 
         },
-        "machine_heated_bed": {
+
-            "default_value": false
+        "gantry_height": { "value": 20 }
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "default_value": 0.8
-        },
-        "top_bottom_thickness": {
-            "default_value": 0.8
-        },
-        "xy_offset": {
-             "default_value": -0.2
-        },
-        "material_print_temperature": {
-            "value": "205"
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "speed_layer_0": {
-            "value": "15"
-        },
-        "speed_travel": {
-            "value": "100"
-        },
-        "support_enable": {
-            "default_value": false
-        },
-        "infill_sparse_density": {
-            "default_value": 15
-        },
-        "infill_pattern": {
-            "value": "'lines'"
-        },
-        "retraction_amount": {
-            "default_value": 1
-        },
-        "machine_width": {
-            "default_value": 150
-        },
-        "machine_height": {
-            "default_value": 150
-        },
-        "machine_depth": {
-            "default_value": 150
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap"
-        },
-        "cool_fan_enabled": {
-            "default_value": true
-        },
-        "cool_fan_speed": {
-            "value": "100"
-        },
-        "cool_fan_full_at_height": {
-            "value": "0.5"
-        },
-        "support_z_distance": {
-            "default_value": 0.2
-        },
-        "support_interface_enable": {
-            "default_value": true
-        },
-        "support_interface_height": {
-            "default_value": 0.8
-        },
-        "support_interface_density": {
-            "default_value": 70
-        },
-        "support_interface_pattern": {
-            "default_value": "grid"
-        },
-        "fill_outline_gaps": {
-            "default_value": true
-        },
-        "ironing_enabled": {
-            "default_value": true
-        },
-        "ironing_only_highest_layer": {
-            "default_value": true
-        },
-        "material_initial_print_temperature": {
-            "value": "205"
-        },
-        "optimize_wall_printing_order": {
-            "default_value": true
-        },
-        "retraction_speed": {
-            "value": "40"
-        },
-        "roofing_layer_count": {
-            "value": "1"
-        },
-        "speed_equalize_flow_enabled": {
-            "default_value": true
-        },
-        "speed_topbottom": {
-            "value": "40"
-        },
-        "speed_travel_layer_0": {
-            "value": "15"
-        },
-        "speed_wall_0": {
-            "value": "30"
-        },
-        "adhesion_type": {
-            "default_value": "skirt"
-        },
-        "machine_start_gcode": {
-            "default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n"
-        },
-        "machine_end_gcode": {
-            "default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n"
-        }
     }
 }

resources/definitions/rigid3d_zero.def.json

@@ -1,44 +1,159 @@
 {
     "name": "Rigid3D Zero",
     "version": 2,
-    "inherits": "fdmprinter",
+    "inherits": "rigid3d_base",
     "metadata": {
 		"visible": true,
-        "author": "Ultimaker",
+		"quality_definition": "rigid3d_base",	
-        "manufacturer": "Rigid3D",
+		"preferred_quality_type": "standard",
-        "file_formats": "text/x-gcode",
+
-        "platform_offset": [ 0, 0, 0],
+        "preferred_material": "generic_pla_175",
-        "machine_extruder_trains":
+        "exclude_materials": [
-        {
+			"chromatik_pla",
-            "0": "rigid3d_zero_extruder_0"
+            "dsm_arnitel2045_175",
-        }
+            "dsm_novamid1070_175",
+			"emotiontech_abs",
+			"emotiontech_asax",
+			"emotiontech_hips",
+			"emotiontech_petg",
+			"emotiontech_pla",
+			"emotiontech_pva-m",
+			"emotiontech_pva-oks",
+			"emotiontech_pva-s",
+			"emotiontech_tpu98a",
+            "fabtotum_abs",
+            "fabtotum_nylon",
+            "fabtotum_pla",
+            "fabtotum_tpu",
+            "fiberlogy_hd_pla",
+            "filo3d_pla",
+            "filo3d_pla_green",
+            "filo3d_pla_red",
+            "generic_abs",
+			"generic_abs_175",
+            "generic_bam",
+            "generic_cffcpe",
+            "generic_cffpa",
+            "generic_cpe",
+			"generic_cpe_175",
+            "generic_cpe_plus",
+            "generic_gffcpe",
+            "generic_gffpa",
+            "generic_hips",
+			"generic_hips_175",
+            "generic_nylon",
+			"generic_nylon_175",
+            "generic_pc",
+			"generic_pc_175",
+            "generic_petg",
+			"generic_petg_175",
+            "generic_pla",
+            "generic_pp",
+            "generic_pva",
+			"generic_pva_175",
+            "generic_tough_pla",
+            "generic_tpu",
+			"generic_tpu_175",
+            "imade3d_petg_175",
+            "imade3d_pla_175",
+            "innofill_innoflex60_175",
+			"leapfrog_abs_natural",
+			"leapfrog_epla_natural",
+			"leapfrog_pva_natural",
+            "octofiber_pla",
+            "polyflex_pla",
+            "polymax_pla",
+            "polyplus_pla",
+            "polywood_pla",
+            "structur3d_dap100silicone",
+            "tizyx_abs",
+            "tizyx_flex",
+            "tizyx_petg",
+            "tizyx_pla",
+            "tizyx_pla_bois",
+            "tizyx_pva",
+            "ultimaker_abs_black",
+            "ultimaker_abs_blue",
+            "ultimaker_abs_green",
+            "ultimaker_abs_grey",
+            "ultimaker_abs_orange",
+            "ultimaker_abs_pearl-gold",
+            "ultimaker_abs_red",
+            "ultimaker_abs_silver-metallic",
+            "ultimaker_abs_white",
+            "ultimaker_abs_yellow",
+            "ultimaker_bam",
+            "ultimaker_cpe_black",
+            "ultimaker_cpe_blue",
+            "ultimaker_cpe_dark-grey",
+            "ultimaker_cpe_green",
+            "ultimaker_cpe_light-grey",
+            "ultimaker_cpe_plus_black",
+            "ultimaker_cpe_plus_transparent",
+            "ultimaker_cpe_plus_white",
+            "ultimaker_cpe_red",
+            "ultimaker_cpe_transparent",
+            "ultimaker_cpe_white",
+            "ultimaker_cpe_yellow",
+            "ultimaker_nylon_black",
+            "ultimaker_nylon_transparent",
+            "ultimaker_pc_black",
+            "ultimaker_pc_transparent",
+            "ultimaker_pc_white",
+            "ultimaker_pla_black",
+            "ultimaker_pla_blue",
+            "ultimaker_pla_green",
+            "ultimaker_pla_magenta",
+            "ultimaker_pla_orange",
+            "ultimaker_pla_pearl-white",
+            "ultimaker_pla_red",
+            "ultimaker_pla_silver-metallic",
+            "ultimaker_pla_transparent",
+            "ultimaker_pla_white",
+            "ultimaker_pla_yellow",
+            "ultimaker_pp_transparent",
+            "ultimaker_pva",
+            "ultimaker_tough_pla_black",
+            "ultimaker_tough_pla_green",
+            "ultimaker_tough_pla_red",
+            "ultimaker_tough_pla_white",
+            "ultimaker_tpu_black",
+            "ultimaker_tpu_blue",
+            "ultimaker_tpu_red",
+            "ultimaker_tpu_white",
+            "verbatim_bvoh_175",
+            "Vertex_Delta_ABS",
+            "Vertex_Delta_PET",
+            "Vertex_Delta_PLA",
+            "Vertex_Delta_PLA_Glitter",
+            "Vertex_Delta_PLA_Mat",
+            "Vertex_Delta_PLA_Satin",
+            "Vertex_Delta_PLA_Wood",
+            "Vertex_Delta_TPU",
+            "zyyx_pro_flex",
+            "zyyx_pro_pla"
+        ]		
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Rigid3D Zero" },
+
+		"machine_heated_bed": { "default_value": false },
+		
+		"machine_width": { "default_value": 250 },
+        "machine_depth": { "default_value": 250 },
+        "machine_height": { "default_value": 190 },
+		
+		"machine_center_is_zero": { "default_value": false },
+		
+		"machine_start_gcode": {"default_value": "  ; -- START GCODE --\n  G21\n  G28 ; Home extruder\n  G29 ; Autolevel bed\n  M107 ; Turn off fan\n  G90 ; Absolute positioning\n  M82 ; Extruder in absolute mode\n  G92 E0 ; Reset extruder position\n  ; -- end of START GCODE --\n\n"},
+        "machine_end_gcode": {"default_value": "  ; -- END GCODE --\n  G1 X0 Y230 ; Get extruder out of way.\n  M107 ; Turn off fan\n  G91 ; Relative positioning\n  G0 Z20 ; Lift extruder up\n  T0\n  G1 E-1 ; Reduce filament pressure\n  M104 T0 S0 ; Turn ectruder heater off\n  G90 ; Absolute positioning\n  G92 E0 ; Reset extruder position\n  M140 S0 ; Disable heated bed\n  M84 ; Turn steppers off\n  ; -- end of END GCODE --\n"},
+		
+		"machine_head_with_fans_polygon": { 
+            "default_value": [
+                 [ -40, -15], [ -40, 60], [ 30, -15], [ 30, 60]
+				 ] 
         },
 
-    "overrides": {
+        "gantry_height": { "value": 20 }
-        "machine_start_gcode": {
-            "default_value": "  ; -- START GCODE --\n  G21\n  G28 ; Home extruder\n  G29 ; Autolevel bed\n  M107 ; Turn off fan\n  G90 ; Absolute positioning\n  M82 ; Extruder in absolute mode\n  G92 E0 ; Reset extruder position\n  ; -- end of START GCODE --\n\n"
-        },
-        "machine_end_gcode": {
-            "default_value": "  ; -- END GCODE --\n  G1 X0 Y230 ; Get extruder out of way.\n  M107 ; Turn off fan\n  G91 ; Relative positioning\n  G0 Z20 ; Lift extruder up\n  T0\n  G1 E-1 ; Reduce filament pressure\n  M104 T0 S0 ; Turn ectruder heater off\n  G90 ; Absolute positioning\n  G92 E0 ; Reset extruder position\n  M140 S0 ; Disable heated bed\n  M84 ; Turn steppers off\n  ; -- end of END GCODE --\n"
-        },
-        "machine_head_with_fans_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] },
-        "support_pattern": { "default_value": "grid" },
-        "cool_min_layer_time": { "default_value": 10 },
-        "support_angle": { "default_value": 45 },
-        "prime_tower_size": { "default_value": 7.745966692414834 },
-        "skirt_line_count": { "default_value": 2 },
-        "layer_height_0": { "default_value": 0.25 },
-        "wall_thickness": { "default_value": 0.8 },
-        "retraction_amount": { "default_value": 1.5 },
-        "skirt_gap": { "default_value": 5.0 },
-        "layer_height": { "default_value": 0.25 },
-        "speed_print": { "default_value": 30 },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_height": { "default_value": 190 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_depth": { "default_value": 250 },
-        "machine_width": { "default_value": 250 },
-        "machine_name": { "default_value": "Rigid3D Zero" }
     }
 }

resources/definitions/rigid3d_zero2.def.json

@@ -1,117 +1,34 @@
 {
     "name": "Rigid3D Zero2",
     "version": 2,
-    "inherits": "fdmprinter",
+    "inherits": "rigid3d_base",
     "metadata": {
 		"visible": true,
-        "author": "Rigid3D",
+		"quality_definition": "rigid3d_base",	
-        "manufacturer": "Rigid3D",
+		"preferred_quality_type": "standard",
-        "has_materials": false,
+
-        "file_formats": "text/x-gcode",
+		"platform": "rigid3d_zero2_platform.stl"			
-        "platform": "rigid3d_zero2_platform.stl",
-        "platform_offset": [ 5, 0, -35],
-        "machine_extruder_trains":
-        {
-            "0": "rigid3d_zero2_extruder_0"
-        }
     },
     "overrides": {
         "machine_name": { "default_value": "Rigid3D Zero2" },
+
+		"machine_heated_bed": { "default_value": true },
+		
+		"machine_width": { "default_value": 200 },
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 192 },
+		
+		"machine_center_is_zero": { "default_value": false },
+		
+		"machine_start_gcode": {"default_value": "; -- START GCODE --\nG21 ; mm olculer\nG28 ; Eksenleri sifirla\nM420 S1 ; Yazilim destekli tabla seviyeleme\nM107 ; Fani kapat\nG90 ; Mutlak konumlama\nG1 Z5 F180 ; Z eksenini 5mm yukselt\nG1 X30 Y30 F3000 ; Konuma git\nM82 ; Ekstruder mutlak mod\nG92 E0 ; Ekstruder konumu sifirla\n; -- end of START GCODE --"},
+        "machine_end_gcode": {"default_value": "; -- END GCODE --\nG1 X0 Y180 ; Konuma git\nM107 ; Fani kapat\nG91 ; Goreceli konumlama\nG0 Z20 ; Tablayi alcalt\nT0\nG1 E-2 ; Filaman basincini dusur\nM104 T0 S0 ; Ekstruder isiticiyi kapat\nG90 ; Mutlak konumlama\nG92 E0 ; Ekstruder konumu sifirla\nM140 S0 ; Tabla isiticiyi kapat\nM84 ; Motorlari durdur\nM300 S2093 P150 ; Baski sonu melodisi\nM300 S2637 P150\nM300 S3135 P150\nM300 S4186 P150\nM300 S3135 P150\nM300 S2637 P150\nM300 S2793 P150\nM300 S2349 P150\nM300 S1975 P150\nM300 S2093 P450\n; -- end of END GCODE --\n"},
+		
 		"machine_head_with_fans_polygon": { 
-            "default_value": [[ 30, 30], [ 30, 70], [ 30, 70], [ 30, 30]] 
+            "default_value": [
+                 [ -30, 65], [ -30, -30], [ 30, -30], [ 30, 65]
+				 ] 
         },
-        "z_seam_type": {
+
-            "default_value": "random"
+        "gantry_height": { "value": 25 }
-        },
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "default_value": 0.8
-        },
-        "top_bottom_thickness": {
-            "default_value": 0.8
-        },
-        "xy_offset": {
-             "default_value": -0.2
-        },
-        "material_print_temperature": {
-            "value": 235
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "speed_layer_0": {
-            "value": 15
-        },
-        "speed_travel": {
-            "value": 100
-        },
-        "support_enable": {
-            "default_value": false
-        },
-        "infill_sparse_density": {
-            "default_value": 15
-        },
-        "infill_pattern": {
-            "value": "'lines'"
-        },
-        "retraction_amount": {
-            "default_value": 1
-        },
-        "machine_width": {
-            "default_value": 200
-        },
-        "machine_height": {
-            "default_value": 200
-        },
-        "machine_depth": {
-            "default_value": 200
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "gantry_height": {
-            "value": "25"
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap"
-        },
-        "cool_fan_enabled": {
-            "default_value": false
-        },
-        "cool_fan_speed": {
-            "value": 50
-        },
-        "cool_fan_full_at_height": {
-            "value": 1.0
-        },
-        "support_z_distance": {
-            "default_value": 0.2
-        },
-        "support_interface_enable": {
-            "default_value": true
-        },        
-        "support_interface_height": {
-            "default_value": 0.8
-        }, 
-        "support_interface_density": {
-            "default_value": 70
-        },        
-        "support_interface_pattern": {
-            "default_value": "grid"
-        },        
-        "machine_start_gcode": {
-            "default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG1 Z-5 F180;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n"
-        },
-        "machine_end_gcode": {
-            "default_value": "G1 X0 Y180 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off\n"
-        }
     }
 }

resources/extruders/dagoma_discoeasy200_extruder_0.def.json

@@ -16,6 +16,12 @@
         },
         "material_diameter": {
             "default_value": 1.75
+        },
+        "machine_extruder_start_code": {
+            "default_value": "\n;Start T0\nG92 E0\nG1 E-{retraction_amount} F10000\nG92 E0G1 E1.5 F3000\nG1 E-60 F10000\nG92 E0\n"         
+        },
+        "machine_extruder_end_code": {
+            "default_value": "\nG92 E0\nG1 E{retraction_amount} F3000\nG92 E0\nG1 E60 F3000\nG92 E0\nG1 E-{retraction_amount} F5000\n;End T0\n\n"
         }
     }
 }

resources/extruders/dagoma_discoeasy200_extruder_1.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "dagoma_discoeasy200",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_extruder_start_code": {
+            "default_value": "\n;Start T1\nG92 E0\nG1 E-{retraction_amount} F10000\nG92 E0G1 E1.5 F3000\nG1 E-60 F10000\nG92 E0\n"         
+        },
+        "machine_extruder_end_code": {
+            "default_value": "\nG92 E0\nG1 E{retraction_amount} F3000\nG92 E0\nG1 E60 F3000\nG92 E0\nG1 E-{retraction_amount} F5000\n;End T1\n\n"
+        }
+    }
+}

resources/extruders/dagoma_discoultimate_extruder_0.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "dagoma_discoultimate",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_extruder_start_code": {
+            "default_value": "\n;Start T0\nG92 E0\nG1 E-{retraction_amount} F10000\nG92 E0G1 E1.5 F3000\nG1 E-60 F10000\nG92 E0\n"         
+        },
+        "machine_extruder_end_code": {
+            "default_value": "\nG92 E0\nG1 E{retraction_amount} F3000\nG92 E0\nG1 E60 F3000\nG92 E0\nG1 E-{retraction_amount} F5000\n;End T0\n\n"
+        }
+    }
+}

resources/extruders/dagoma_discoultimate_extruder_1.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "dagoma_discoultimate",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_extruder_start_code": {
+            "default_value": "\n;Start T1\nG92 E0\nG1 E-{retraction_amount} F10000\nG92 E0G1 E1.5 F3000\nG1 E-60 F10000\nG92 E0\n"         
+        },
+        "machine_extruder_end_code": {
+            "default_value": "\nG92 E0\nG1 E{retraction_amount} F3000\nG92 E0\nG1 E60 F3000\nG92 E0\nG1 E-{retraction_amount} F5000\n;End T1\n\n"
+        }
+    }
+}

resources/extruders/dxu_extruder1.def.json

@@ -0,0 +1,20 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "dxu",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 }
+    }
+}

resources/extruders/dxu_extruder2.def.json

@@ -0,0 +1,20 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "dxu",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 19.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 }
+    }
+}

resources/extruders/flyingbear_base_extruder_0.def.json

@@ -3,7 +3,7 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "rigid3d",
+        "machine": "flyingbear_base",
         "position": "0"
     },
 
@@ -11,5 +11,6 @@
         "extruder_nr": { "default_value": 0 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
+        
     }
 }

resources/extruders/mbot3d_grid2_extruder_0.def.json

@@ -3,7 +3,7 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "rigid3d_3rdgen",
+        "machine": "mbot3d_grid2plus",
         "position": "0"
     },
 

resources/extruders/mbot3d_grid2_extruder_left.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "mbot3d_grid2plus_dual",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "default_value": 200 },
+        "machine_extruder_start_pos_y": { "default_value": 200 },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "default_value": 200 },
+        "machine_extruder_end_pos_y": { "default_value": 200 }
+    }
+}

resources/extruders/mbot3d_grid2_extruder_right.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "mbot3d_grid2plus_dual",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "default_value": 200 },
+        "machine_extruder_start_pos_y": { "default_value": 200 },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "default_value": 200 },
+        "machine_extruder_end_pos_y": { "default_value": 200 }
+    }
+}

resources/extruders/mbot3d_grid4_extruder_0.def.json

@@ -3,12 +3,14 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "rigid3d_hobby",
+        "machine": "mbot3d_grid4",
         "position": "0"
     },
 
     "overrides": {
-        "extruder_nr": { "default_value": 0 },
+        "extruder_nr": {
+            "default_value": 0
+        },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
     }

resources/extruders/mbot3d_grid4_extruder_left.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "mbot3d_grid4_dual",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "default_value": 200 },
+        "machine_extruder_start_pos_y": { "default_value": 200 },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "default_value": 200 },
+        "machine_extruder_end_pos_y": { "default_value": 200 }
+    }
+}

resources/extruders/mbot3d_grid4_extruder_right.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "mbot3d_grid4_dual",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0 },
+        "machine_nozzle_offset_y": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "default_value": 200 },
+        "machine_extruder_start_pos_y": { "default_value": 200 },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "default_value": 200 },
+        "machine_extruder_end_pos_y": { "default_value": 200 }
+    }
+}

resources/extruders/rigid3d_base_extruder_0.def.json

@@ -3,7 +3,7 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "rigid3d_zero",
+        "machine": "rigid3d_base",
         "position": "0"
     },
 

resources/extruders/rigid3d_mucit_extruder_0.def.json

@@ -1,15 +0,0 @@
-{
-    "version": 2,
-    "name": "Extruder 1",
-    "inherits": "fdmextruder",
-    "metadata": {
-        "machine": "rigid3d_mucit",
-        "position": "0"
-    },
-
-    "overrides": {
-        "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 }
-    }
-}

resources/extruders/rigid3d_zero2_extruder_0.def.json

@@ -1,15 +0,0 @@
-{
-    "version": 2,
-    "name": "Extruder 1",
-    "inherits": "fdmextruder",
-    "metadata": {
-        "machine": "rigid3d_zero2",
-        "position": "0"
-    },
-
-    "overrides": {
-        "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 }
-    }
-}

resources/i18n/cs_CZ/fdmextruder.def.json.po

@@ -0,0 +1,258 @@
+# Cura
+# Copyright (C) 2020 Ultimaker B.V.
+# This file is distributed under the same license as the Cura package.
+# Ruben Dulek <r.dulek@ultimaker.com>, 2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Uranium json setting files\n"
+"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
+"POT-Creation-Date: 2020-02-07 14:19+0000\n"
+"PO-Revision-Date: 2020-02-20 17:30+0100\n"
+"Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: DenyCZ <www.github.com/DenyCZ>\n"
+"Language: cs_CZ\n"
+"X-Generator: Poedit 2.3\n"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings label"
+msgid "Machine"
+msgstr "Zařízení"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Specifické nastavení pro zařízení"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Extruder"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr ""
+"Vytlačovací stroj byl použit pro tisknutí. Toto je používáno při vícenásobné "
+"extruzi."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr "ID trysky"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id description"
+msgid "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\"."
+msgstr "ID trysky pro vytlačovací stroj, např. \"AA 0.4\" nebo \"BB 0.8\"."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size label"
+msgid "Nozzle Diameter"
+msgstr "Průměr trysky"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_size description"
+msgid ""
+"The inner diameter of the nozzle. Change this setting when using a non-"
+"standard nozzle size."
+msgstr ""
+"Vnitřní průměr trysky. Změňte toto nastavení pokud používáte nestandardní "
+"velikost trysky."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "X offset trysky"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "X-ová souřadnice offsetu trysky."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Y offset trysky"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "Y-ová souřadnice offsetu trysky."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "Počáteční G kód extruderu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute when switching to this extruder."
+msgstr "Spusťte g-kód, který se má provést při přepnutí na tento extrudér."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Absolutní počáteční pozice extruderu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs description"
+msgid ""
+"Make the extruder starting position absolute rather than relative to the "
+"last-known location of the head."
+msgstr ""
+"Udělejte počáteční pozici extrudéru absolutně, nikoli relativně k poslednímu "
+"známému umístění hlavy."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "Počáteční pozice extruderu X"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x description"
+msgid "The x-coordinate of the starting position when turning the extruder on."
+msgstr "Souřadnice x počáteční pozice při zapnutí extrudéru."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Počáteční pozice extruderu Y"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y description"
+msgid "The y-coordinate of the starting position when turning the extruder on."
+msgstr "Souřadnice y počáteční pozice při zapnutí extrudéru."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "Ukončující G kód extruderu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute when switching away from this extruder."
+msgstr "Ukončete g-kód, který se má provést při odpojení od tohoto extrudéru."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Absolutní finální pozice extruderu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid ""
+"Make the extruder ending position absolute rather than relative to the last-"
+"known location of the head."
+msgstr ""
+"Koncovou polohu extruderu udělejte absolutně, nikoliv relativně k poslednímu "
+"známému umístění hlavy."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "Konečná pozice X extruderu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x description"
+msgid "The x-coordinate of the ending position when turning the extruder off."
+msgstr "Souřadnice x koncové polohy při vypnutí extrudéru."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Konečná pozice Y extruderu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y description"
+msgid "The y-coordinate of the ending position when turning the extruder off."
+msgstr "Souřadnice y koncové polohy při vypnutí extrudéru."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "První Z pozice extruderu"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z description"
+msgid ""
+"The Z coordinate of the position where the nozzle primes at the start of "
+"printing."
+msgstr "Souřadnice Z pozice, ve které tryska naplní tlak na začátku tisku."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_cooling_fan_number label"
+msgid "Extruder Print Cooling Fan"
+msgstr "Chladič extruderu"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_cooling_fan_number description"
+msgid ""
+"The number of the print cooling fan associated with this extruder. Only "
+"change this from the default value of 0 when you have a different print "
+"cooling fan for each extruder."
+msgstr ""
+"Číslo ventilátoru chlazení tisku přidruženého k tomuto extrudéru. Tuto změnu "
+"změňte pouze z výchozí hodnoty 0, pokud máte pro každý extrudér jiný "
+"ventilátor chlazení tisku."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Adheze topné podložky"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Adheze"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "Primární pozice extruderu X"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x description"
+msgid ""
+"The X coordinate of the position where the nozzle primes at the start of "
+"printing."
+msgstr "Souřadnice X polohy, ve které tryska naplní tlak na začátku tisku."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Primární pozice extruderu Y"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y description"
+msgid ""
+"The Y coordinate of the position where the nozzle primes at the start of "
+"printing."
+msgstr "Souřadnice Y polohy, ve které tryska naplní tlak na začátku tisku."
+
+#: fdmextruder.def.json
+msgctxt "material label"
+msgid "Material"
+msgstr "Materiál"
+
+#: fdmextruder.def.json
+msgctxt "material description"
+msgid "Material"
+msgstr "Materiál"
+
+#: fdmextruder.def.json
+msgctxt "material_diameter label"
+msgid "Diameter"
+msgstr "Průměr"
+
+#: fdmextruder.def.json
+msgctxt "material_diameter description"
+msgid ""
+"Adjusts the diameter of the filament used. Match this value with the "
+"diameter of the used filament."
+msgstr ""
+"Nastavuje průměr použitého vlákna filamentu. Srovnejte tuto hodnotu s "
+"průměrem použitého vlákna."

resources/meshes/flyingbear_platform.obj

@@ -0,0 +1,110 @@
+# WaveFront *.obj file (generated by CINEMA 4D)
+
+v -136.15419006347656 -105 -6.8942437171936
+v -136.15419006347656 -105 -1.10575640201569
+v 136.15419006347656 -105 -1.10575640201569
+v 136.15419006347656 -105 -6.8942437171936
+v -137.5 -103.67865753173828 -6.8942437171936
+v -137.5 103.67865753173828 -6.8942437171936
+v -137.5 103.67865753173828 -1.10575640201569
+v -137.5 -103.67865753173828 -1.10575640201569
+v -136.15419006347656 -103.67865753173828 0
+v -136.15419006347656 103.67865753173828 0
+v 136.15419006347656 103.67865753173828 0
+v 136.15419006347656 -103.67865753173828 0
+v -136.15419006347656 105 -1.10575640201569
+v -136.15419006347656 105 -6.8942437171936
+v 136.15419006347656 105 -6.8942437171936
+v 136.15419006347656 105 -1.10575640201569
+v 137.5 -103.67865753173828 -1.10575640201569
+v 137.5 103.67865753173828 -1.10575640201569
+v 137.5 103.67865753173828 -6.8942437171936
+v 137.5 -103.67865753173828 -6.8942437171936
+v 136.15419006347656 -103.67865753173828 -8
+v 136.15419006347656 103.67865753173828 -8
+v -136.15419006347656 103.67865753173828 -8
+v -136.15419006347656 -103.67865753173828 -8
+# 24 vertices
+
+vn 0 0 1
+vn 1 0 0
+vn 0.27744194865227 0.61657708883286 -0.73678940534592
+vn 0.42486584186554 0.43098142743111 -0.7960804104805
+vn 0.60886806249619 0.28306290507317 -0.74105000495911
+vn 0 0 0
+vn -1 0 0
+vn 0 1 0
+vn 0 -1 0
+vn -0.60886812210083 0.28306290507317 0.74104994535446
+vn -0.42486593127251 0.43098148703575 0.79608035087585
+vn -0.42486596107483 -0.43098145723343 0.79608029127121
+vn -0.60886812210083 -0.28306293487549 0.74104994535446
+vn -0.27744197845459 0.6165771484375 0.73678934574127
+vn 0.27744141221046 0.61657696962357 0.73678976297379
+vn 0.42486551403999 0.43098136782646 0.79608064889908
+vn 0.60886812210083 -0.28306290507317 0.74104994535446
+vn 0.42486593127251 -0.43098148703575 0.79608035087585
+vn 0.60886752605438 0.28306278586388 0.74105048179626
+vn 0.27744197845459 -0.6165771484375 0.73678934574127
+vn -0.27744200825691 -0.6165771484375 0.73678940534592
+vn 0.70059055089951 0.71356350183487 0
+vn 0.42486587166786 -0.43098139762878 -0.7960804104805
+vn 0.60886806249619 -0.28306287527084 -0.74105000495911
+vn 0.70059055089951 -0.71356350183487 0
+vn -0.27744194865227 0.61657708883286 -0.73678940534592
+vn -0.42486587166786 0.43098139762878 -0.7960804104805
+vn -0.60886806249619 -0.28306290507317 -0.74105000495911
+vn -0.42486584186554 -0.43098142743111 -0.7960804104805
+vn -0.60886806249619 0.28306287527084 -0.74105000495911
+vn -0.27744194865227 -0.61657708883286 -0.73678940534592
+vn 0.27744194865227 -0.61657708883286 -0.73678940534592
+vn -0.70059055089951 0.71356350183487 0
+vn -0.70059055089951 -0.71356350183487 0
+# 34 normals
+
+vt 0.00542090367526 0.00542092323303 0
+vt 0.00542090367526 0.99457907676697 0
+vt 0.99457907676697 0.99457907676697 0
+vt 0.99457907676697 0.00542092323303 0
+vt 0.12081129848957 0.89372777938843 0
+vt 0.12081129848957 0.97731846570969 0
+vt 0.12039698660374 0.97785115242004 0
+vt 0.12039699405432 0.97731846570969 0
+vt 0.03615518659353 0.89372777938843 0
+vt 0.03615518659353 0.97731846570969 0
+vt 0.03656949847937 0.97785115242004 0
+vt 0.03656949847937 0.89319515228271 0
+vt 0.12039698660374 0.89319515228271 0
+vt 0.03656949847937 0.97731846570969 0
+vt 0.03656949847937 0.89372777938843 0
+vt 0.12039699405432 0.89372777938843 0
+# 16 texture coordinates
+
+o Cube
+usemtl Mat
+f 12/4/1 11/3/1 10/2/1 9/1/1
+f 20/5/2 19/6/2 18/6/2 17/5/2
+f 19/6/5 22/8/4 15/7/3
+f 8/9/7 7/10/7 6/10/7 5/9/7
+f 16/7/8 15/7/8 14/11/8 13/11/8
+f 4/13/9 3/13/9 2/12/9 1/12/9
+f 8/9/13 9/15/12 10/14/11 7/10/10
+f 11/8/16 16/7/15 13/11/14 10/14/11
+f 18/6/19 11/8/16 12/16/18 17/5/17
+f 9/15/12 2/12/21 3/13/20 12/16/18
+f 16/7/22 18/6/22 19/6/22 15/7/22
+f 20/5/24 21/16/23 22/8/4 19/6/5
+f 4/13/25 20/5/25 17/5/25 3/13/25
+f 23/14/27 14/11/26 15/7/3 22/8/4
+f 6/10/30 23/14/27 24/15/29 5/9/28
+f 21/16/23 4/13/32 1/12/31 24/15/29
+f 14/11/33 6/10/33 7/10/33 13/11/33
+f 2/12/34 8/9/34 5/9/34 1/12/34
+f 5/9/28 24/15/29 1/12/31
+f 9/15/12 8/9/13 2/12/21
+f 17/5/17 12/16/18 3/13/20
+f 21/16/23 20/5/24 4/13/32
+f 14/11/26 23/14/27 6/10/30
+f 10/14/11 13/11/14 7/10/10
+f 18/6/19 16/7/15 11/8/16
+

resources/qml/ActionButton.qml

@@ -133,7 +133,19 @@ Button
     Cura.ToolTip
     {
         id: tooltip
-        visible: button.hovered && buttonTextMetrics.elidedText != buttonText.text
+        visible:
+        {
+            if (!button.hovered)
+            {
+                return false;
+            }
+            if (tooltipText == button.text)
+            {
+                return buttonTextMetrics.elidedText != buttonText.text;
+            }
+            return true;
+        }
+        targetPoint: Qt.point(parent.x, Math.round(parent.y + parent.height / 2))
     }
 
     BusyIndicator

resources/qml/Cura.qml

@@ -560,8 +560,8 @@ UM.MainWindow
     MessageDialog
     {
         id: exitConfirmationDialog
-        title: catalog.i18nc("@title:window", "Closing Cura")
+        title: catalog.i18nc("@title:window %1 is the application name", "Closing %1").arg(CuraApplication.applicationDisplayName)
-        text: catalog.i18nc("@label", "Are you sure you want to exit Cura?")
+        text: catalog.i18nc("@label %1 is the application name", "Are you sure you want to exit %1?").arg(CuraApplication.applicationDisplayName)
         icon: StandardIcon.Question
         modality: Qt.ApplicationModal
         standardButtons: StandardButton.Yes | StandardButton.No
@@ -573,7 +573,7 @@ UM.MainWindow
             if (!visible)
             {
                 // reset the text to default because other modules may change the message text.
-                text = catalog.i18nc("@label", "Are you sure you want to exit Cura?");
+                text = catalog.i18nc("@label %1 is the application name", "Are you sure you want to exit %1?").arg(CuraApplication.applicationDisplayName);
             }
         }
     }

resources/qml/Preferences/GeneralPage.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.1
@@ -12,7 +12,7 @@ import Cura 1.0 as Cura
 UM.PreferencesPage
 {
     //: General configuration page title
-    title: catalog.i18nc("@title:tab","General")
+    title: catalog.i18nc("@title:tab", "General")
     id: generalPreferencesPage
 
     function setDefaultLanguage(languageCode)
@@ -129,7 +129,7 @@ UM.PreferencesPage
             Label
             {
                 font.bold: true
-                text: catalog.i18nc("@label","Interface")
+                text: catalog.i18nc("@label", "Interface")
             }
 
             GridLayout
@@ -140,7 +140,7 @@ UM.PreferencesPage
                 Label
                 {
                     id: languageLabel
-                    text: catalog.i18nc("@label","Language:")
+                    text: "Language:" //Don't translate this, to make it easier to find the language drop-down if you can't read the current language.
                 }
 
                 ComboBox
@@ -152,6 +152,7 @@ UM.PreferencesPage
 
                         Component.onCompleted: {
                             append({ text: "English", code: "en_US" })
+                            append({ text: "Czech", code: "cs_CZ" })
                             append({ text: "Deutsch", code: "de_DE" })
                             append({ text: "Español", code: "es_ES" })
                             //Finnish is disabled for being incomplete: append({ text: "Suomi", code: "fi_FI" })

resources/qml/Preferences/MachinesPage.qml

@@ -118,7 +118,10 @@ UM.ManagementPage
         UM.Dialog
         {
             id: actionDialog
-
+            minimumWidth: UM.Theme.getSize("modal_window_minimum").width
+            minimumHeight: UM.Theme.getSize("modal_window_minimum").height
+            maximumWidth: minimumWidth * 3
+            maximumHeight: minimumHeight * 3
             rightButtons: Button
             {
                 text: catalog.i18nc("@action:button", "Close")

resources/qml/PrinterOutput/ExtruderBox.qml

@@ -209,15 +209,15 @@ Item
                 anchors.verticalCenter: parent.verticalCenter
                 renderType: Text.NativeRendering
 
-                Component.onCompleted:
+                text:
                 {
                     if (!extruderTemperature.properties.value)
                     {
-                        text = "";
+                        return "";
                     }
                     else
                     {
-                        text = extruderTemperature.properties.value;
+                        return extruderTemperature.properties.value;
                     }
                 }
             }

resources/qml/PrinterOutput/HeatedBedBox.qml

@@ -193,22 +193,22 @@ Item
                 anchors.verticalCenter: parent.verticalCenter
                 renderType: Text.NativeRendering
 
-                Component.onCompleted:
+                text:
                 {
                     if (!bedTemperature.properties.value)
                     {
-                        text = "";
+                        return "";
                     }
                     if ((bedTemperature.resolve != "None" && bedTemperature.resolve) && (bedTemperature.stackLevels[0] != 0) && (bedTemperature.stackLevels[0] != 1))
                     {
                         // We have a resolve function. Indicates that the setting is not settable per extruder and that
                         // we have to choose between the resolved value (default) and the global value
                         // (if user has explicitly set this).
-                        text = bedTemperature.resolve;
+                        return bedTemperature.resolve;
                     }
                     else
                     {
-                        text = bedTemperature.properties.value;
+                        return bedTemperature.properties.value;
                     }
                 }
             }

resources/qml/WelcomePages/AddPrinterByIpContent.qml

@@ -159,6 +159,7 @@ Item
                     enabled: !addPrinterByIpScreen.hasRequestInProgress && !addPrinterByIpScreen.isPrinterDiscovered && (hostnameField.state != "invalid" && hostnameField.text != "")
                     onClicked:
                     {
+                        addPrinterByIpScreen.hasRequestFinished = false //In case it's pressed multiple times.
                         const address = hostnameField.text
                         if (!networkingUtil.isValidIP(address))
                         {
@@ -197,17 +198,21 @@ Item
                     renderType: Text.NativeRendering
 
                     visible: addPrinterByIpScreen.hasRequestInProgress || (addPrinterByIpScreen.hasRequestFinished && !addPrinterByIpScreen.isPrinterDiscovered)
+                    textFormat: Text.RichText
                     text:
                     {
                         if (addPrinterByIpScreen.hasRequestFinished)
                         {
-                            catalog.i18nc("@label", "Could not connect to device.")
+                            return catalog.i18nc("@label", "Could not connect to device.") + "<br /><br /><a href=\"https://ultimaker.com/en/resources/52891-set-up-a-cloud-connection\">"
+                                + catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>";
                         }
                         else
                         {
-                            catalog.i18nc("@label", "The printer at this address has not responded yet.")
+                            return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "<br /><br /><a href=\"https://ultimaker.com/en/resources/52891-set-up-a-cloud-connection\">"
+                                + catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>";
                         }
                     }
+                    onLinkActivated: Qt.openUrlExternally(link)
                 }
 
                 Item

resources/qml/WelcomePages/WizardDialog.qml

@@ -22,8 +22,8 @@ Window
     flags: Qt.Dialog
     modality: Qt.ApplicationModal
 
-    minimumWidth: 580 * screenScaleFactor
+    minimumWidth: UM.Theme.getSize("modal_window_minimum").width
-    minimumHeight: 600 * screenScaleFactor
+    minimumHeight: UM.Theme.getSize("modal_window_minimum").height
 
     color: UM.Theme.getColor("main_background")
 

resources/quality/creality/base/base_global_standard.inst.cfg

@@ -14,5 +14,5 @@ global_quality = True
 layer_height = 0.2
 layer_height_0 = 0.2
 top_bottom_thickness = =layer_height_0+layer_height*3
-wall_thickness = =line_width*3
+wall_thickness = =line_width*2
-support_interface_height = =layer_height*5
+support_interface_height = =layer_height*4

resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg

@@ -8,8 +8,19 @@ setting_version = 11
 type = quality
 quality_type = draft
 weight = -2
-material = generic_pla
+material = chromatik_pla
 
 [values]
+layer_height = 0.2
+line_width = =machine_nozzle_size * 0.875
+
 material_print_temperature = =default_material_print_temperature + 10
 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10
+
+speed_print = 60
+speed_travel = 75
+speed_layer_0 = 17
+speed_infill = 60
+speed_wall_0 = 50
+speed_wall_x = 60
+speed_topbottom = 60

resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg

@@ -8,6 +8,16 @@ setting_version = 11
 type = quality
 quality_type = normal
 weight = 0
-material = generic_pla
+material = chromatik_pla
 
 [values]
+layer_height = 0.1
+line_width = =machine_nozzle_size * 0.875
+
+speed_print = 35
+speed_travel = 50
+speed_layer_0 = 15
+speed_infill = 40
+speed_wall_0 = 25
+speed_wall_x = 35
+speed_topbottom = 35

resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg

@@ -8,8 +8,19 @@ setting_version = 11
 type = quality
 quality_type = fast
 weight = -1
-material = generic_pla
+material = chromatik_pla
 
 [values]
+layer_height = 0.15
+line_width = =machine_nozzle_size * 0.875
+
 material_print_temperature = =default_material_print_temperature + 5
 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5
+
+speed_print = 50
+speed_travel = 60
+speed_layer_0 = 17
+speed_infill = 50
+speed_wall_0 = 40
+speed_wall_x = 45
+speed_topbottom = 50

resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg

@@ -0,0 +1,26 @@
+[general]
+version = 4
+name = Fast
+definition = dagoma_discoultimate
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = draft
+weight = -2
+material = chromatik_pla
+
+[values]
+layer_height = 0.2
+line_width = =machine_nozzle_size * 0.875
+
+material_print_temperature = =default_material_print_temperature + 10
+material_bed_temperature_layer_0 = =default_material_bed_temperature + 10
+
+speed_print = 60
+speed_travel = 75
+speed_layer_0 = 17
+speed_infill = 60
+speed_wall_0 = 50
+speed_wall_x = 60
+speed_topbottom = 60

resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg

@@ -0,0 +1,23 @@
+[general]
+version = 4
+name = Fine
+definition = dagoma_discoultimate
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = normal
+weight = 0
+material = chromatik_pla
+
+[values]
+layer_height = 0.1
+line_width = =machine_nozzle_size * 0.875
+
+speed_print = 35
+speed_travel = 50
+speed_layer_0 = 15
+speed_infill = 40
+speed_wall_0 = 25
+speed_wall_x = 35
+speed_topbottom = 35

resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg

@@ -0,0 +1,26 @@
+[general]
+version = 4
+name = Standard
+definition = dagoma_discoultimate
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = fast
+weight = -1
+material = chromatik_pla
+
+[values]
+layer_height = 0.15
+line_width = =machine_nozzle_size * 0.875
+
+material_print_temperature = =default_material_print_temperature + 5
+material_bed_temperature_layer_0 = =default_material_bed_temperature + 5
+
+speed_print = 50
+speed_travel = 60
+speed_layer_0 = 17
+speed_infill = 50
+speed_wall_0 = 40
+speed_wall_x = 45
+speed_topbottom = 50

resources/quality/dagoma/dagoma_global_fast.inst.cfg

@@ -1,14 +0,0 @@
-[general]
-version = 4
-name = Fast
-definition = dagoma_discoeasy200
-
-[metadata]
-setting_version = 11
-type = quality
-quality_type = draft
-weight = -2
-global_quality = True
-
-[values]
-layer_height = 0.2

resources/quality/dagoma/dagoma_global_fine.inst.cfg

@@ -1,14 +0,0 @@
-[general]
-version = 4
-name = Fine
-definition = dagoma_discoeasy200
-
-[metadata]
-setting_version = 11
-type = quality
-quality_type = normal
-weight = 0
-global_quality = True
-
-[values]
-layer_height = 0.1

resources/quality/dagoma/dagoma_global_standard.inst.cfg

@@ -1,14 +0,0 @@
-[general]
-version = 4
-name = Standard
-definition = dagoma_discoeasy200
-
-[metadata]
-setting_version = 11
-type = quality
-quality_type = fast
-weight = -1
-global_quality = True
-
-[values]
-layer_height = 0.15

resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg

@@ -8,8 +8,19 @@ setting_version = 11
 type = quality
 quality_type = draft
 weight = -2
-material = generic_pla
+material = chromatik_pla
 
 [values]
+layer_height = 0.2
+line_width = =machine_nozzle_size * 0.875
+
 material_print_temperature = =default_material_print_temperature + 10
 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10
+
+speed_print = 40
+speed_travel = 80
+speed_layer_0 = 17
+speed_infill = 40
+speed_wall_0 = 30
+speed_wall_x = 40
+speed_topbottom = 40

resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg

@@ -8,6 +8,16 @@ setting_version = 11
 type = quality
 quality_type = normal
 weight = 0
-material = generic_pla
+material = chromatik_pla
 
 [values]
+layer_height = 0.1
+line_width = =machine_nozzle_size * 0.875
+
+speed_print = 30
+speed_travel = 80
+speed_layer_0 = 17
+speed_infill = 30
+speed_wall_0 = 20
+speed_wall_x = 30
+speed_topbottom = 30

resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg

@@ -8,8 +8,19 @@ setting_version = 11
 type = quality
 quality_type = fast
 weight = -1
-material = generic_pla
+material = chromatik_pla
 
 [values]
+layer_height = 0.15
+line_width = =machine_nozzle_size * 0.875
+
 material_print_temperature = =default_material_print_temperature + 5
 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5
+
+speed_print = 35
+speed_travel = 80
+speed_layer_0 = 17
+speed_infill = 35
+speed_wall_0 = 25
+speed_wall_x = 35
+speed_topbottom = 35

resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg

@@ -8,8 +8,19 @@ setting_version = 11
 type = quality
 quality_type = draft
 weight = -2
-material = generic_pla
+material = chromatik_pla
 
 [values]
+layer_height = 0.2
+line_width = =machine_nozzle_size * 0.875
+
 material_print_temperature = =default_material_print_temperature + 10
 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10
+
+speed_print = 40
+speed_travel = 80
+speed_layer_0 = 17
+speed_infill = 40
+speed_wall_0 = 30
+speed_wall_x = 40
+speed_topbottom = 40

resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg

@@ -8,6 +8,16 @@ setting_version = 11
 type = quality
 quality_type = normal
 weight = 0
-material = generic_pla
+material = chromatik_pla
 
 [values]
+layer_height = 0.1
+line_width = =machine_nozzle_size * 0.875
+
+speed_print = 30
+speed_travel = 80
+speed_layer_0 = 17
+speed_infill = 30
+speed_wall_0 = 20
+speed_wall_x = 30
+speed_topbottom = 30

resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg

@@ -8,8 +8,19 @@ setting_version = 11
 type = quality
 quality_type = fast
 weight = -1
-material = generic_pla
+material = chromatik_pla
 
 [values]
+layer_height = 0.15
+line_width = =machine_nozzle_size * 0.875
+
 material_print_temperature = =default_material_print_temperature + 5
 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5
+
+speed_print = 35
+speed_travel = 80
+speed_layer_0 = 17
+speed_infill = 35
+speed_wall_0 = 25
+speed_wall_x = 35
+speed_topbottom = 35

resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Super Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = super
+material = generic_abs
+variant = 0.25mm Nozzle
+
+[values]
+wall_thickness = =line_width*6

resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Ultra Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = ultra
+material = generic_abs
+variant = 0.25mm Nozzle
+
+[values]
+wall_thickness = =line_width*6

resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Dynamic Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = adaptive
+material = generic_abs
+variant = 0.4mm Nozzle
+
+[values]
+wall_thickness = =line_width*4

resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Low Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = low
+material = generic_abs
+variant = 0.4mm Nozzle
+
+[values]
+wall_thickness = =line_width*4

resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Standard Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = normal
+material = generic_abs
+variant = 0.4mm Nozzle
+
+[values]
+wall_thickness = =line_width*4

resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Super Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = super
+material = generic_abs
+variant = 0.4mm Nozzle
+
+[values]
+wall_thickness = =line_width*4

resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Draft Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = draft
+material = generic_abs
+variant = 0.8mm Nozzle
+
+[values]
+wall_thickness = =line_width*3

resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+version = 4
+name = Ultra Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = ultra
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.08
+layer_height_0 = 0.12
+top_bottom_thickness = =layer_height_0+layer_height*10
+wall_thickness = =line_width*3
+support_interface_height = =layer_height*12

resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+version = 4
+name = Super Quality
+definition = flyingbear_base
+
+[metadata]
+setting_version = 11
+type = quality
+quality_type = super
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.12
+layer_height_0 = 0.12
+top_bottom_thickness = =layer_height_0+layer_height*6
+wall_thickness = =line_width*3
+support_interface_height = =layer_height*8