Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog

.github/workflows/requirements-conan-package.txt

@@ -1,2 +1,2 @@
-conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3
+conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3,!=1.52.0
 sip

conandata.yml

@@ -1,5 +1,5 @@
 ---
-# Usage: defaults to None
+# Usage: defaults to the first entry in this conandata.yml file
 # If you're on a release branch create an entry for that **version**  e.q.: `5.1.0` update the requirements (use pinned versions, not latest)
 # also create a beta entry for that **version**  e.q.: `5.1.0-beta`, update the requirements (use the <dep_name>/(latest)@ultimaker/stable)
 #
@@ -10,111 +10,6 @@
 # requirements (use the <dep_name>/(latest)@ultimaker/testing)
 #
 # Subject to change in the future!
-"None":
-    requirements:
-        - "pyarcus/(latest)@ultimaker/testing"
-        - "curaengine/(latest)@ultimaker/testing"
-        - "pysavitar/(latest)@ultimaker/testing"
-        - "pynest2d/(latest)@ultimaker/testing"
-        - "uranium/(latest)@ultimaker/testing"
-        - "fdm_materials/(latest)@ultimaker/testing"
-        - "cura_binary_data/(latest)@ultimaker/testing"
-        - "cpython/3.10.4"
-    internal_requirements:
-        - "fdm_materials_private/(latest)@ultimaker/testing"
-        - "cura_private_data/(latest)@ultimaker/testing"
-    runinfo:
-        entrypoint: "cura_app.py"
-    pyinstaller:
-        datas:
-            cura_plugins:
-                package: "cura"
-                src: "plugins"
-                dst: "share/cura/plugins"
-            cura_resources:
-                package: "cura"
-                src: "resources"
-                dst: "share/cura/resources"
-            cura_private_data:
-                package: "cura_private_data"
-                src: "resources"
-                dst: "share/cura/resources"
-                internal: true
-            uranium_plugins:
-                package: "uranium"
-                src: "plugins"
-                dst: "share/uranium/plugins"
-            uranium_resources:
-                package: "uranium"
-                src: "resources"
-                dst: "share/uranium/resources"
-            uranium_um_qt_qml_um:
-                package: "uranium"
-                src: "site-packages/UM/Qt/qml/UM"
-                dst: "PyQt6/Qt6/qml/UM"
-            cura_binary_data:
-                package: "cura_binary_data"
-                src: "resources/cura/resources"
-                dst: "share/cura/resources"
-            uranium_binary_data:
-                package: "cura_binary_data"
-                src: "resources/uranium/resources"
-                dst: "share/uranium/resources"
-            windows_binary_data:
-                package: "cura_binary_data"
-                src: "windows"
-                dst: "share/windows"
-            fdm_materials:
-                package: "fdm_materials"
-                src: "materials"
-                dst: "share/cura/resources/materials"
-            fdm_materials_private:
-                package: "fdm_materials_private"
-                src: "resources/materials"
-                dst: "share/cura/resources/materials"
-                internal: true
-            tcl:
-                package: "tcl"
-                src: "lib/tcl8.6"
-                dst: "tcl"
-            tk:
-                package: "tk"
-                src: "lib/tk8.6"
-                dst: "tk"
-        binaries:
-            curaengine:
-                package: "curaengine"
-                src: "bin"
-                dst: "."
-                binary: "CuraEngine"
-        hiddenimports:
-            - "pySavitar"
-            - "pyArcus"
-            - "pynest2d"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "logging.handlers"
-            - "zeroconf"
-            - "fcntl"
-            - "stl"
-            - "serial"
-        collect_all:
-            - "cura"
-            - "UM"
-            - "serial"
-            - "Charon"
-            - "sqlite3"
-            - "trimesh"
-            - "win32ctypes"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "stl"
-        icon:
-            Windows: "./icons/Cura.ico"
-            Macos: "./icons/cura.icns"
-            Linux: "./icons/cura-128.png"
 "5.2.0-alpha":
     requirements:
         - "pyarcus/(latest)@ultimaker/testing"

conanfile.py

@@ -3,13 +3,13 @@ from pathlib import Path
 
 from jinja2 import Template
 
-from conans import tools
 from conan import ConanFile
-from conan.tools import files
+from conan.tools.files import copy, rmdir, save
 from conan.tools.env import VirtualRunEnv, Environment
+from conan.tools.scm import Version
 from conan.errors import ConanInvalidConfiguration
 
-required_conan_version = ">=1.48.0"
+required_conan_version = ">=1.50.0"
 
 
 class CuraConan(ConanFile):
@@ -26,7 +26,7 @@ class CuraConan(ConanFile):
 
     # FIXME: Remove specific branch once merged to main
     # Extending the conanfile with the UMBaseConanfile https://github.com/Ultimaker/conan-ultimaker-index/tree/CURA-9177_Fix_CI_CD/recipes/umbase
-    python_requires = "umbase/0.1.5@ultimaker/testing"
+    python_requires = "umbase/[>=0.1.7]@ultimaker/stable"
     python_requires_extend = "umbase.UMBaseConanfile"
 
     options = {
@@ -135,7 +135,7 @@ class CuraConan(ConanFile):
     def _site_packages(self):
         if self.settings.os == "Windows":
             return self._base_dir.joinpath("Lib", "site-packages")
-        py_version = tools.Version(self.deps_cpp_info["cpython"].version)
+        py_version = Version(self.deps_cpp_info["cpython"].version)
         return self._base_dir.joinpath("lib", f"python{py_version.major}.{py_version.minor}", "site-packages")
 
     @property
@@ -151,7 +151,7 @@ class CuraConan(ConanFile):
 
         cura_version = self.version
         if self.options.internal:
-            version = tools.Version(self.version)
+            version = Version(self.version)
             cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease.replace('+', '+internal_')}"
 
         with open(Path(location, "CuraVersion.py"), "w") as f:
@@ -220,7 +220,7 @@ class CuraConan(ConanFile):
         with open(Path(__file__).parent.joinpath("Ultimaker-Cura.spec.jinja"), "r") as f:
             pyinstaller = Template(f.read())
 
-        cura_version = tools.Version(self.version) if self.version else tools.Version("0.0.0")
+        cura_version = Version(self.version) if self.version else Version("0.0.0")
 
         with open(Path(location, "Ultimaker-Cura.spec"), "w") as f:
             f.write(pyinstaller.render(
@@ -243,6 +243,10 @@ class CuraConan(ConanFile):
                 short_version = f"'{cura_version.major}.{cura_version.minor}.{cura_version.patch}'",
             ))
 
+    def set_version(self):
+        if self.version is None:
+            self.version = self._umdefault_version()
+
     def configure(self):
         self.options["pyarcus"].shared = True
         self.options["pysavitar"].shared = True
@@ -250,7 +254,7 @@ class CuraConan(ConanFile):
         self.options["cpython"].shared = True
 
     def validate(self):
-        if self.version and tools.Version(self.version) <= tools.Version("4"):
+        if self.version and Version(self.version) <= Version("4"):
             raise ConanInvalidConfiguration("Only versions 5+ are support")
 
     def requirements(self):
@@ -293,7 +297,7 @@ class CuraConan(ConanFile):
         self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False)
         self.copy("CuraEngine", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False)
 
-        files.rmdir(self, "resources/materials")
+        rmdir(self, os.path.join(self.source_folder, "resources", "materials"))
         self.copy("*.fdm_material", root_package = "fdm_materials", src = "@resdirs", dst = "resources/materials", keep_path = False)
         self.copy("*.sig", root_package = "fdm_materials", src = "@resdirs", dst = "resources/materials", keep_path = False)
 
@@ -377,7 +381,7 @@ class CuraConan(ConanFile):
         self.copy("*.txt", src = self.cpp_info.resdirs[-1], dst = self._base_dir.joinpath("pip_requirements"))
 
         # Generate the GitHub Action version info Environment
-        cura_version = tools.Version(self.version)
+        cura_version = Version(self.version)
         env_prefix = "Env:" if self.settings.os == "Windows" else ""
         activate_github_actions_version_env = Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV
 echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV
@@ -392,7 +396,7 @@ echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV
                     env_prefix = env_prefix)
 
         ext = ".sh" if self.settings.os != "Windows" else ".ps1"
-        files.save(self, self._script_dir.joinpath(f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env)
+        save(self, self._script_dir.joinpath(f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env)
 
         self._generate_cura_version(Path(self._site_packages, "cura"))
 

cura/Arranging/ArrangeObjectsJob.py

@@ -21,6 +21,7 @@ class ArrangeObjectsJob(Job):
         self._min_offset = min_offset
 
     def run(self):
+        found_solution_for_all = False
         status_message = Message(i18n_catalog.i18nc("@info:status", "Finding new location for objects"),
                                  lifetime = 0,
                                  dismissable = False,
@@ -28,18 +29,19 @@ class ArrangeObjectsJob(Job):
                                  title = i18n_catalog.i18nc("@info:title", "Finding Location"))
         status_message.show()
 
-        found_solution_for_all = None
         try:
             found_solution_for_all = arrange(self._nodes, Application.getInstance().getBuildVolume(), self._fixed_nodes)
         except:  # If the thread crashes, the message should still close
             Logger.logException("e", "Unable to arrange the objects on the buildplate. The arrange algorithm has crashed.")
 
         status_message.hide()
-        if found_solution_for_all is not None and not found_solution_for_all:
+
+        if not found_solution_for_all:
             no_full_solution_message = Message(
                     i18n_catalog.i18nc("@info:status",
                                        "Unable to find a location within the build volume for all objects"),
                     title = i18n_catalog.i18nc("@info:title", "Can't Find Location"),
                     message_type = Message.MessageType.ERROR)
             no_full_solution_message.show()
+
         self.finished.emit(self)

cura/Settings/CuraContainerStack.py

@@ -49,7 +49,7 @@ class CuraContainerStack(ContainerStack):
         self._empty_material = cura_empty_instance_containers.empty_material_container #type: InstanceContainer
         self._empty_variant = cura_empty_instance_containers.empty_variant_container #type: InstanceContainer
 
-        self._containers = [self._empty_instance_container for i in range(len(_ContainerIndexes.IndexTypeMap))] #type: List[ContainerInterface]
+        self._containers: List[ContainerInterface] = [self._empty_instance_container for i in _ContainerIndexes.IndexTypeMap]
         self._containers[_ContainerIndexes.QualityChanges] = self._empty_quality_changes
         self._containers[_ContainerIndexes.Quality] = self._empty_quality
         self._containers[_ContainerIndexes.Material] = self._empty_material

cura/Settings/CuraStackBuilder.py

@@ -288,7 +288,7 @@ class CuraStackBuilder:
 
         if definitions:
             name = definitions[0].getName()
-        stack = cls.createMachine(abstract_machine_id, definition_id)
+        stack = cls.createMachine(abstract_machine_id, definition_id, show_warning_message=False)
         if not stack:
             return None
 

cura/Settings/MachineManager.py

@@ -904,7 +904,7 @@ class MachineManager(QObject):
 
         if self._global_container_stack is None \
                 or self._global_container_stack.getProperty(setting_key, "value") == new_value \
-                or self.numberExtrudersEnabled < 2:
+                or self._global_container_stack.definitionChanges.getProperty("extruders_enabled_count", "value") < 2:
             return
 
         user_changes_container = self._global_container_stack.userChanges
@@ -1009,7 +1009,7 @@ class MachineManager(QObject):
         for position, extruder in enumerate(self._global_container_stack.extruderList):
             if extruder.isEnabled and int(position) < machine_extruder_count:
                 extruder_count += 1
-        if self.numberExtrudersEnabled != extruder_count:
+        if self._global_container_stack.definitionChanges.getProperty("extruders_enabled_count", "value") != extruder_count:
             definition_changes_container.setProperty("extruders_enabled_count", "value", extruder_count)
             self.numberExtrudersEnabledChanged.emit()
 

plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py

@@ -3,6 +3,8 @@
 import os
 from typing import Optional, Dict, List, Callable, Any
 
+from time import time
+
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty, QObject
 from PyQt6.QtNetwork import QNetworkReply
@@ -32,6 +34,8 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice):
 
     activeCameraUrlChanged = pyqtSignal()
 
+    CHECK_CLUSTER_INTERVAL = 10.0  # seconds
+
     def __init__(self, device_id: str, address: str, properties: Dict[bytes, bytes], parent=None) -> None:
 
         super().__init__(
@@ -107,6 +111,8 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice):
 
     def _update(self) -> None:
         super()._update()
+        if time() - self._time_of_last_request < self.CHECK_CLUSTER_INTERVAL:
+            return  # avoid calling the cluster too often
         self._getApiClient().getPrinters(self._updatePrinters)
         self._getApiClient().getPrintJobs(self._updatePrintJobs)
         self._updatePrintJobPreviewImages()

plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py

@@ -64,7 +64,7 @@ class VersionUpgrade22to24(VersionUpgrade):
 
             config.remove_option("general", "containers")
 
-            for idx in range(len(container_list)):
+            for idx, _ in enumerate(container_list):
                 config.set("containers", str(idx), container_list[idx])
 
         output = io.StringIO()

plugins/X3DReader/X3DReader.py

@@ -866,13 +866,13 @@ def readIndex(node, attr):
     v = readIntArray(node, attr, [])
     chunks = []
     chunk = []
-    for i in range(len(v)):
+    for i in v:
-        if v[i] == -1:
+        if i == -1:
             if chunk:
                 chunks.append(chunk)
                 chunk = []
         else:
-            chunk.append(v[i])
+            chunk.append(i)
     if chunk:
         chunks.append(chunk)
     return chunks

resources/definitions/Mark2_for_Ultimaker2.def.json

@@ -63,9 +63,6 @@
         "machine_heated_bed": {
             "default_value": true
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_wall_x": {
             "value": "speed_wall"
         },

resources/definitions/SV01.def.json

@@ -45,16 +45,12 @@
         "acceleration_enabled": { "value": false },
         "jerk_enabled": { "value": false },
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
         "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": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },

resources/definitions/SV02.def.json

@@ -28,8 +28,7 @@
         "retraction_speed": { "default_value": 50},
         "gantry_height": { "value": "30" },
         "speed_print": { "default_value": 50 },		
-	    "material_print_temperature": { "value": 195 },
+	    "default_material_print_temperature": { "value": 195 },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature" },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": 195 },		
         "machine_max_feedrate_x": { "value": 500 },
@@ -41,11 +40,9 @@
         "machine_max_acceleration_z": { "value": 100 },
         "machine_max_acceleration_e": { "value": 500 },
         "machine_acceleration": { "value": 500 },
-        "machine_max_jerk_xy": { "value": 8 },
+
-        "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 },
         "material_diameter": { "default_value": 1.75 },
-        "infill_overlap": { "default_value": 15	},
+
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
         "acceleration_travel_layer_0": { "value": "acceleration_travel" },

resources/definitions/SV03.def.json

@@ -45,16 +45,12 @@
         "acceleration_enabled": { "value": false },
         "jerk_enabled": { "value": false },
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
         "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": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },

resources/definitions/alya3dp.def.json

@@ -10,7 +10,7 @@
         "file_formats": "text/x-gcode",
         "platform": "alya_platform.3mf",
         "platform_offset": [-60, -45, 75 ],
-        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "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_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "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_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ],
+        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "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_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ],
         "preferred_material": "generic_pla",
         "has_machine_quality": true,
         "has_materials": true,

resources/definitions/alyanx3dp.def.json

@@ -10,7 +10,7 @@
         "file_formats": "text/x-gcode",
         "platform": "alya_nx_platform.3mf",
         "platform_offset": [-104, 0, 93 ],
-        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "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_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "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_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ],
+        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "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_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ],
         "preferred_material": "generic_pla",
         "has_machine_quality": true,
         "has_materials": true,

resources/definitions/anet3d.def.json

@@ -51,14 +51,11 @@
 
         "speed_print": { "value": 50.0 } ,
         "speed_infill": { "value": "speed_print * 2" },
-        "speed_wall": { "value": "speed_print / 2" },
+
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "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": "speed_print / 2" },
-        "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" },
         "speed_prime_tower": { "value": "speed_print" },
         "speed_support": { "value": "speed_print" },
@@ -67,18 +64,14 @@
 
         "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": "'back'" },
         "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_before_walls": { "value": true },
         "infill_overlap": { "value": 30.0 },
@@ -88,20 +81,22 @@
 
         "fill_outline_gaps": { "value": false },
 
-        "retraction_speed": {
+        "retraction_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_retract_speed": {
+        "retraction_retract_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_prime_speed": {
+        "retraction_prime_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 1 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -109,13 +104,11 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adaptive_layer_height_variation": { "value": 0.04 },
@@ -133,16 +126,12 @@
         
         "extruder_prime_pos_y":{"minimum_value": "0","maximum_value": "machine_depth"},
         "extruder_prime_pos_x":{"minimum_value": "0","maximum_value": "machine_width"},
-        "relative_extrusion":{"value": false,"enabled": false},
+        "relative_extrusion":{"value": false, "enabled": false},
         
         "machine_use_extruder_offset_to_offset_coords": {"default_value": true},
         "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
         
-        "machine_center_is_zero": {
+        "machine_center_is_zero": { "default_value": false },
-            "default_value": false
+        "gantry_height": { "value": "0"}
-        },
-        "gantry_height": {
-            "value": "0"
-        }
     }
 }

resources/definitions/anycubic_4max.def.json

@@ -51,7 +51,6 @@
         "gantry_height": { "value": "25.0" },
         "skin_overlap": { "value": "10" },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "900" },

resources/definitions/anycubic_i3_mega_s.def.json

@@ -53,8 +53,6 @@
         "material_bed_temperature": { "maximum_value_warning": 110 },
         "material_bed_temperature_layer_0": { "maximum_value_warning": 110 },
 
-        "material_flow": { "value": 100 },
-
         "top_bottom_thickness": { "value":  "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" },
         "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" },
 
@@ -70,15 +68,11 @@
         "jerk_enabled": { "value": true },
 
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
+
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": 100.0, "maximum_value_warning": 150.0, "maximum_value": 200.0 },
         "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" },
-        "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" },
@@ -101,7 +95,7 @@
         "retraction_hop": { "value": 0.075 },
         "retraction_hop_only_when_collides": { "value": true },
         "retraction_amount": { "value": 6 },
-        "retraction_enable": { "value": true },
+
         "retraction_min_travel": { "value": 1.5 },
         "retraction_combing": { "value": "'off'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -114,7 +108,6 @@
         "cool_fan_speed": { "value": 100 },
         "cool_fan_speed_0": { "value": 30 },
 
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },

resources/definitions/anycubic_mega_zero.def.json

@@ -99,7 +99,6 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_speed": { "value": 30 },
         "retraction_amount": { "value": 7 },
         "retraction_count_max": { "value": 100 },

resources/definitions/artillery_base.def.json

@@ -64,55 +64,6 @@
             "tizyx_abs",
             "tizyx_pla",
             "tizyx_pla_bois",
-            "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"
@@ -155,35 +106,25 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 60.0 } ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
-        "speed_roofing": { "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.0 },
-        "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" },
         "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 * 1.1" },
 
-        "optimize_wall_printing_order": { "value": "True" },
+        "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": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_none'" },
 
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -193,15 +134,18 @@
 
         "fill_outline_gaps": { "value": false },
 
-        "retraction_speed": {
+        "retraction_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_retract_speed": {
+        "retraction_retract_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_prime_speed": {
+        "retraction_prime_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
@@ -215,13 +159,12 @@
         "travel_retract_before_outer_wall": { "value": true },
         
 		"retraction_amount": { "value": 2 },
-        "retraction_enable": { "value": true },
+
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.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": "'none' if support_enable else 'skirt'" },
@@ -236,14 +179,13 @@
         "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_enable and support_structure == 'tree' 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 },
 
@@ -256,7 +198,6 @@
         "minimum_interface_area": { "value": 10 },
         "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
         "wall_thickness": {"value": "line_width * 2" }
-
     }
 }
 

resources/definitions/atmat_signal_pro_base.def.json

@@ -23,55 +23,6 @@
 		"supports_usb_connection": false,
         "supports_network_connection": false,
         "exclude_materials": [
-            "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",
             "chromatik_pla",
             "dsm_arnitel2045_175",
             "dsm_novamid1070_175",
@@ -128,55 +79,6 @@
             "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",

resources/definitions/atom3.def.json

@@ -2,7 +2,8 @@
     "version": 2,
     "name": "Atom 3",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Daniel Kurth",
         "manufacturer": "Layer One",
@@ -22,10 +23,8 @@
     },
 
 
-
+    "overrides":
-
+    {
-    "overrides": {
-
         "machine_name": { "default_value": "Atom 3" },
         "machine_show_variants": { "default_value": true},
         "machine_shape": { "default_value": "elliptic" },
@@ -48,45 +47,36 @@
         "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" },
         "machine_heated_bed": { "default_value": true },
         "material_diameter": { "default_value": 1.75},
-        "machine_start_gcode": {
+        "machine_start_gcode":
+        {
             "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE"
         },
-        "machine_end_gcode": {
+        "machine_end_gcode":
+        {
             "default_value": ";MACHINE END CODE\nG91 ;relative positioning\nG1 E-1 F300  ;retract  filament release pressure\nG1 Z+1.0 E-5 F9000 ;move up a and retract more\nG90 ;absolute positioning\nG28; home\nM84 ;steppers off\n;MACHINE END CODE"
         },
 
-
-
-
         "layer_height": {"default_value": 0.2 },
-        "layer_height_0": {
+        "layer_height_0":
+        {
             "default_value": 0.2,
             "value": "layer_height"
         },
         "line_width": { "value": "machine_nozzle_size"},
-        "infill_line_width": { "value":"line_width"},
+
         "initial_layer_line_width_factor": { "default_value": 100},
 
-
-
-
         "top_bottom_thickness": { "default_value": 1.0},
 
-
-
-
         "infill_sparse_density": { "default_value": 17},
         "infill_before_walls": { "value": false},
         "zig_zaggify_infill": { "value": true},
 
-
-
-
         "default_material_print_temperature": { "default_value": 200 },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature + 0"},
         "material_initial_print_temperature": { "value": "material_print_temperature_layer_0"},
         "material_final_print_temperature": { "value": "material_print_temperature"},
-        "default_material_bed_temperature": {
+        "default_material_bed_temperature":
+        {
             "default_value": 60,
             "minimum_value": "0",
             "minimum_value_warning": "build_volume_temperature",
@@ -95,16 +85,13 @@
         },
         "material_bed_temperature":
         {
-            "value": "round(default_material_bed_temperature-((-0.202*default_material_bed_temperature)+7.16)) if default_material_bed_temperature > 40 else default_material_bed_temperature",
+            "value": "round(default_material_bed_temperature-(-0.202 * default_material_bed_temperature + 7.16)) if default_material_bed_temperature > 40 else default_material_bed_temperature",
             "minimum_value": "0",
             "minimum_value_warning": "build_volume_temperature",
             "maximum_value_warning": "115",
             "maximum_value": "120"
         },
 
-
-
-
         "speed_print": { "default_value": 40},
         "speed_wall": { "value": "speed_print * 0.75"},
         "speed_wall_0": { "value": "speed_print * 0.5"},
@@ -112,48 +99,42 @@
         "speed_layer_0": { "value": "20"},
         "speed_slowdown_layers": { "default_value": 1},
 
-
+        "retraction_amount":
-
+        {
-
-        "retraction_amount": {
             "default_value": 7,
-            "maximum_value_warning": 9 },
+            "maximum_value_warning": 9
-        "retraction_speed": {
+        },
+        "retraction_speed":
+        {
             "default_value": 70,
             "maximum_value_warning": 80
         },
         "retraction_hop_enabled": { "default_value": true},
         "retraction_hop": { "default_value": 0.5},
 
-
-
-
         "cool_min_layer_time": { "default_value": 5},
         "cool_min_speed": { "default_value": 10},
         "cool_lift_head": { "default_value": false},
 
-
-
-
         "support_type": { "default_value": "everywhere"},
         "support_angle": { "default_value": 60},
         "support_z_distance": { "value": "layer_height"},
         "support_xy_distance_overhang":{"value": "machine_nozzle_size"},
 
 
-
-
         "adhesion_type": { "default_value": "skirt"},
-        "skirt_brim_minimal_length": {
+        "skirt_brim_minimal_length":
+        {
             "default_value": 750,
-            "value": "60/(layer_height_0*line_width)",
+            "value": "60 / (layer_height_0 * line_width)",
             "minimum_value": "0",
             "minimum_value_warning": "25",
             "maximum_value_warning": "4000"
         },
-        "skirt_gap": {
+        "skirt_gap":
-            "default_value": "1`",
+        {
-            "value": "3*wall_line_width_0"
+            "default_value": 1,
+            "value": "3 * wall_line_width_0"
         }
     }
 }

resources/definitions/biqu_base.def.json

@@ -59,15 +59,11 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
+
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "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.0 },
-        "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" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -76,19 +72,16 @@
 
         "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": "'sharpest_corner'" },
         "z_seam_corner": { "value": "'z_seam_corner_inner'" },
 
         "infill_line_width": { "value": "line_width * 1.2" },
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -111,7 +104,6 @@
             "maximum_value": 200
         },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -119,13 +111,11 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.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'" },

resources/definitions/blv_mgn_cube_base.def.json

@@ -165,9 +165,6 @@
     "skin_overlap": {
       "value": 10.0
     },
-    "speed_infill": {
-      "value": "speed_print"
-    },
     "speed_travel_layer_0": {
       "value": "math.ceil(speed_travel * 0.4)"
     },

resources/definitions/builder_premium_large.def.json

@@ -54,7 +54,6 @@
 
         "prime_blob_enable": { "enabled": true },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "3000" },

resources/definitions/builder_premium_medium.def.json

@@ -54,7 +54,6 @@
 
         "prime_blob_enable": { "enabled": true },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "3000" },

resources/definitions/builder_premium_small.def.json

@@ -53,7 +53,6 @@
 
         "prime_blob_enable": { "enabled": true },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "3000" },

resources/definitions/cartesio.def.json

@@ -41,7 +41,6 @@
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "material_print_temp_wait": { "default_value": false },
         "material_bed_temp_wait": { "default_value": false },
-        "prime_tower_enable": { "default_value": false },
         "prime_tower_min_volume": { "value": "0.7" },
         "prime_tower_size": { "value": 24.0 },
         "prime_tower_position_x": { "value": "125" },

resources/definitions/crazy3dprint_cz_300.def.json

@@ -36,9 +36,8 @@
 		"min_infill_area": {  "default_value": 2.0 },
 		"retract_at_layer_change": { "default_value": true },
 		"default_material_print_temperature": {  "default_value": 210 },
-		"material_print_temperature": { "value": 210 },
 		"material_final_print_temperature": {  "value": 210 },
-		"material_bed_temperature": { "value": 70 },
+		"default_material_bed_temperature": { "value": 70 },
         "material_bed_temperature_layer_0": {  "value": 70 },
 		"material_flow_layer_0": {"value": 140},
 		"retraction_amount": {  "default_value": 10 },

resources/definitions/creality_base.def.json

@@ -68,61 +68,13 @@
             "tizyx_abs",
             "tizyx_pla",
             "tizyx_pla_bois",
-            "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": {
+    "overrides":
+    {
         "machine_name": { "default_value": "Creawsome Base Printer" },
         "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\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\n" },
@@ -158,36 +110,25 @@
         "acceleration_enabled": { "value": false },
         "jerk_enabled": { "value": false },
 
-        "speed_print": { "value": 50.0 } ,
+        "speed_print": { "value": 50.0 },
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "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.0 },
-        "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" },
         "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": "'back'" },
         "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_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -197,20 +138,21 @@
 
         "fill_outline_gaps": { "value": false },
 
-        "retraction_speed": {
+        "retraction_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_retract_speed": {
+        "retraction_retract_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_prime_speed": {
+        "retraction_prime_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -218,13 +160,11 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.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'" },
@@ -238,7 +178,7 @@
         "meshfix_maximum_resolution": { "value": "0.25" },
         "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
 
-        "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
+        "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_enable and support_structure == 'tree' else 20" },
         "support_use_towers": { "value": false },

resources/definitions/creality_ender6.def.json

@@ -9,17 +9,6 @@
         "machine_width": { "default_value": 260 },
         "machine_depth": { "default_value": 260 },
         "machine_height": { "default_value": 400 },
-        "z_seam_type": { "value": "'sharpest_corner'"},
-        "z_seam_corner": { "value": "'z_seam_corner_inner'"},
-        "infill_sparse_density": { "value": "10"},
-        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'"},
-        "infill_overlap":{"value": 10},    
-        "material_print_temperature":{"value": 220},
-        "material_bed_temperature":{"value": 50},
-        "retraction_amount":{"value": 10},  
-        "speed_travel": { "value": 80.0 },
-        "coasting_enable": { "value": true},
-        "coasting_min_volume": { "value": 0.5},
         "machine_head_with_fans_polygon": { "default_value": [
                 [-26, 34],
                 [-26, -32],
@@ -30,8 +19,7 @@
 
         "gantry_height": { "value": 25 },
 
-        "speed_print": { "value": 50.0 },
+        "speed_print": { "value": 80.0 }
-        "speed_wall": { "value": 30.0 }
         
     },
     "metadata": {

resources/definitions/cremaker_common.def.json

@@ -24,7 +24,6 @@
     "xy_offset": { "value": 0.1 },
     "xy_offset_layer_0": { "value": -0.1 },
     "hole_xy_offset": { "value": 0.15 },
-    "material_print_temperature": { "value": 200 },
     "speed_travel": { "value": 100 },
     "speed_layer_0": { "value": 25 },
     "acceleration_enabled": { "value": true },

resources/definitions/dagoma_pro_430_bowden.def.json

@@ -25,7 +25,6 @@
         "machine_max_jerk_e": { "value": 5 },
         "machine_max_feedrate_e": { "default_value": 200 },
         "machine_steps_per_mm_e": { "default_value": 139.5 },
-        "acceleration_enabled": { "value": "True" },
         "acceleration_print": { "value": "1250", "maximum_value": 1500 },
         "acceleration_layer_0": { "value": "acceleration_topbottom", "maximum_value": 1500 },
         "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 1250)", "maximum_value": 1500 },

resources/definitions/deltacomb_dc20flux.def.json

@@ -25,7 +25,7 @@
         "machine_end_gcode":                  { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" },
         "switch_extruder_retraction_amount":  { "value": "0" },
         "prime_tower_min_volume":             { "value": "50" },
-        "prime_tower_enable":                 { "value": "1" },
+        "prime_tower_enable":                 { "value": true },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature":   { "value": "material_print_temperature" },
         "material_standby_temperature":       { "value": "material_print_temperature" }

resources/definitions/deltacomb_dc21flux.def.json

@@ -25,7 +25,7 @@
         "machine_end_gcode":                  { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" },
         "switch_extruder_retraction_amount":  { "value": "0" },
         "prime_tower_min_volume":             { "value": "50" },
-        "prime_tower_enable":                 { "value": "1" },
+        "prime_tower_enable":                 { "value": true },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature":   { "value": "material_print_temperature" },
         "material_standby_temperature":       { "value": "material_print_temperature" }

resources/definitions/dxu.def.json

@@ -70,9 +70,6 @@
         "machine_heated_bed": {
             "default_value": true
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_wall_x": {
             "value": "speed_wall"
         },

resources/definitions/eryone_er20.def.json

@@ -53,7 +53,7 @@
         "machine_end_gcode": {
             "default_value": "G91 ;Relative positioning\nG1 Z5 F720 ;Raise Z\nG1 E-5 F300 ;Retract a bit to protect nozzle\nM104 S0 ;Turn off extruder\nM140 S0 ;Turn off bed\nM107 ;Turn off all fans\nG90 ;Absolute positioning\nG1 X230 Y200 F4800 ;Parking the hotend\nM84 X Y E ;All steppers off but left Z\n"
         },
-        "material_print_temperature": {
+        "default_material_print_temperature": {
             "value": 205
         },
         "material_print_temperature_layer_0": {
@@ -103,7 +103,7 @@
         "infill_before_walls": {
             "value": false
         },
-        "material_bed_temperature": {
+        "default_material_bed_temperature": {
             "value": 60
         },
         "material_bed_temperature_layer_0": {
@@ -156,9 +156,6 @@
         "skirt_line_count": {
             "value": 3
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_topbottom": {
             "value": "math.ceil(speed_print * 20 / 50)"
         },

resources/definitions/eryone_thinker.def.json

@@ -138,15 +138,11 @@
             "value": "material_print_temperature"
         },
         "material_bed_temperature": {
-            "value": "default_material_bed_temperature",
             "maximum_value_warning": 100
         },
         "material_bed_temperature_layer_0": {
             "value": "material_bed_temperature"
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_wall": {
             "value": "speed_print"
         },

resources/definitions/fdmprinter.def.json

@@ -426,9 +426,7 @@
                     "label": "Disallowed Areas",
                     "description": "A list of polygons with areas the print head is not allowed to enter.",
                     "type": "polygons",
-                    "default_value":
+                    "default_value": [],
-                    [
-                    ],
                     "settable_per_mesh": false,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false
@@ -438,9 +436,7 @@
                     "label": "Nozzle Disallowed Areas",
                     "description": "A list of polygons with areas the nozzle is not allowed to enter.",
                     "type": "polygons",
-                    "default_value":
+                    "default_value": [],
-                    [
-                    ],
                     "settable_per_mesh": false,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false
@@ -452,22 +448,10 @@
                     "type": "polygon",
                     "default_value":
                     [
-                        [
+                        [ -20, 10 ],
-                            -20,
+                        [ 10,  10 ],
-                            10
+                        [ 10,  -10 ],
-                        ],
+                        [ -20, -10 ]
-                        [
-                            10,
-                            10
-                        ],
-                        [
-                            10,
-                            -10
-                        ],
-                        [
-                            -20,
-                            -10
-                        ]
                     ],
                     "settable_per_mesh": false,
                     "settable_per_extruder": false,
@@ -1027,7 +1011,8 @@
                     "settable_per_meshgroup": true,
                     "settable_globally": true,
                     "enabled": "extruders_enabled_count > 1",
-                    "children": {
+                    "children":
+                    {
                         "wall_0_extruder_nr":
                         {
                             "label": "Outer Wall Extruder",
@@ -1184,9 +1169,10 @@
                 "inset_direction":
                 {
                     "label": "Wall Ordering",
-                    "description": "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed.",
+                    "description": "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed. When there is an uneven amount of total innner walls, the 'center last line' is always printed last.",
                     "type": "enum",
-                    "options": {
+                    "options":
+                    {
                         "inside_out": "Inside To Outside",
                         "outside_in": "Outside To Inside"
                     },
@@ -1241,7 +1227,8 @@
                         }
                     }
                 },
-                "fill_outline_gaps": {
+                "fill_outline_gaps":
+                {
                     "label": "Print Thin Walls",
                     "description": "Print pieces of the model which are horizontally thinner than the nozzle size.",
                     "type": "bool",
@@ -1444,7 +1431,8 @@
                     "limit_to_extruder": "roofing_extruder_nr",
                     "settable_per_mesh": true,
                     "enabled": "top_layers > 0",
-                    "children": {
+                    "children":
+                    {
                         "roofing_line_width":
                         {
                             "label": "Top Surface Skin Line Width",
@@ -4418,7 +4406,8 @@
                     "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false,
-                    "children": {
+                    "children":
+                    {
                         "support_infill_extruder_nr":
                         {
                             "label": "Support Infill Extruder",
@@ -8065,7 +8054,8 @@
             "description": "Settings which are only used if CuraEngine isn't called from the Cura frontend.",
             "type": "category",
             "enabled": false,
-            "children": {
+            "children":
+            {
                 "center_object":
                 {
                     "description": "Whether to center the object on the middle of the build platform (0,0), instead of using the coordinate system in which the object was saved.",

resources/definitions/flyingbear_base.def.json

@@ -88,55 +88,6 @@
             "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",
@@ -165,7 +116,6 @@
         "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" },
@@ -189,25 +139,19 @@
 
         "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 * 1.5" },
-        "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": "speed_print / 2" },
-        "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 },
@@ -220,7 +164,6 @@
         "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 },
 

resources/definitions/geeetech_Mizar_S.def.json

@@ -0,0 +1,59 @@
+{
+    "version": 2,
+    "name": "Geeetech Mizar_S",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Amit L",
+        "manufacturer": "Geeetech",
+        "file_formats": "text/x-gcode",
+        "has_materials": true,
+        "machine_extruder_trains":
+        {
+            "0": "geeetech_Mizar_S_1"
+        }
+
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "Geeetech Mizar_S" },
+        "machine_width": {
+            "default_value": 255
+        },
+        "machine_height": {
+            "default_value": 260
+        },
+        "machine_depth": {
+            "default_value": 255
+        },        
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "layer_height": { "default_value": 0.1 },
+        "layer_height_0": { "default_value": 0.15 },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_speed": { "default_value": 35 },
+        "adhesion_type": { "default_value": "skirt" },
+        "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
+        "gantry_height": { "value": "28" },
+        "machine_max_feedrate_z": { "default_value": 12 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_acceleration": { "default_value": 1000 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 0.2 },
+        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_heated_bed": { "default_value": true },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_start_gcode": {
+            "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home"
+        },
+        "machine_end_gcode": {
+            "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers"
+        },
+        "machine_extruder_count": {
+            "default_value": 1
+        }
+
+    }
+}

resources/definitions/goofoo_base.def.json

@@ -59,16 +59,13 @@
         "acceleration_enabled": { "value": false },
         "jerk_enabled": { "value": false },
 
-        "speed_print": { "value": 40.0 } ,
+        "speed_print": { "value": 40.0 },
-        "speed_infill": { "value": "speed_print" },
         "speed_wall": { "value": "speed_print" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
         "speed_topbottom": { "value": "speed_print" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "80" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "60" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -77,18 +74,15 @@
 
         "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": "'back'" },
         "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_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -111,7 +105,6 @@
             "maximum_value": 200
         },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -119,18 +112,13 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "3 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
         
-        
-
-        
         "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
         "wall_thickness": {"value": "line_width * 2" }
 

resources/definitions/hctech_hc300-m1&m1h.def.json

@@ -36,7 +36,6 @@
         "retraction_speed": { "default_value": 35},
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
-        "retraction_enable": { "value": true },
 
         "gantry_height": { "value": "55" },
         "speed_print": { "default_value": 60.0 } ,
@@ -48,8 +47,6 @@
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 P1;clean nozzle\nG1 X5 Y300 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" },
 
         "cool_fan_speed": { "value": 75 },
-        "cool_fan_enabled": { "value": true },
-
         "line_width": { "value": 0.38 },
         "travel_avoid_distance": { "value": 1 },
         "infill_before_walls": { "value": false }

resources/definitions/hctech_hc300-m2h.def.json

@@ -37,7 +37,6 @@
         "retraction_speed": { "default_value": 35},
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
-        "retraction_enable": { "value": true },
 
         "gantry_height": { "value": "55" },
         "speed_print": { "default_value": 60.0 } ,
@@ -49,7 +48,6 @@
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 ;clean nozzle\nG1 X5 Y319 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" },
         
         "cool_fan_speed": { "value": 75 },
-        "cool_fan_enabled": { "value": true },
        
         "line_width": { "value": 0.38 },
         "travel_avoid_distance": { "value": 1 },

resources/definitions/hctech_hc300-m3.def.json

@@ -38,7 +38,6 @@
         "retraction_speed": { "default_value": 35},
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
-        "retraction_enable": { "value": true },
 
         "gantry_height": { "value": "55" },
         "speed_print": { "default_value": 60.0 } ,
@@ -49,7 +48,6 @@
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 Z1 E-2 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG1 X5 Y290 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z" },
 		        
         "cool_fan_speed": { "value": 75 },
-        "cool_fan_enabled": { "value": true },
         
         "line_width": { "value": 0.38 },
         "travel_avoid_distance": { "value": 1 },

resources/definitions/hms434.def.json

@@ -108,12 +108,10 @@
 
         "default_material_print_temperature":     {"maximum_value": "401" },
         "material_print_temperature":             {"maximum_value": "401" },
-        "material_print_temperature_layer_0":     {"value": "material_print_temperature",
+        "material_print_temperature_layer_0":     {"maximum_value": "401" },
-                                                   "maximum_value": "401" },
         "material_initial_print_temperature":     {"value": "material_print_temperature",
                                                    "maximum_value_warning": "material_print_temperature + 15",
                                                    "maximum_value": "401" },
-        "material_initial_print_temperature":     {"maximum_value": "401" },
         "material_final_print_temperature":       {"value": "material_print_temperature",
                                                    "maximum_value": "401" },
         "material_break_preparation_temperature": {"maximum_value": "401" },
@@ -126,10 +124,9 @@
         "switch_extruder_prime_speed":            {"value": "(retraction_prime_speed)"},
 
         "speed_print":             {"value": "50"},
-        "speed_infill":            {"value": "speed_print"},
+        "speed_wall":              {"value": "(speed_print/ 5 * 3) if speed_print > 45 else speed_print"},
-        "speed_wall":              {"value": "(speed_print/5*3) if speed_print > 45 else speed_print"},
         "speed_wall_x":            {"value": "speed_wall"},
-        "speed_layer_0":           {"value": "(speed_print/5*4) if speed_print > 45 else speed_print"},
+        "speed_layer_0":           {"value": "(speed_print / 5 * 4) if speed_print > 45 else speed_print"},
         "speed_topbottom":         {"value": "speed_layer_0"},
         "speed_travel":            {"value": "250"},
         "speed_travel_layer_0":    {"value": "speed_travel"},
@@ -167,7 +164,6 @@
         "skirt_gap":                 {"value": 1},
         "skirt_brim_minimal_length": {"value": 50},
 
-        "prime_tower_enable":         {"value": false },
         "prime_tower_size":           {"value": 20.6 },
         "prime_tower_position_x":     {"value": 125 },
         "prime_tower_position_y":     {"value": 70 },

resources/definitions/imade3d_jellybox_root.def.json

@@ -53,55 +53,6 @@
         "tizyx_abs",
         "tizyx_pla_bois",
         "tizyx_pla",
-        "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",

resources/definitions/inat_base.def.json

@@ -151,43 +151,32 @@
             "value": "4"
         },
         "default_material_print_temperature": {
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "material_print_temperature": {
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "material_print_temperature_layer_0": {
             "value": "material_print_temperature",
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "material_initial_print_temperature": {
             "value": "material_print_temperature",
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "material_final_print_temperature": {
             "value": "material_print_temperature",
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "default_material_bed_temperature": {
-            "maximum_value_warning": "150",
             "maximum_value": "150"
         },
         "material_bed_temperature": {
-            "maximum_value_warning": "150",
             "maximum_value": "150"
         },
         "material_bed_temperature_layer_0": {
-            "maximum_value_warning": "150",
             "maximum_value": "150"
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_wall": {
             "value": "speed_print"
         },

resources/definitions/kingroon_base.def.json

@@ -129,7 +129,7 @@
     "overrides": {
         "machine_name": { "default_value": "Kingroon Base Printer" },
         "machine_start_gcode": { "default_value": "G28 ; home all axes\n M117 Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y175.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y175.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"},
-        "machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y200 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n G1 X0 Y300 F1000 ; prepare for part removal\n M84 ; disable motors\n M106 S0 ; turn off fan" },
+        "machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n G1 X0 Y175 F1000 ; prepare for part removal\n M84 ; disable motors\n M106 S0 ; turn off fan" },
 
         "machine_width": { "default_value": 180 },
         "machine_depth": { "default_value": 180 },
@@ -170,15 +170,11 @@
 		"default_material_bed_temperature": { "maximum_value": "150" },
 
         "speed_print": { "value": 60.0 } ,
-        "speed_infill": { "value": "speed_print" },
+
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "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.0 },
-        "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" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -193,7 +189,6 @@
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
 
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_none'" },
@@ -230,13 +225,11 @@
         "travel_retract_before_outer_wall": { "value": true },
         
 		"retraction_amount": { "value": 2 },
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 2 },
         "retraction_min_travel": { "value": 1.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": "'none' if support_enable else 'skirt'" },

resources/definitions/koonovo_base.def.json

@@ -49,7 +49,6 @@
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
 
-        "line_width": { "value": "machine_nozzle_size" },
         
         "wall_thickness": {"value": "line_width * 2" },
 
@@ -58,39 +57,28 @@
         "infill_sparse_density": { "value": "15" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
     
-        "material_print_temperature": { "value": "195" }, 
+        "default_material_print_temperature": { "value": "195" },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature" },       
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "material_bed_temperature": { "value": "55" },       
         "material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
-        "material_flow": { "value": 100 },
         "material_standby_temperature": { "value": "material_print_temperature" },
 
-
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
+
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" },
         "speed_layer_0": { "value": 25.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_z_hop": { "value": 5 },
-
-        "retraction_enable": { "value": true },
         "retraction_amount": { "value": 2.5 },
         "retraction_speed": { "value": 40 },
 	    
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
-
         "support_brim_enable": { "value": true },
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
         "support_pattern": { "value": "'zigzag'" },

resources/definitions/koonovo_kn3.def.json

@@ -66,7 +66,6 @@
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
 
-        "line_width": { "value": "machine_nozzle_size" },
         
         "wall_thickness": {"value": "line_width * 2" },
 
@@ -75,36 +74,25 @@
         "infill_sparse_density": { "value": "15" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
     
-        "material_print_temperature": { "value": "195" }, 
+        "default_material_print_temperature": { "value": "195" },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature" },       
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_bed_temperature": { "value": "55" },       
+        "default_material_bed_temperature": { "value": "55" },
-        "material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
-        "material_flow": { "value": 100 },
         "material_standby_temperature": { "value": "material_print_temperature" },
 
-
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" },
         "speed_layer_0": { "value": 25.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_z_hop": { "value": 5 },
 
-        "retraction_enable": { "value": true },
         "retraction_amount": { "value": 2.5 },
         "retraction_speed": { "value": 40 },     
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
 

resources/definitions/koonovo_kn5.def.json

@@ -23,8 +23,8 @@
         "preferred_material": "generic_pla"
     },
 
-        
+    "overrides":
-    "overrides": {
+    {
         "machine_name": { "default_value": "Koonovo KN5" },
         "machine_width": { "default_value": 420 },
         "machine_depth": { "default_value": 420 },
@@ -39,7 +39,6 @@
 
         "gantry_height": { "value": 0 },
 
-
         "machine_extruder_count": { "default_value": 2 },
        
         "machine_start_gcode": {
@@ -64,12 +63,9 @@
 
         "material_diameter": { "default_value": 1.75 },
 
-
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
         
-        "line_width": { "value": "machine_nozzle_size" },
-        
         "wall_thickness": {"value": "line_width * 2" },
 
         "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },      
@@ -77,38 +73,27 @@
         "infill_sparse_density": { "value": "15" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
     
-        "material_print_temperature": { "value": "195" }, 
+        "default_material_print_temperature": { "value": "195" },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature" },       
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "material_standby_temperature": { "value": "material_print_temperature" },
-        "material_bed_temperature": { "value": "45" },       
+        "default_material_bed_temperature": { "value": "45" },
-        "material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
-        "material_flow": { "value": 100 },
 
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" },
         "speed_layer_0": { "value": 25.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_z_hop": { "value": 5 },
 
-        "retraction_enable": { "value": true },
         "retraction_amount": { "value": 2.5 },
         "retraction_speed": { "value": 40 },     
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
-
         "support_brim_enable": { "value": true },
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
         "support_pattern": { "value": "'zigzag'" },

resources/definitions/kupido.def.json

@@ -9,7 +9,7 @@
         "manufacturer": "Kati Hal ARGE",
         "file_formats": "text/x-gcode",
         "platform_offset": [ 0, 0, 0],
-        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "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_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ],
+        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ],
         "preferred_material": "generic_pla",
         "has_machine_quality": true,
         "has_materials": true,

resources/definitions/liquid.def.json

@@ -88,7 +88,6 @@
             "enabled": true
         },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "4000" },

resources/definitions/longer_base.def.json

@@ -60,15 +60,10 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "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.0 },
-        "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" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -77,18 +72,15 @@
 
         "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": "'back'" },
         "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_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -113,7 +105,6 @@
             "maximum_value": 200
         },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -121,13 +112,12 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
         
-        "retraction_enable": { "value": true },
+
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.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": "'raft'" },

resources/definitions/lotmaxx_sc10.def.json

@@ -14,7 +14,8 @@
             "0": "lotmaxx_sc10_extruder_0"
         }
     },
-    "overrides": {
+    "overrides":
+    {
         "machine_name": { "default_value": "Lotmaxx SC-10" },
         "machine_width": { "default_value": 235 },
         "machine_depth": { "default_value": 235 },
@@ -23,42 +24,39 @@
         "gantry_height": { "value": 40 },
         "machine_start_gcode": { "default_value": "; SC-10 Custom Start G-code\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n; End of custom start GCode" },
         "machine_end_gcode": { "default_value": "; SC-10 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z20 ; Move Z Axis up 20 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM84 ; Disable stepper motors\n; End of custom end GCode" },
-        "machine_max_jerk_xy":{ "value":10 },
+        "machine_max_jerk_xy":{ "value": 10 },
-        "machine_max_jerk_z":{ "value":0.4 },
+        "machine_max_jerk_z":{ "value": 0.4 },
-        "machine_max_jerk_e":{ "value":5 },
+        "machine_max_jerk_e":{ "value": 5 },
-        "machine_heated_bed":{ "default_value":true },
+        "machine_heated_bed":{ "default_value": true },
-        "material_diameter":{ "default_value":1.75 },
+        "material_diameter":{ "default_value": 1.75 },
-        "jerk_print":{ "value":8 },
+        "jerk_print":{ "value": 8 },
-        "jerk_travel":{ "value":"jerk_print" },
+        "jerk_travel":{ "value": "jerk_print" },
-        "jerk_travel_layer_0":{ "value":"jerk_travel" },
+        "jerk_travel_layer_0":{ "value":" jerk_travel" },
-        "acceleration_enabled":{ "value":false },
+        "acceleration_enabled":{ "value": false },
-        "jerk_enabled":{ "value":false },
+        "jerk_enabled":{ "value": false },
-        "speed_print":{ "value":60.0 },
+        "speed_print":{ "value": 60.0 },
-        "speed_infill":{ "value":"speed_print * 2" },
+        "speed_infill":{ "value": "speed_print * 2" },
-        "speed_wall":{ "value":"speed_print / 2" },
+        "speed_wall_0":{ "value": "speed_wall" },
-        "speed_wall_0":{ "value":"speed_wall" },
+        "speed_wall_x":{ "value": "speed_wall" },
-        "speed_wall_x":{ "value":"speed_wall" },
+        "speed_roofing":{ "value": "speed_topbottom" },
-        "speed_topbottom":{ "value":"speed_print / 2" },
+        "speed_travel":{ "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
-        "speed_roofing":{ "value":"speed_topbottom" },
+        "speed_layer_0":{ "value": 20.0 },
-        "speed_travel":{ "value":"150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
+        "speed_travel_layer_0":{ "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
-        "speed_layer_0":{ "value":20.0 },
+        "speed_prime_tower":{ "value": "speed_topbottom" },
-        "speed_print_layer_0":{ "value":"speed_layer_0" },
+        "speed_support":{ "value": "speed_wall_0" },
-        "speed_travel_layer_0":{ "value":"100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
+        "speed_support_interface":{ "value": "speed_topbottom" },
-        "speed_prime_tower":{ "value":"speed_topbottom" },
+        "skirt_brim_speed":{ "value": "speed_layer_0" },
-        "speed_support":{ "value":"speed_wall_0" },
+        "retraction_enable":{ "value": true },
-        "speed_support_interface":{ "value":"speed_topbottom" },
+        "retraction_count_max":{ "value": 100 },
-        "skirt_brim_speed":{ "value":"speed_layer_0" },
+        "retraction_extrusion_window":{ "value": 10 },
-        "retraction_enable":{ "value":true },
+        "retraction_min_travel":{ "value": 1.5 },
-        "retraction_count_max":{ "value":100 },
+        "cool_fan_full_at_height":{ "value": "layer_height_0 + 2 * layer_height" },
-        "retraction_extrusion_window":{ "value":10 },
+        "cool_fan_enabled":{ "value": true },
-        "retraction_min_travel":{ "value":1.5 },
+        "cool_min_layer_time":{ "value": 10 },
-        "cool_fan_full_at_height":{ "value":"layer_height_0 + 2 * layer_height" },
+        "meshfix_maximum_resolution":{ "value": "0.25" },
-        "cool_fan_enabled":{ "value":true },
+        "meshfix_maximum_travel_resolution":{ "value": "meshfix_maximum_resolution" },
-        "cool_min_layer_time":{ "value":10 },
-        "meshfix_maximum_resolution":{ "value":"0.25" },
-        "meshfix_maximum_travel_resolution":{ "value":"meshfix_maximum_resolution" },
         "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
-        "skirt_gap":{ "value":5.0 },
+        "skirt_gap":{ "value": 5.0 },
-        "skirt_line_count":{ "value":4 }
+        "skirt_line_count":{ "value": 4 }
     }
 }

resources/definitions/lotmaxx_sc20.def.json

@@ -35,14 +35,11 @@
         "jerk_enabled":{ "value":false },
         "speed_print":{ "value":60.0 },
         "speed_infill":{ "value":"speed_print * 2" },
-        "speed_wall":{ "value":"speed_print / 2" },
         "speed_wall_0":{ "value":"speed_wall" },
         "speed_wall_x":{ "value":"speed_wall" },
-        "speed_topbottom":{ "value":"speed_print / 2" },
         "speed_roofing":{ "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.0 },
-        "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" },
         "speed_prime_tower":{ "value":"speed_topbottom" },
         "speed_support":{ "value":"speed_wall_0" },

resources/definitions/maker_made_300x.def.json

@@ -68,7 +68,6 @@
         "infill_support_enabled": {"value": false },
         "max_skin_angle_for_expansion": {"value": 90},
         "default_material_print_temperature": {"value": 220},
-        "material_print_temperature": {"value": 220},
         "material_print_temperature_layer_0": {"value": 220},
         "material_initial_print_temperature": {"value": 220},
         "material_final_print_temperature": {"value": 220},

resources/definitions/malyan_m200.def.json

@@ -28,7 +28,6 @@
         "speed_wall_x": { "value": "speed_print" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_layer_0": { "value": "round(speed_print / 2.0, 2)" },
-        "speed_infill": { "value": "speed_print" },
         "speed_topbottom": {"value": "speed_print / 2"},
 
         "layer_height":
@@ -80,7 +79,6 @@
         "retraction_amount" : { "default_value": 4.5},
         "retraction_speed" : { "default_value": 40},
         "coasting_enable": { "default_value": true },
-        "prime_tower_enable": { "default_value": false},
         "speed_z_hop": {"default_value": 1.5}
     }
 }

resources/definitions/mingda_base.def.json

@@ -64,55 +64,6 @@
             "tizyx_abs",
             "tizyx_pla",
             "tizyx_pla_bois",
-            "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"
@@ -157,15 +108,10 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 60.0 } ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "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.0 },
-        "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" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -180,7 +126,6 @@
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
 
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_none'" },
@@ -217,13 +162,12 @@
         "travel_retract_before_outer_wall": { "value": true },
         
 		"retraction_amount": { "value": 2 },
-        "retraction_enable": { "value": true },
+
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.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": "'none' if support_enable else 'skirt'" },

resources/definitions/mixware_hyper_s.def.json

@@ -241,12 +241,6 @@
         "skirt_brim_speed": {
             "value": "speed_layer_0"
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
-        "speed_wall": {
-            "value": "speed_print / 2"
-        },
         "speed_wall_0": {
             "value": "speed_wall"
         },
@@ -262,9 +256,6 @@
         "speed_travel": {
             "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5"
         },
-        "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"
         },

resources/definitions/mp_mini_delta.def.json

@@ -48,7 +48,6 @@
         },
         "material_bed_temperature": { "value": 40 },
         "line_width": { "value": "round(machine_nozzle_size, 2)" },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature" },
         "material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_max_feedrate_x": { "default_value": 150 },

resources/definitions/renkforce_rf100.def.json

@@ -104,7 +104,7 @@
         "material_flow": {
             "value": "110"
         },
-        "material_print_temperature": {
+        "default_material_print_temperature": {
             "value": "210.0"
         },
         "ooze_shield_enabled": {

resources/definitions/renkforce_rf100_v2.def.json

@@ -104,9 +104,6 @@
         "material_flow": {
             "value": "110"
         },
-        "material_print_temperature": {
-            "value": "210.0"
-        },
         "ooze_shield_enabled": {
             "value": "True"
         },

resources/definitions/renkforce_rf100_xl.def.json

@@ -92,9 +92,6 @@
         "material_bed_temperature": {
             "value": "70"
         },
-        "material_print_temperature": {
-            "value": "210.0"
-        },
         "ooze_shield_enabled": {
             "value": "True"
         },

resources/definitions/rigid3d_base.def.json

@@ -50,16 +50,6 @@
             "redd_abs", "redd_asa", "redd_hips", "redd_nylon", "redd_petg", "redd_pla", "redd_tpe",
             "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"
@@ -122,8 +112,8 @@
         "retraction_combing": { "value": "'noskin'" },
         "travel_avoid_other_parts": { "value": "False" },
         
-        "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" },
+        "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" },
-        "support_interface_enable": { "value": "True" },
+        "support_interface_enable": { "value": true },
         "support_interface_density": { "value": 70 },
         "minimum_interface_area": { "value": 5.0 },
         "minimum_support_area": { "value": 5 },

resources/definitions/rigid3d_hobby.def.json

@@ -72,55 +72,6 @@
             "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",

resources/definitions/rigid3d_mucit.def.json

@@ -74,55 +74,6 @@
             "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",

resources/definitions/rigid3d_zero.def.json

@@ -72,55 +72,6 @@
             "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",

resources/definitions/skriware_2.def.json

@@ -30,8 +30,11 @@
     "support_skip_zag_per_mm": {
       "default_value": 10
     },
+    "default_material_bed_temperature":
+    {
+      "value": "50"
+    },
     "material_bed_temperature": {
-      "value": "50",
       "minimum_value_warning": "30",
       "resolve": "extruderValues('material_bed_temperature')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature'))"
     },
@@ -366,9 +369,6 @@
     "z_seam_x": {
       "value": "115"
     },
-    "material_print_temperature": {
-      "value": "195"
-    },
     "material_bed_temperature_layer_0": {
       "value": "50",
       "minimum_value_warning": "30",

resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json

@@ -28,9 +28,6 @@
 
     "overrides": {
         "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "infill_sparse_density": {
             "value": 100
         },

resources/definitions/tank_m3.def.json

@@ -0,0 +1,25 @@
+{
+    "name": "Tank M3",
+    "version": 2,
+    "inherits": "tank_m_base",
+    "overrides": {
+        "machine_name": { "default_value": "Tank M3" },
+        "machine_width": { "default_value": 235 },
+        "machine_depth": { "default_value": 235 },
+        "machine_height": { "default_value": 250 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
+            ]
+        },
+
+        "gantry_height": { "value": 0 }
+
+    },
+    "metadata": {
+        "quality_definition": "tank_m_base",
+        "visible": true
+    }
+}

resources/definitions/tank_m3_max.def.json

@@ -0,0 +1,24 @@
+{
+    "name": "Tank M3 Max",
+    "version": 2,
+    "inherits": "tank_m_base",
+    "overrides": {
+        "machine_name": { "default_value": "Tank M3 Max" },
+        "machine_width": { "default_value": 310 },
+        "machine_depth": { "default_value": 310 },
+        "machine_height": { "default_value": 400 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
+            ]
+        },
+
+        "gantry_height": { "value": 0 }
+    },
+    "metadata": {
+        "quality_definition": "tank_m_base",
+        "visible": true
+    }
+}

resources/definitions/tank_m_base.def.json

@@ -0,0 +1,112 @@
+{
+    "name": "tank_m Base Printer",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": false,
+        "author": "tank_m",
+        "manufacturer": "tank_m",
+        "file_formats": "text/x-gcode",
+        "platform": "tank_m.obj",
+        "platform_texture": "tank_m.png",
+
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "machine_extruder_trains": {"0": "tank_m_base_extruder_0"},
+
+        "has_materials": true,
+        "has_machine_quality": true,
+
+
+        "preferred_quality_type": "standard",
+        "preferred_material": "generic_pla"
+    },
+
+        
+    "overrides": {
+        "machine_start_gcode": {
+            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Move to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nM117 Printing..."
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        },
+
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 50 },
+        "machine_max_feedrate_e": { "value": 500 },
+
+        "machine_max_acceleration_x": { "value": 2500 },
+        "machine_max_acceleration_y": { "value": 2500 },
+        "machine_max_acceleration_z": { "value": 100 },
+        "machine_max_acceleration_e": { "value": 2000 },
+        "machine_acceleration": { "value": 2500 },
+
+        "machine_heated_bed": { "default_value": true },
+
+        "material_diameter": { "default_value": 1.75 },
+
+
+        "acceleration_print": { "value": 2500 },
+        "acceleration_travel": { "value": 2500 },
+
+        
+        "wall_thickness": {"value": "line_width * 2" },
+
+        "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },      
+    
+        "infill_sparse_density": { "value": "15" },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+    
+        "material_print_temperature": { "value": "195" },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_bed_temperature": { "value": "55" },       
+        "material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
+        "material_standby_temperature": { "value": "material_print_temperature" },
+
+        "speed_print": { "value": 50.0 } ,
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_travel": { "value": "120.0 if speed_print < 60 else 300.0 if speed_print > 100 else speed_print * 2.2" },
+        "speed_layer_0": { "value": 25.0 },
+        "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_z_hop": { "value": 5 },
+
+        "retraction_amount": { "value": 1.0 },
+        "retraction_speed": { "value": 40 },
+	    
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "value": 10 },
+
+        "support_brim_enable": { "value": true },
+        "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_enable and support_structure == 'tree' 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_width": { "value": 4 },
+
+        "support_enable": { "value": true },
+        "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "layer_height * 4" },
+        "support_interface_density": { "value": 33.333 },
+        "support_interface_pattern": { "value": "'grid'" },
+        "support_interface_skip_height": { "value": 0.2 },
+        "minimum_support_area": { "value": 2 },
+        "minimum_interface_area": { "value": 10 },
+
+        "fill_outline_gaps": { "value": false },
+
+        "adhesion_type": { "value": "'skirt'" },
+        "brim_replaces_support": { "value": false },
+        "skirt_gap": { "value": 6.0 },
+        "skirt_line_count": { "value": 3 }
+
+
+    }
+}

resources/definitions/tizyx_evy.def.json

@@ -15,7 +15,7 @@
         "preferred_variant_name": "0.4mm",
         "preferred_material": "tizyx_pla",
         "preferred_quality_type": "normal",
-        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175","generic_pp", "generic_pva", "generic_pva_175", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "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_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ],
+        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175","generic_pp", "generic_pva", "generic_pva_175", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ],
 
         "machine_extruder_trains":
         {

resources/definitions/tizyx_k25.def.json

@@ -10,7 +10,7 @@
         "file_formats": "text/x-gcode",
         "platform": "tizyx_k25_platform.3mf",
         "platform_offset": [0, -4, 0],
-        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "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_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pla", "generic_pla_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "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_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ],
+        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "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_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pla", "generic_pla_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ],
         "preferred_material": "tizyx_pla",
         "has_machine_quality": true,
         "has_materials": true,

resources/definitions/trimaker_cosmosII.def.json

@@ -89,55 +89,6 @@
             "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",

resources/definitions/trimaker_nebula.def.json

@@ -89,55 +89,6 @@
             "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",

resources/definitions/trimaker_nebula_plus.def.json

@@ -32,7 +32,6 @@
         "machine_acceleration": { "default_value": 3000 },
         "machine_extruder_count": { "default_value": 1 },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_print": { "value": "4000" },
         "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },

resources/definitions/tronxy_x.def.json

@@ -46,15 +46,12 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 60.0 } ,
-        "speed_infill": { "value": "speed_print" },
+        "speed_wall": { "value": "speed_print * 0.75" },
-        "speed_wall": { "value": "speed_print *0.75" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
         "speed_topbottom": { "value": "speed_print * 0.5" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "60.0 if speed_print < 50 else 120.0 if speed_print > 80 else speed_print * 1.25" },
         "speed_layer_0": { "value": 30.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "45 if speed_layer_0 < 20 else 60 if speed_layer_0 > 30 else speed_layer_0 * 1.5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -63,7 +60,6 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
 
         "optimize_wall_printing_order": { "value": "True" },
 
@@ -75,7 +71,6 @@
         "z_seam_type": { "value": "'sharpest_corner'" },
         "z_seam_corner": { "value": "'z_seam_corner_inner'" },
 
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 56 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -106,7 +101,6 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retract_at_layer_change": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 5 },
@@ -114,7 +108,6 @@
         "retraction_min_travel": { "value": 1.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'" },
@@ -140,8 +133,6 @@
         "support_wall_count": { "value": 0 },
         "support_brim_enable": { "value": true },
         "support_brim_width": { "value": 4 },
-
-        "support_interface_enable": { "value": false },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_density": { "value": 33.333 },
         "support_interface_pattern": { "value": "'grid'" },

resources/definitions/two_trees_base.def.json

@@ -32,15 +32,10 @@
 
         "material_diameter": { "default_value": 1.75 },
 
-        "speed_print": { "value": 50.0 } ,
+        "speed_print": { "value": 50.0 },
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_print / 1.5" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },      
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_support_interface": { "value": "speed_topbottom" },
@@ -48,14 +43,12 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
 
         "optimize_wall_printing_order": { "value": "True" },
 
         "z_seam_type": { "value": "'sharpest_corner'" },
         "z_seam_corner": { "value": "'z_seam_corner_inner'" },
 
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -65,7 +58,6 @@
 
         "fill_outline_gaps": { "value": false },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -73,16 +65,13 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_speed": { "default_value" : 40 },
         "retraction_amount": { "default_value" : 7 }, 
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
-
         "cool_fan_full_layer": { "value": "2" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'skirt'" },
@@ -108,7 +97,6 @@
         "support_brim_enable": { "value": true },
         "support_brim_width": { "value": 5 },
 
-        "support_interface_enable": { "value": false },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_density": { "value": 33.333 },
         "support_interface_pattern": { "value": "'grid'" },

resources/definitions/ultimaker2_plus_connect.def.json

@@ -57,8 +57,6 @@
         "infill_wipe_dist": { "value": "0" },
         "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" },
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall_x": { "value": "speed_wall" },
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "optimize_wall_printing_order": { "value": "True" },
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" },

resources/definitions/ultimaker3.def.json

@@ -82,7 +82,6 @@
 
         "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" },
         "acceleration_print": { "value": "3500" },

resources/definitions/ultimaker_s3.def.json

@@ -75,7 +75,6 @@
             "value": "150"
         },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" },
         "acceleration_print": { "value": "3500" },

resources/definitions/ultimaker_s5.def.json

@@ -77,7 +77,6 @@
             "value": "150"
         },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" },
         "acceleration_print": { "value": "3500" },

resources/definitions/uni_base.def.json

@@ -65,55 +65,6 @@
                               "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",

resources/definitions/voron2_base.def.json

@@ -17,57 +17,7 @@
         "preferred_variant_name": "V6 0.40mm",
         "machine_extruder_trains": { "0": "voron2_extruder_0" },
         "preferred_material": "generic_abs",
-        "exclude_materials": [
+        "exclude_materials": []
-            "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"
-        ]
     },
     "overrides":
     {

resources/definitions/weedo_x40.def.json

@@ -215,7 +215,6 @@
         "infill_overlap": { "value": 30.0 },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_wipe_dist": { "value": 0.0 },
-        "infill_sparse_density": { "value": "20" },
         "infill_before_walls": { "value": false },
         "jerk_enabled": { "value": false },
         "jerk_print": { "value": 11 },
@@ -224,40 +223,31 @@
         "jerk_travel": { "value": 18 },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
         "layer_height_0": { "value": "round(layer_height * 1.5, 2)" },
-        "line_width": { "value": "machine_nozzle_size" },
         "machine_min_cool_heat_time_window": { "default_value": 360 },
         "machine_max_jerk_xy": { "value": 10 },
         "machine_max_jerk_z": { "value": 0.4 },
         "machine_max_jerk_e": { "value": 5 },
         "machine_center_is_zero": { "default_value": false },
         "material_diameter": { "default_value": 1.75 },
-        "material_flow": { "value": 100 },
         "material_standby_temperature": { "value": "100" },
-        "material_print_temp_prepend": { "default_value":false },      
+        "material_print_temp_prepend": { "default_value": false },
-        "prime_tower_enable": { "default_value": false },
         "raft_airgap": { "default_value": 0.22 },
         "raft_base_speed":{ "value": 20 },
         "raft_interface_speed": { "value": 33 },
         "raft_margin": { "default_value": 8 },
-        "retraction_enable": { "value": true },
+
         "retraction_amount": { "default_value": 4.5 },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 8 },
         "retraction_hop": { "value": 0.5 },
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_min_travel": { "value": 1.5 },
         "skin_overlap": { "value": 10.0 },
         "speed_layer_0": { "value": "round(speed_print / 2.5, 2)" },
         "speed_print": { "value": 50.0 },
         "speed_support": { "value": "speed_wall_0" },
         "speed_support_interface": { "value": "speed_print" },
-        "speed_topbottom": { "value": "speed_print / 2" }, 
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_infill": { "value": "speed_print" },
         "speed_support_infill": { "value": 58.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": 60 },
         "speed_support_roof": { "value": 39.0 },
         "speed_support_bottom": { "value": 39.0 },

resources/definitions/winbo_dragonl4.def.json

@@ -40,7 +40,6 @@
         "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nM9998\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\nG92 E0\nG1 F800 X585 E12\nG92 E0" },
         "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" },
         "prime_blob_enable": { "enabled": true },
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "1800" },
@@ -69,11 +68,11 @@
         "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
         "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
         "wall_thickness": { "value": "2.4"},
-        "line_width": { "value": "extruderValue(-1,'machine_nozzle_size')" },
+        "line_width": { "value": "extruderValue(-1, 'machine_nozzle_size')" },
         "wall_0_inset": { "value": "0.05" },
         "wall_line_width_x": { "value": "line_width" },
         "wall_line_width_0": { "value": "line_width-0.05" },
-        "support_line_width": { "value": "max(min(line_width,0.4),line_width/2)" },
+        "support_line_width": { "value": "max(min(line_width, 0.4),line_width / 2)" },
         "support_interface_line_width": { "value": "support_line_width" },
         "machine_min_cool_heat_time_window": { "value": "15" },
         "default_material_print_temperature": { "value": "200" },
@@ -99,33 +98,32 @@
         "skin_overlap": { "value": "10" },
         "speed_layer_0": { "value": "25" },
         "speed_print": { "value": "70" },
-        "speed_support": { "value": "speed_print*line_width/support_line_width" },
+        "speed_support": { "value": "speed_print * line_width / support_line_width" },
-        "speed_support_interface": { "value": "speed_print*line_width/support_interface_line_width" },
+        "speed_support_interface": { "value": "speed_print * line_width / support_interface_line_width" },
-        "speed_topbottom": { "value": "speed_print*line_width/skin_line_width" },
+        "speed_topbottom": { "value": "speed_print * line_width / skin_line_width" },
         "speed_travel": { "value": "100" },
-        "speed_infill": { "value": "speed_print*line_width/infill_line_width" },
+        "speed_infill": { "value": "speed_print * line_width / infill_line_width" },
-        "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" },
+        "speed_wall": { "value": "speed_print * wall_line_width_0 / line_width" },
         "speed_wall_0": { "value": "math.ceil(speed_wall * 0.6)" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": "50" },
         "support_xy_distance": { "value": "1" },
-        "support_z_distance": { "value": "max((0.2 if(0.2%layer_height==0) else layer_height*int((0.2+layer_height)/layer_height)),layer_height)" },
+        "support_z_distance": { "value": "max((0.2 if(0.2 % layer_height == 0) else layer_height * int((0.2 + layer_height) / layer_height)), layer_height)" },
-        "support_bottom_distance": { "value": "max(support_z_distance,layer_height*int(0.45/layer_height))" },
+        "support_bottom_distance": { "value": "max(support_z_distance, layer_height * int(0.45 / layer_height))" },
-        "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" },
+        "top_bottom_thickness": { "value": "max(1.2, layer_height * 6)" },
         "travel_avoid_distance": { "value": "3" },
         "gradual_support_infill_step_height": { "value": "0.2" },
         "gradual_support_infill_steps": { "value": "1" },
-        "infill_sparse_density": { "value": "20" },
         "gradual_infill_step_height": { "value": "1" },
         "initial_layer_line_width_factor": { "value": "120" },
         "jerk_travel": { "value": "25" },
         "support_bottom_enable": { "value": "True" },
-        "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" },
+        "support_bottom_height": { "value": "max((0.15 if(0.15 % layer_height == 0) else layer_height * int((0.15 + layer_height) / layer_height)), layer_height)" },
         "support_bottom_pattern": { "value": "'zigzag'" },
         "support_connect_zigzags": { "value": "False" },
         "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
-        "support_interface_enable": { "value": "True" },
+        "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "0.5" },
         "support_roof_pattern": { "value": "'concentric'" },
         "z_seam_type": { "value": "'shortest'" }

resources/definitions/winbo_mini2.def.json

@@ -40,7 +40,6 @@
         "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F1000 Z3\nG1 F4000 X0\nG1 F4000 Y0\nG1 F1000 Z0.2\nG92 E0\nG1 F1000 X30 E8\nG92 E0\nM117 Printing." },
         "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" },
         "prime_blob_enable": { "enabled": true },
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "2000" },
@@ -99,23 +98,22 @@
         "skin_overlap": { "value": "10" },
         "speed_layer_0": { "value": "20" },
         "speed_print": { "value": "50" },
-        "speed_support": { "value": "speed_print*line_width/support_line_width" },
+        "speed_support": { "value": "speed_print * line_width / support_line_width" },
-        "speed_support_interface": { "value": "speed_print*line_width/support_interface_line_width" },
+        "speed_support_interface": { "value": "speed_print * line_width / support_interface_line_width" },
-        "speed_topbottom": { "value": "speed_print*line_width/skin_line_width" },
+        "speed_topbottom": { "value": "speed_print * line_width / skin_line_width" },
         "speed_travel": { "value": "90" },
-        "speed_infill": { "value": "speed_print*line_width/infill_line_width" },
+        "speed_infill": { "value": "speed_print * line_width / infill_line_width" },
-        "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" },
+        "speed_wall": { "value": "speed_print * wall_line_width_0  /line_width" },
         "speed_wall_0": { "value": "math.ceil(speed_wall * 0.6)" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": "50" },
         "support_xy_distance": { "value": "1" },
-        "support_z_distance": { "value": "max((0.2 if(0.2%layer_height==0) else layer_height*int((0.2+layer_height)/layer_height)),layer_height)" },
+        "support_z_distance": { "value": "max((0.2 if(0.2 % layer_height==0) else layer_height * int((0.2 + layer_height) / layer_height)), layer_height)" },
         "support_bottom_distance": { "value": "max(support_z_distance,layer_height*int(0.45/layer_height))" },
         "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" },
         "travel_avoid_distance": { "value": "3" },
         "gradual_support_infill_step_height": { "value": "0.2" },
         "gradual_support_infill_steps": { "value": "1" },
-        "infill_sparse_density": { "value": "20" },
         "gradual_infill_step_height": { "value": "1" },
         "initial_layer_line_width_factor": { "value": "120" },
         "jerk_travel": { "value": "25" },
@@ -125,7 +123,7 @@
         "support_connect_zigzags": { "value": "False" },
         "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
-        "support_interface_enable": { "value": "True" },
+        "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "0.5" },
         "support_roof_pattern": { "value": "'concentric'" },
         "z_seam_type": { "value": "'shortest'" }

resources/definitions/winbo_superhelper105.def.json

@@ -88,33 +88,32 @@
         "skin_overlap": { "value": "10" },
         "speed_layer_0": { "value": "20" },
         "speed_print": { "value": "52" },
-        "speed_support": { "value": "speed_print*line_width/support_line_width" },
+        "speed_support": { "value": "speed_print * line_width / support_line_width" },
-        "speed_support_interface": { "value": "speed_print*line_width/support_interface_line_width" },
+        "speed_support_interface": { "value": "speed_print * line_width / support_interface_line_width" },
-        "speed_topbottom": { "value": "speed_print*line_width/skin_line_width" },
+        "speed_topbottom": { "value": "speed_print * line_width / skin_line_width" },
         "speed_travel": { "value": "80" },
-        "speed_infill": { "value": "speed_print*line_width/infill_line_width" },
+        "speed_infill": { "value": "speed_print * line_width / infill_line_width" },
-        "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" },
+        "speed_wall": { "value": "speed_print * wall_line_width_0 / line_width" },
         "speed_wall_0": { "value": "math.ceil(speed_wall * 0.6)" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": "50" },
         "support_xy_distance": { "value": "1" },
-        "support_z_distance": { "value": "max((0.2 if(0.2%layer_height==0) else layer_height*int((0.2+layer_height)/layer_height)),layer_height)" },
+        "support_z_distance": { "value": "max((0.2 if(0.2 % layer_height == 0) else layer_height * int((0.2 + layer_height) / layer_height)), layer_height)" },
-        "support_bottom_distance": { "value": "max(support_z_distance,layer_height*int(0.45/layer_height))" },
+        "support_bottom_distance": { "value": "max(support_z_distance,layer_height * int(0.45 / layer_height))" },
         "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" },
         "travel_avoid_distance": { "value": "3" },
         "gradual_support_infill_step_height": { "value": "0.2" },
         "gradual_support_infill_steps": { "value": "1" },
-        "infill_sparse_density": { "value": "20" },
         "gradual_infill_step_height": { "value": "1" },
         "initial_layer_line_width_factor": { "value": "120" },
         "jerk_travel": { "value": "25" },
-        "support_bottom_enable": { "value": "True" },
+        "support_bottom_enable": { "value": true },
         "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" },
         "support_bottom_pattern": { "value": "'zigzag'" },
-        "support_connect_zigzags": { "value": "False" },
+        "support_connect_zigzags": { "value": false },
         "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
-        "support_interface_enable": { "value": "True" },
+        "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "0.5" },
         "support_roof_pattern": { "value": "'concentric'" },
         "z_seam_type": { "value": "'shortest'" }

resources/definitions/zav_base.def.json

@@ -74,55 +74,6 @@
                               "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",
@@ -150,10 +101,10 @@
         "machine_center_is_zero":            {"default_value": false},
         "machine_gcode_flavor":              {"default_value": "RepRap (Marlin/Sprinter)"},
         "machine_head_with_fans_polygon":    {"default_value": [
-                                                             [-26,41],
+                                                             [-26, 41],
-                                                             [-26,-21],
+                                                             [-26, -21],
-                                                             [36,-21],
+                                                             [36, -21],
-                                                             [36,41]
+                                                             [36, 41]
                                                             ]
                                              },
         "gantry_height":                     {"value": 999999},

resources/extruders/geeetech_Mizar_S_1.def.json

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

resources/extruders/tank_m_base_extruder_0.def.json

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

resources/meshes/tank_m.obj

@@ -0,0 +1,60 @@
+v 200 200 0
+v 200 -200 0
+v 200 -200 -4
+v 200 200 -4
+v -200 200 0
+v -200 200 -4
+v -200 -200 0
+v -200 -200 -4
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 1
+vt 0 0
+vt 1 0
+vt 0 1
+vt 1 1
+vt 0 0
+vt 1 0
+vt 0 1
+vt 1 1
+f 1/1 2/2 4/3
+f 4/3 2/2 3/4
+f 5/5 1/6 6/7
+f 6/7 1/6 4/8
+f 7/9 5/10 8/11
+f 8/11 5/10 6/12
+f 2/13 7/14 3/15
+f 3/15 7/14 8/16
+f 6/21 4/22 3/24 8/23
+v -50 270.7 70.7
+v 50 270.7 70.7
+v 50 200 0
+v -50 200 0
+v -50 270.7 66.7
+v 50 270.7 66.7
+v 50 200 -4
+v -50 200 -4
+vt 0 1
+vt 0 0
+vt 1 0
+vt 1 1
+vt 0 1
+f 10/1 11/2 15/3 14/4
+f 9/4 10/8 14/7 13/8
+f 12/9 9/10 13/11 16/12
+f 11/13 12/14 16/15 15/16
+f 12/26 11/27 10/28 9/25
+f 13/13 14/14 15/15 16/16

resources/quality/tank_m_base_global_draft.inst.cfg

@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Draft Quality
+definition = tank_m_base
+
+[metadata]
+setting_version = 20
+type = quality
+quality_type = draft
+global_quality = True
+
+[values]
+layer_height = 0.24
+layer_height_0 = 0.24
+top_bottom_thickness = =layer_height_0+layer_height*3
+wall_thickness = =line_width*2
+support_interface_height = =layer_height*4

resources/quality/tank_m_base_global_high.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+version = 4
+name = Super Quality
+definition = tank_m_base
+
+[metadata]
+setting_version = 20
+type = quality
+quality_type = high
+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

resources/quality/tank_m_base_global_standard.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+version = 4
+name = Standard Quality
+definition = tank_m_base
+
+[metadata]
+setting_version = 20
+type = quality
+quality_type = standard
+weight = -3
+global_quality = True
+
+[values]
+layer_height = 0.2
+layer_height_0 = 0.2
+top_bottom_thickness = =layer_height_0+layer_height*3
+wall_thickness = =line_width*2
+support_interface_height = =layer_height*4