Merge branch 'main' into 050922b

2025-07-06 22:47:29 -06:00 · 2022-09-13 10:50:39 +02:00 · 2022-09-13 10:50:39 +02:00 · fe483d4656
commit fe483d4656
parent 2b981daf17 d31cc5baf0
552 changed files with 3424 additions and 2631 deletions
--- a/.github/workflows/conan-package-create.yml
+++ b/.github/workflows/conan-package-create.yml
@ -53,7 +53,6 @@ env:

 jobs:
    conan-package-create:
-        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
        runs-on: ${{ inputs.runs_on }}

        steps:
--- a/.github/workflows/conan-recipe-version.yml
+++ b/.github/workflows/conan-recipe-version.yml
@ -122,6 +122,8 @@ jobs:
                    latest_branch_version = tools.Version("0.0.0")
                    latest_branch_tag = None
                    for tag in repo.git.tag(merged = True).splitlines():
+                        if str(tag).startswith("firmware") or str(tag).startswith("master"):
+                            continue  # Quick-fix for the versioning scheme name of the embedded team in fdm_materials(_private) repo
                        try:
                            version = tools.Version(tag)
                        except ConanException:
@ -145,18 +147,23 @@ jobs:
                                user = "_"
                                channel = "_"
                        else:
+                            latest_branch_version_prerelease = latest_branch_version.prerelease
                            if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease:
                                # The prerealese did not contain a version number, default it to 1
-                                latest_branch_version.prerelease += ".1"
+                                latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.1"
                            if event_name == "pull_request":
-                                actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}"
+                                actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version_prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}"
+                                channel_metadata = f"{channel}_{no_commits}"
                            else:
                                if channel in ("stable", "_", ""):
                                    channel_metadata = f"{no_commits}"
                                else:
                                    channel_metadata = f"{channel}_{no_commits}"
-                                # FIXME: for when we create a new release branch
                            if latest_branch_version.prerelease == "":
+                                if is_release_branch:
+                                    bump_up_patch = int(latest_branch_version.patch) + 1
+                                    actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}"
+                                else:
                                    bump_up_minor = int(latest_branch_version.minor) + 1
                                    actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{latest_branch_version.patch}-alpha+{buildmetadata}{channel_metadata}"
                            else:
--- a/.github/workflows/requirements-conan-package.txt
+++ b/.github/workflows/requirements-conan-package.txt
@ -1,2 +1,2 @@
-conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3,!=1.52.0
+conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3
 sip
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@ -103,7 +103,18 @@ jobs:

            -   name: Install Linux system requirements
                if: ${{ runner.os == 'Linux' }}
-                run: sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev -y
+                run: |
+                    sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+                    sudo apt update
+                    sudo apt upgrade
+                    sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config -y
+
+            -   name: Install GCC-12 on ubuntu-22.04
+                if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }}
+                run: |
+                    sudo apt install g++-12 gcc-12 -y
+                    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12
+                    sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12

            -   name: Get Conan configuration
                run: conan config install https://github.com/Ultimaker/conan-config.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,8 @@
 # Copyright (c) 2022 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.

+# NOTE: This is only being used for translation scripts.
+
 # For MSVC flags, will be ignored on non-Windows OS's and this project in general. Only needed for cura-build-environment.
 cmake_policy(SET CMP0091 NEW)
 project(cura)
@ -13,47 +15,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 set(URANIUM_DIR "${CMAKE_SOURCE_DIR}/../Uranium" CACHE PATH "The location of the Uranium repository")
 set(URANIUM_SCRIPTS_DIR "${URANIUM_DIR}/scripts" CACHE PATH "The location of the scripts directory of the Uranium repository")

-option(CURA_DEBUGMODE "Enable debug dialog and other debug features" OFF)
-if(CURA_DEBUGMODE)
-    set(_cura_debugmode "ON")
-endif()
-
 option(GENERATE_TRANSLATIONS "Should the translations be generated?" ON)

-set(CURA_APP_NAME "cura" CACHE STRING "Short name of Cura, used for configuration folder")
-set(CURA_APP_DISPLAY_NAME "Ultimaker Cura" CACHE STRING "Display name of Cura")
-set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
-set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
-set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root")
-set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version")
-set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account API version")
-set(CURA_MARKETPLACE_ROOT "" CACHE STRING "Alternative Marketplace location")
-set(CURA_DIGITAL_FACTORY_URL "" CACHE STRING "Alternative Digital Factory location")
-
-configure_file(${CMAKE_SOURCE_DIR}/com.ultimaker.cura.desktop.in ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop @ONLY)
-
-configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)
-
-if(NOT DEFINED Python_VERSION)
-    set(Python_VERSION
-            3.10
-            CACHE STRING "Python Version" FORCE)
-    message(STATUS "Setting Python version to ${Python_VERSION}. Set Python_VERSION if you want to compile against an other version.")
-endif()
-if(APPLE)
-    set(Python_FIND_FRAMEWORK NEVER)
-endif()
-find_package(Python ${Python_VERSION} EXACT REQUIRED COMPONENTS Interpreter)
-message(STATUS "Linking and building ${project_name} against Python ${Python_VERSION}")
-if(NOT DEFINED Python_SITELIB_LOCAL)
-    set(Python_SITELIB_LOCAL
-            "${Python_SITELIB}"
-            CACHE PATH "Local alternative site-package location to install Cura" FORCE)
-endif()
-
-# Tests
-include(CuraTests)
-
 if(NOT ${URANIUM_DIR} STREQUAL "")
    set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${URANIUM_DIR}/cmake")
 endif()
@ -67,23 +30,3 @@ if(NOT ${URANIUM_SCRIPTS_DIR} STREQUAL "")
        CREATE_TRANSLATION_TARGETS()
    endif()
 endif()
-
-install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
-
-include(CuraPluginInstall)
-
-install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR}
-        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(DIRECTORY cura DESTINATION "${Python_SITELIB_LOCAL}")
-install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION "${Python_SITELIB_LOCAL}/cura/")
-if(NOT APPLE AND NOT WIN32)
-    install(FILES ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop
-            DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-    install(FILES ${CMAKE_SOURCE_DIR}/resources/images/cura-icon.png
-            DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/)
-    install(FILES com.ultimaker.cura.appdata.xml
-            DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
-    install(FILES cura.sharedmimeinfo
-            DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/
-            RENAME cura.xml )
-endif()
--- a/GitVersion.yml
+++ b/GitVersion.yml
@ -1,55 +0,0 @@
-mode: ContinuousDelivery
-next-version: 5.1
-branches:
-    main:
-        regex: ^main$
-        mode: ContinuousDelivery
-        tag: alpha
-        increment: None
-        prevent-increment-of-merged-branch-version: true
-        track-merge-target: false
-        source-branches: [ ]
-        tracks-release-branches: false
-        is-release-branch: false
-        is-mainline: true
-        pre-release-weight: 55000
-    develop:
-        regex: ^CURA-.*$
-        mode: ContinuousDelivery
-        tag: alpha
-        increment: None
-        prevent-increment-of-merged-branch-version: false
-        track-merge-target: true
-        source-branches: [ 'main' ]
-        tracks-release-branches: true
-        is-release-branch: false
-        is-mainline: false
-        pre-release-weight: 0
-    release:
-        regex: ^[\d]+\.[\d]+$
-        mode: ContinuousDelivery
-        tag: beta
-        increment: None
-        prevent-increment-of-merged-branch-version: true
-        track-merge-target: false
-        source-branches: [ 'main' ]
-        tracks-release-branches: false
-        is-release-branch: true
-        is-mainline: false
-        pre-release-weight: 30000
-    pull-request-main:
-        regex: ^(pull|pull\-requests|pr)[/-]
-        mode: ContinuousDelivery
-        tag: alpha+
-        increment: Inherit
-        prevent-increment-of-merged-branch-version: true
-        tag-number-pattern: '[/-](?<number>\d+)[-/]'
-        track-merge-target: true
-        source-branches: [ 'main' ]
-        tracks-release-branches: false
-        is-release-branch: false
-        is-mainline: false
-        pre-release-weight: 30000
-ignore:
-    sha: [ ]
-merge-message-formats: { }
--- a/74
+++ b/74
@ -1,74 +0,0 @@
-parallel_nodes(['linux && cura', 'windows && cura'])
-{
-    timeout(time: 2, unit: "HOURS")
-    {
-
-        // Prepare building
-        stage('Prepare')
-        {
-            // Ensure we start with a clean build directory.
-            step([$class: 'WsCleanup'])
-
-            // Checkout whatever sources are linked to this pipeline.
-            checkout scm
-        }
-
-        // If any error occurs during building, we want to catch it and continue with the "finale" stage.
-        catchError
-        {
-            // Building and testing should happen in a subdirectory.
-            dir('build')
-            {
-                // Perform the "build". Since Uranium is Python code, this basically only ensures CMake is setup.
-                stage('Build')
-                {
-                    def branch = env.BRANCH_NAME
-                    if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}"))
-                    {
-                        branch = "master"
-                    }
-
-                    // Ensure CMake is setup. Note that since this is Python code we do not really "build" it.
-                    def uranium_dir = get_workspace_dir("Ultimaker/Uranium/${branch}")
-                    cmake("..", "-DCMAKE_PREFIX_PATH=\"${env.CURA_ENVIRONMENT_PATH}/${branch}\" -DCMAKE_BUILD_TYPE=Release -DURANIUM_DIR=\"${uranium_dir}\"")
-                }
-
-                // Try and run the unit tests. If this stage fails, we consider the build to be "unstable".
-                stage('Unit Test')
-                {
-                    if (isUnix())
-                    {
-                        // For Linux
-                        try {
-                            sh 'make CTEST_OUTPUT_ON_FAILURE=TRUE test'
-                        } catch(e)
-                        {
-                            currentBuild.result = "UNSTABLE"
-                        }
-                    }
-                    else
-                    {
-                        // For Windows
-                        try
-                        {
-                            // This also does code style checks.
-                            bat 'ctest -V'
-                        } catch(e)
-                        {
-                            currentBuild.result = "UNSTABLE"
-                        }
-                    }
-                }
-            }
-        }
-
-        // Perform any post-build actions like notification and publishing of unit tests.
-        stage('Finalize')
-        {
-            // Publish the test results to Jenkins.
-            junit allowEmptyResults: true, testResults: 'build/junit*.xml'
-
-            notify_build_result(env.CURA_EMAIL_RECIPIENTS, '#cura-dev', ['master', '2.'])
-        }
-    }
-}
--- a/cmake/CuraPluginInstall.cmake
+++ b/cmake/CuraPluginInstall.cmake
@ -1,92 +0,0 @@
-# Copyright (c) 2022 Ultimaker B.V.
-# CuraPluginInstall.cmake is released under the terms of the LGPLv3 or higher.
-
-#
-# This module detects all plugins that need to be installed and adds them using the CMake install() command.
-# It detects all plugin folder in the path "plugins/*" where there's a "plugin.json" in it.
-#
-# Plugins can be configured to NOT BE INSTALLED via the variable "CURA_NO_INSTALL_PLUGINS" as a list of string in the
-# form of "a;b;c" or "a,b,c". By default all plugins will be installed.
-#
-
-option(PRINT_PLUGIN_LIST "Should the list of plugins that are installed be printed?" ON)
-
-# Options or configuration variables
-set(CURA_NO_INSTALL_PLUGINS "" CACHE STRING "A list of plugins that should not be installed, separated with ';' or ','.")
-
-file(GLOB_RECURSE _plugin_json_list ${CMAKE_SOURCE_DIR}/plugins/*/plugin.json)
-list(LENGTH _plugin_json_list _plugin_json_list_len)
-
-# Sort the lists alphabetically so we can handle cases like this:
-#   - plugins/my_plugin/plugin.json
-#   - plugins/my_plugin/my_module/plugin.json
-# In this case, only "plugins/my_plugin" should be added via install().
-set(_no_install_plugin_list ${CURA_NO_INSTALL_PLUGINS})
-# Sanitize the string so the comparison will be case-insensitive.
-string(STRIP   "${_no_install_plugin_list}" _no_install_plugin_list)
-string(TOLOWER "${_no_install_plugin_list}" _no_install_plugin_list)
-
-# WORKAROUND counterpart of what's in cura-build.
-string(REPLACE "," ";" _no_install_plugin_list "${_no_install_plugin_list}")
-
-list(LENGTH _no_install_plugin_list _no_install_plugin_list_len)
-
-if(_no_install_plugin_list_len GREATER 0)
-    list(SORT _no_install_plugin_list)
-endif()
-if(_plugin_json_list_len GREATER 0)
-    list(SORT _plugin_json_list)
-endif()
-
-# Check all plugin directories and add them via install() if needed.
-set(_install_plugin_list "")
-foreach(_plugin_json_path ${_plugin_json_list})
-    get_filename_component(_plugin_dir ${_plugin_json_path} DIRECTORY)
-    file(RELATIVE_PATH _rel_plugin_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_plugin_dir})
-    get_filename_component(_plugin_dir_name ${_plugin_dir} NAME)
-
-    # Make plugin name comparison case-insensitive
-    string(TOLOWER "${_plugin_dir_name}" _plugin_dir_name_lowercase)
-
-    # Check if this plugin needs to be skipped for installation
-    set(_add_plugin ON)  # Indicates if this plugin should be added to the build or not.
-    set(_is_no_install_plugin OFF)  # If this plugin will not be added, this indicates if it's because the plugin is
-                                    # specified in the NO_INSTALL_PLUGINS list.
-    if(_no_install_plugin_list)
-        if("${_plugin_dir_name_lowercase}" IN_LIST _no_install_plugin_list)
-            set(_add_plugin OFF)
-            set(_is_no_install_plugin ON)
-        endif()
-    endif()
-
-    # Make sure this is not a subdirectory in a plugin that's already in the install list
-    if(_add_plugin)
-        foreach(_known_install_plugin_dir ${_install_plugin_list})
-            if(_plugin_dir MATCHES "${_known_install_plugin_dir}.+")
-                set(_add_plugin OFF)
-                break()
-            endif()
-        endforeach()
-    endif()
-
-    if(_add_plugin)
-        if(${PRINT_PLUGIN_LIST})
-            message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}")
-        endif()
-        get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir} DIRECTORY)
-        install(DIRECTORY ${_rel_plugin_dir}
-                DESTINATION lib${LIB_SUFFIX}/cura/${_rel_plugin_parent_dir}
-                PATTERN "__pycache__" EXCLUDE
-                PATTERN "*.qmlc" EXCLUDE
-                )
-        list(APPEND _install_plugin_list ${_plugin_dir})
-    elseif(_is_no_install_plugin)
-        if(${PRINT_PLUGIN_LIST})
-            message(STATUS "[-] PLUGIN TO REMOVE : ${_rel_plugin_dir}")
-        endif()
-        execute_process(COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod_bundled_packages_json.py
-                        -d ${CMAKE_CURRENT_SOURCE_DIR}/resources/bundled_packages
-                        ${_plugin_dir_name}
-                        RESULT_VARIABLE _mod_json_result)
-    endif()
-endforeach()
--- a/cmake/CuraTests.cmake
+++ b/cmake/CuraTests.cmake
@ -1,77 +0,0 @@
-# Copyright (c) 2022 Ultimaker B.V.
-# Cura is released under the terms of the LGPLv3 or higher.
-
-include(CTest)
-include(CMakeParseArguments)
-
-add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
-
-function(cura_add_test)
-    set(_single_args NAME DIRECTORY PYTHONPATH)
-    cmake_parse_arguments("" "" "${_single_args}" "" ${ARGN})
-
-    if(NOT _NAME)
-        message(FATAL_ERROR "cura_add_test requires a test name argument")
-    endif()
-
-    if(NOT _DIRECTORY)
-        message(FATAL_ERROR "cura_add_test requires a directory to test")
-    endif()
-
-    if(NOT _PYTHONPATH)
-        set(_PYTHONPATH ${_DIRECTORY})
-    endif()
-    
-    if(WIN32)
-        string(REPLACE "|" "\\;" _PYTHONPATH ${_PYTHONPATH})
-        set(_PYTHONPATH "${_PYTHONPATH}\\;$ENV{PYTHONPATH}")
-    else()
-        string(REPLACE "|" ":" _PYTHONPATH ${_PYTHONPATH})
-        set(_PYTHONPATH "${_PYTHONPATH}:$ENV{PYTHONPATH}")
-    endif()
-
-    get_test_property(${_NAME} ENVIRONMENT test_exists) #Find out if the test exists by getting a property from it that always exists (such as ENVIRONMENT because we set that ourselves).
-    if (NOT ${test_exists})
-        add_test(
-            NAME ${_NAME}
-            COMMAND ${Python_EXECUTABLE} -m pytest --junitxml=${CMAKE_BINARY_DIR}/junit-${_NAME}.xml ${_DIRECTORY}
-        )
-        set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT LANG=C)
-        set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT "PYTHONPATH=${_PYTHONPATH}")
-    else()
-        message(WARNING "Duplicate test ${_NAME}!")
-    endif()
-endfunction()
-
-
-#Add code style test.
-add_test(
-    NAME "code-style"
-    COMMAND ${Python_EXECUTABLE} run_mypy.py
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-)
-
-#Add test for import statements which are not compatible with all builds
-add_test(
-    NAME "invalid-imports"
-    COMMAND ${Python_EXECUTABLE} scripts/check_invalid_imports.py
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-)
-
-cura_add_test(NAME pytest-main DIRECTORY ${CMAKE_SOURCE_DIR}/tests PYTHONPATH "${CMAKE_SOURCE_DIR}|${URANIUM_DIR}")
-
-file(GLOB_RECURSE _plugins plugins/*/__init__.py)
-foreach(_plugin ${_plugins})
-    get_filename_component(_plugin_directory ${_plugin} DIRECTORY)
-    if(EXISTS ${_plugin_directory}/tests)
-        get_filename_component(_plugin_name ${_plugin_directory} NAME)
-        cura_add_test(NAME pytest-${_plugin_name} DIRECTORY ${_plugin_directory} PYTHONPATH "${_plugin_directory}|${CMAKE_SOURCE_DIR}|${URANIUM_DIR}")
-    endif()
-endforeach()
-
-#Add test for whether the shortcut alt-keys are unique in every translation.
-add_test(
-    NAME "shortcut-keys"
-    COMMAND ${Python_EXECUTABLE} scripts/check_shortcut_keys.py
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-)
--- a/cmake/mod_bundled_packages_json.py
+++ b/cmake/mod_bundled_packages_json.py
@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-#
-# This script removes the given package entries in the bundled_packages JSON files. This is used by the PluginInstall
-# CMake module.
-#
-
-import argparse
-import collections
-import json
-import os
-import sys
-
-
-def find_json_files(work_dir: str) -> list:
-    """Finds all JSON files in the given directory recursively and returns a list of those files in absolute paths.
-
-    :param work_dir: The directory to look for JSON files recursively.
-    :return: A list of JSON files in absolute paths that are found in the given directory.
-    """
-
-    json_file_list = []
-    for root, dir_names, file_names in os.walk(work_dir):
-        for file_name in file_names:
-            abs_path = os.path.abspath(os.path.join(root, file_name))
-            json_file_list.append(abs_path)
-    return json_file_list
-
-
-def remove_entries_from_json_file(file_path: str, entries: list) -> None:
-    """Removes the given entries from the given JSON file. The file will modified in-place.
-
-    :param file_path: The JSON file to modify.
-    :param entries: A list of strings as entries to remove.
-    :return: None
-    """
-
-    try:
-        with open(file_path, "r", encoding = "utf-8") as f:
-            package_dict = json.load(f, object_hook = collections.OrderedDict)
-    except Exception as e:
-        msg = "Failed to load '{file_path}' as a JSON file. This file will be ignored Exception: {e}"\
-            .format(file_path = file_path, e = e)
-        sys.stderr.write(msg + os.linesep)
-        return
-
-    for entry in entries:
-        if entry in package_dict:
-            del package_dict[entry]
-            print("[INFO] Remove entry [{entry}] from [{file_path}]".format(file_path = file_path, entry = entry))
-
-    try:
-        with open(file_path, "w", encoding = "utf-8", newline = "\n") as f:
-            json.dump(package_dict, f, indent = 4)
-    except Exception as e:
-        msg = "Failed to write '{file_path}' as a JSON file. Exception: {e}".format(file_path = file_path, e = e)
-        raise IOError(msg)
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser("mod_bundled_packages_json")
-    parser.add_argument("-d", "--dir", dest = "work_dir",
-                        help = "The directory to look for bundled packages JSON files, recursively.")
-    parser.add_argument("entries", metavar = "ENTRIES", type = str, nargs = "+")
-
-    args = parser.parse_args()
-
-    json_file_list = find_json_files(args.work_dir)
-    for json_file_path in json_file_list:
-        remove_entries_from_json_file(json_file_path, args.entries)
-
-
-if __name__ == "__main__":
-    main()
--- a/com.ultimaker.cura.appdata.xml
+++ b/com.ultimaker.cura.appdata.xml
@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016 Richard Hughes <richard@hughsie.com> -->
-<component type="desktop">
-  <id>com.ultimaker.cura.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-3.0 and CC-BY-SA-4.0</project_license>
-  <name>Cura</name>
-  <summary>The world's most advanced 3d printer software</summary>
-  <description>
-    <p>
-      Cura creates a seamless integration between hardware, software and
-      materials for the best 3D printing experience around.
-      Cura supports the 3MF, OBJ and STL file formats and is available on
-      Windows, Mac and Linux.
-    </p>
-    <ul>
-      <li>Novices can start printing right away</li>
-      <li>Experts are able to customize 300 settings to achieve the best results</li>
-      <li>Optimized profiles for Ultimaker materials</li>
-      <li>Supported by a global network of Ultimaker certified service partners</li>
-      <li>Print multiple objects at once with different settings for each object</li>
-      <li>Cura supports STL, 3MF and OBJ file formats</li>
-      <li>Open source and completely free</li>
-    </ul>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/Ultimaker/Cura/main/cura-logo.PNG</image>
-    </screenshot>
-  </screenshots>
-  <url type="homepage">https://ultimaker.com/software/ultimaker-cura?utm_source=cura&amp;utm_medium=software&amp;utm_campaign=cura-update-linux</url>
-  <translation type="gettext">Cura</translation>
-  <content_rating type="oars-1.1" />
-</component>
--- a/com.ultimaker.cura.desktop.in
+++ b/com.ultimaker.cura.desktop.in
@ -1,19 +0,0 @@
-[Desktop Entry]
-Name=Ultimaker Cura
-Name[de]=Ultimaker Cura
-Name[nl]=Ultimaker Cura
-GenericName=3D Printing Software
-GenericName[de]=3D-Druck-Software
-GenericName[nl]=3D-printsoftware
-Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great.
-Comment[de]=Cura wandelt 3D-Modelle in Pfade für einen 3D-Drucker um. Es bereitet Ihren Druck für maximale Genauigkeit, minimale Druckzeit und guter Zuverlässigkeit mit vielen zusätzlichen Funktionen vor, damit Ihr Druck großartig wird.
-Comment[nl]=Cura converteert 3D-modellen naar paden voor een 3D printer. Het bereidt je print voor om zeer precies, snel en betrouwbaar te kunnen printen, met veel extra functionaliteit om je print er goed uit te laten komen.
-Exec=@CMAKE_INSTALL_FULL_BINDIR@/cura %F
-TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura
-Icon=cura-icon
-Terminal=false
-Type=Application
-MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;text/x-gcode;application/x-amf;application/x-ply;application/x-ctm;model/vnd.collada+xml;model/gltf-binary;model/gltf+json;model/vnd.collada+xml+zip;
-Categories=Graphics;
-Keywords=3D;Printing;Slicer;
-StartupWMClass=cura.real
--- a/conandata.yml
+++ b/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"
--- a/conanfile.py
+++ b/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
@ -149,9 +149,9 @@ class CuraConan(ConanFile):
        with open(Path(__file__).parent.joinpath("CuraVersion.py.jinja"), "r") as f:
            cura_version_py = Template(f.read())

-        cura_version = self.version
+        cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str)
        if self.options.internal:
-            version = tools.Version(self.version)
+            version = Version(cura_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,8 @@ 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")
+        version = self.conf_info.get("user.cura:version", default = self.version, check_type = str)
+        cura_version = Version(version)

        with open(Path(location, "Ultimaker-Cura.spec"), "w") as f:
            f.write(pyinstaller.render(
@ -239,10 +240,14 @@ class CuraConan(ConanFile):
                strip = False,  # This should be possible on Linux and MacOS but, it can also cause issues on some distributions. Safest is to disable it for now
                target_arch = "'x86_64'" if self.settings.os == "Macos" else "None",  # FIXME: Make this dependent on the settings.arch_target
                macos = self.settings.os == "Macos",
-                version = f"'{self.version}'",
+                version = f"'{version}'",
                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 +255,8 @@ class CuraConan(ConanFile):
        self.options["cpython"].shared = True

    def validate(self):
-        if self.version and tools.Version(self.version) <= tools.Version("4"):
+        version = self.conf_info.get("user.cura:version", default = self.version, check_type = str)
+        if version and Version(version) <= Version("4"):
            raise ConanInvalidConfiguration("Only versions 5+ are support")

    def requirements(self):
@ -293,7 +299,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 +383,8 @@ 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)
+        version = self.conf_info.get("user.cura:version", default = self.version, check_type = str)
+        cura_version = Version(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 +399,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"))

--- a/contributing.md
+++ b/contributing.md
@ -16,4 +16,6 @@ Making pull requests
 --------------------
 If you want to propose a change to Cura's source code, please create a pull request in the appropriate repository (being [Cura](https://github.com/Ultimaker/Cura), [Uranium](https://github.com/Ultimaker/Uranium), [CuraEngine](https://github.com/Ultimaker/CuraEngine), [fdm_materials](https://github.com/Ultimaker/fdm_materials), [libArcus](https://github.com/Ultimaker/libArcus), [cura-build](https://github.com/Ultimaker/cura-build), [cura-build-environment](https://github.com/Ultimaker/cura-build-environment), [libSavitar](https://github.com/Ultimaker/libSavitar), [libCharon](https://github.com/Ultimaker/libCharon) or [cura-binary-data](https://github.com/Ultimaker/cura-binary-data)) and if your change requires changes on multiple of these repositories, please link them together so that we know to merge them together.

+The style guide for code contributions to Cura and other Ultimaker projects can be found [here](https://github.com/Ultimaker/Meta/blob/master/general/generic_code_conventions.md).
+
 Some of these repositories will have automated tests running when you create a pull request, indicated by green check marks or red crosses in the Github web page. If you see a red cross, that means that a test has failed. If the test doesn't fail on the Master branch but does fail on your branch, that indicates that you've probably made a mistake and you need to do that. Click on the cross for more details, or run the test locally by running `cmake . && ctest --verbose`.
--- a/cura/Arranging/ArrangeObjectsJob.py
+++ b/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)
--- a/cura/LayerPolygon.py
+++ b/cura/LayerPolygon.py
@ -24,9 +24,12 @@ class LayerPolygon:
    PrimeTowerType = 11
    __number_of_types = 12

-    __jump_map = numpy.logical_or(numpy.logical_or(numpy.arange(__number_of_types) == NoneType, numpy.arange(__number_of_types) == MoveCombingType), numpy.arange(__number_of_types) == MoveRetractionType)
+    __jump_map = numpy.logical_or(numpy.logical_or(numpy.arange(__number_of_types) == NoneType,
+                                                   numpy.arange(__number_of_types) == MoveCombingType),
+                                                   numpy.arange(__number_of_types) == MoveRetractionType)

-    def __init__(self, extruder: int, line_types: numpy.ndarray, data: numpy.ndarray, line_widths: numpy.ndarray, line_thicknesses: numpy.ndarray, line_feedrates: numpy.ndarray) -> None:
+    def __init__(self, extruder: int, line_types: numpy.ndarray, data: numpy.ndarray,
+                 line_widths: numpy.ndarray, line_thicknesses: numpy.ndarray, line_feedrates: numpy.ndarray) -> None:
        """LayerPolygon, used in ProcessSlicedLayersJob

        :param extruder: The position of the extruder
@ -39,10 +42,12 @@ class LayerPolygon:

        self._extruder = extruder
        self._types = line_types
-        for i in range(len(self._types)):
-            if self._types[i] >= self.__number_of_types: # Got faulty line data from the engine.
-                Logger.log("w", "Found an unknown line type: %s", i)
-                self._types[i] = self.NoneType
+        unknown_types = numpy.where(self._types >= self.__number_of_types, self._types, None)
+        if unknown_types.any():
+            # Got faulty line data from the engine.
+            for idx in unknown_types:
+                Logger.warning(f"Found an unknown line type at: {idx}")
+                self._types[idx] = self.NoneType
        self._data = data
        self._line_widths = line_widths
        self._line_thicknesses = line_thicknesses
@ -63,7 +68,9 @@ class LayerPolygon:
        self._color_map = LayerPolygon.getColorMap()
        self._colors = self._color_map[self._types]  # type: numpy.ndarray

-        # When type is used as index returns true if type == LayerPolygon.InfillType or type == LayerPolygon.SkinType or type == LayerPolygon.SupportInfillType
+        # When type is used as index returns true if type == LayerPolygon.InfillType
+        # or type == LayerPolygon.SkinType
+        # or type == LayerPolygon.SupportInfillType
        # Should be generated in better way, not hardcoded.
        self._is_infill_or_skin_type_map = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0], dtype=bool)

@ -85,7 +92,9 @@ class LayerPolygon:
        self._vertex_begin = 0
        self._vertex_end = cast(int, numpy.sum(self._build_cache_needed_points))

-    def build(self, vertex_offset: int, index_offset: int, vertices: numpy.ndarray, colors: numpy.ndarray, line_dimensions: numpy.ndarray, feedrates: numpy.ndarray, extruders: numpy.ndarray, line_types: numpy.ndarray, indices: numpy.ndarray) -> None:
+    def build(self, vertex_offset: int, index_offset: int, vertices: numpy.ndarray,
+              colors: numpy.ndarray, line_dimensions: numpy.ndarray, feedrates: numpy.ndarray,
+              extruders: numpy.ndarray, line_types: numpy.ndarray, indices: numpy.ndarray) -> None:
        """Set all the arrays provided by the function caller, representing the LayerPolygon

        The arrays are either by vertex or by indices.
@ -111,9 +120,10 @@ class LayerPolygon:
        line_mesh_mask = self._build_cache_line_mesh_mask
        needed_points_list = self._build_cache_needed_points

-        # Index to the points we need to represent the line mesh. This is constructed by generating simple
-        # start and end points for each line. For line segment n these are points n and n+1. Row n reads [n n+1] 
-        # Then then the indices for the points we don't need are thrown away based on the pre-calculated list. 
+        # Index to the points we need to represent the line mesh.
+        # This is constructed by generating simple start and end points for each line.
+        # For line segment n, these are points n and n+1. Row n reads [n n+1]
+        # Then the indices for the points we don't need are thrown away based on the pre-calculated list.
        index_list = (numpy.arange(len(self._types)).reshape((-1, 1)) + numpy.array([[0, 1]])).reshape((-1, 1))[needed_points_list.reshape((-1, 1))]

        # The relative values of begin and end indices have already been set in buildCache, so we only need to offset them to the parents offset.
@ -138,7 +148,8 @@ class LayerPolygon:
        # Convert type per vertex to type per line
        line_types[self._vertex_begin:self._vertex_end] = numpy.tile(self._types, (1, 2)).reshape((-1, 1))[needed_points_list.ravel()][:, 0]

-        # The relative values of begin and end indices have already been set in buildCache, so we only need to offset them to the parents offset.
+        # The relative values of begin and end indices have already been set in buildCache,
+        # so we only need to offset them to the parents offset.
        self._index_begin += index_offset
        self._index_end += index_offset

@ -217,10 +228,9 @@ class LayerPolygon:
        normals[:, 1] = 0.0  # We are only interested in 2D normals

        # Calculate the edges between points.
-        # The call to numpy.roll shifts the entire array by one so that
-        # we end up subtracting each next point from the current, wrapping
-        # around. This gives us the edges from the next point to the current
-        # point.
+        # The call to numpy.roll shifts the entire array by one
+        # so that we end up subtracting each next point from the current, wrapping around.
+        # This gives us the edges from the next point to the current point.
        normals = numpy.diff(normals, 1, 0)

        # Calculate the length of each edge using standard Pythagoras
--- a/cura/Machines/MachineErrorChecker.py
+++ b/cura/Machines/MachineErrorChecker.py
@ -43,7 +43,7 @@ class MachineErrorChecker(QObject):
        self._application = cura.CuraApplication.CuraApplication.getInstance()
        self._machine_manager = self._application.getMachineManager()

-        self._start_time = 0.  # measure checking time
+        self._check_start_time = time.time()

        self._setCheckTimer()

@ -160,7 +160,7 @@ class MachineErrorChecker(QObject):
                self._stacks_and_keys_to_check.append((stack, key))

        self._application.callLater(self._checkStack)
-        self._start_time = time.time()
+        self._check_start_time = time.time()
        Logger.log("d", "New error check scheduled.")

    def _checkStack(self) -> None:
@ -212,12 +212,10 @@ class MachineErrorChecker(QObject):
            self._has_errors = result
            self.hasErrorUpdated.emit()
            self._machine_manager.stacksValidationChanged.emit()
-        if keys_to_recheck is None:
-            self._keys_to_check = set()
-        else:
-            self._keys_to_check = keys_to_recheck
+        self._keys_to_check = keys_to_recheck if keys_to_recheck else set()
        self._need_to_check = False
        self._check_in_progress = False
        self.needToWaitForResultChanged.emit()
        self.errorCheckFinished.emit()
-        Logger.log("i", "Error check finished, result = %s, time = %0.1fs", result, time.time() - self._start_time)
+        execution_time = time.time() - self._check_start_time
+        Logger.info(f"Error check finished, result = {result}, time = {execution_time:.2f}s")
--- a/cura/Machines/Models/GlobalStacksModel.py
+++ b/cura/Machines/Models/GlobalStacksModel.py
@ -44,6 +44,7 @@ class GlobalStacksModel(ListModel):
        self._filter_connection_type = None  # type: Optional[ConnectionType]
        self._filter_online_only = False
        self._filter_capabilities: List[str] = []  # Required capabilities that all listed printers must have.
+        self._filter_abstract_machines: Optional[bool] = None

        # Listen to changes
        CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerChanged)
@ -54,6 +55,7 @@ class GlobalStacksModel(ListModel):
    filterConnectionTypeChanged = pyqtSignal()
    filterCapabilitiesChanged = pyqtSignal()
    filterOnlineOnlyChanged = pyqtSignal()
+    filterAbstractMachinesChanged = pyqtSignal()

    def setFilterConnectionType(self, new_filter: Optional[ConnectionType]) -> None:
        if self._filter_connection_type != new_filter:
@ -98,6 +100,22 @@ class GlobalStacksModel(ListModel):
        """
        return self._filter_capabilities

+    def setFilterAbstractMachines(self, new_filter: Optional[bool]) -> None:
+        if self._filter_abstract_machines != new_filter:
+            self._filter_abstract_machines = new_filter
+            self.filterAbstractMachinesChanged.emit()
+
+    @pyqtProperty(bool, fset = setFilterAbstractMachines, notify = filterAbstractMachinesChanged)
+    def filterAbstractMachines(self) -> Optional[bool]:
+        """
+        Weather we include abstract printers, non-abstract printers or both
+
+        if this is set to None both abstract and non-abstract printers will be included in the list
+                   set to True will only include abstract printers
+                   set to False will only inclde non-abstract printers
+        """
+        return self._filter_abstract_machines
+
    def _onContainerChanged(self, container) -> None:
        """Handler for container added/removed events from registry"""

@ -130,6 +148,10 @@ class GlobalStacksModel(ListModel):
            if self._filter_online_only and not is_online:
                continue

+            is_abstract_machine = parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False))
+            if self._filter_abstract_machines is not None and self._filter_abstract_machines is not is_abstract_machine:
+                continue
+
            capabilities = set(container_stack.getMetaDataEntry(META_CAPABILITIES, "").split(","))
            if set(self._filter_capabilities) - capabilities:  # Not all required capabilities are met.
                continue
--- a/cura/Machines/Models/MachineListModel.py
+++ b/cura/Machines/Models/MachineListModel.py
@ -89,16 +89,19 @@ class MachineListModel(ListModel):
            machines_manager = CuraApplication.getInstance().getMachineManager()
            online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True)

-            # Create a list item for abstract machine
-            self.addItem(abstract_machine, len(online_machine_stacks))
+            online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks))
+
            other_machine_stacks.remove(abstract_machine)
            if abstract_machine in online_machine_stacks:
                online_machine_stacks.remove(abstract_machine)

+            # Create a list item for abstract machine
+            self.addItem(abstract_machine, True, len(online_machine_stacks))
+
            # Create list of machines that are children of the abstract machine
            for stack in online_machine_stacks:
                if self._show_cloud_printers:
-                    self.addItem(stack)
+                    self.addItem(stack, True)
                # Remove this machine from the other stack list
                if stack in other_machine_stacks:
                    other_machine_stacks.remove(stack)
@ -118,25 +121,18 @@ class MachineListModel(ListModel):
                                 })

        for stack in other_machine_stacks:
-            self.addItem(stack)
+            self.addItem(stack, False)

-    def addItem(self, container_stack: ContainerStack, machine_count: int = 0) -> None:
+    def addItem(self, container_stack: ContainerStack, is_online: bool, machine_count: int = 0) -> None:
        if parseBool(container_stack.getMetaDataEntry("hidden", False)):
            return

-        # This is required because machines loaded from projects have the is_online="True" but no connection type.
-        # We want to display them the same way as unconnected printers in this case.
-        has_connection = False
-        has_connection |= parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False))
-        for connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]:
-            has_connection |= connection_type in container_stack.configuredConnectionTypes
-
        self.appendItem({
                        "componentType": "MACHINE",
                        "name": container_stack.getName(),
                         "id": container_stack.getId(),
                         "metadata": container_stack.getMetaData().copy(),
-                         "isOnline": parseBool(container_stack.getMetaDataEntry("is_online", False)) and has_connection,
+                         "isOnline": is_online,
                         "isAbstractMachine": parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False)),
                         "machineCount": machine_count,
                         })
--- a/cura/Settings/CuraContainerStack.py
+++ b/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
--- a/cura/Settings/GlobalStack.py
+++ b/cura/Settings/GlobalStack.py
@ -347,6 +347,12 @@ class GlobalStack(CuraContainerStack):
    nameChanged = pyqtSignal()
    name = pyqtProperty(str, fget=getName, fset=setName, notify=nameChanged)

+    def hasNetworkedConnection(self) -> bool:
+        has_connection = False
+        for connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]:
+            has_connection |= connection_type in self.configuredConnectionTypes
+        return has_connection
+
 ## private:
 global_stack_mime = MimeType(
    name = "application/x-cura-globalstack",
--- a/cura/UI/PrintInformation.py
+++ b/cura/UI/PrintInformation.py
@ -186,7 +186,7 @@ class PrintInformation(QObject):

            if time != time:  # Check for NaN. Engine can sometimes give us weird values.
                duration.setDuration(0)
-                Logger.log("w", "Received NaN for print duration message")
+                Logger.warning("Received NaN for print duration message")
                continue

            total_estimated_time += time
@ -368,7 +368,7 @@ class PrintInformation(QObject):
                mime_type = MimeTypeDatabase.getMimeTypeForFile(name)
                data = mime_type.stripExtension(name)
            except MimeTypeNotFoundError:
-                Logger.log("w", "Unsupported Mime Type Database file extension %s", name)
+                Logger.warning(f"Unsupported Mime Type Database file extension {name}")

            if data is not None and check_name is not None:
                self._base_name = data
--- a/cura/UI/WhatsNewPagesModel.py
+++ b/cura/UI/WhatsNewPagesModel.py
@ -62,15 +62,21 @@ class WhatsNewPagesModel(WelcomePagesModel):

    def initialize(self) -> None:
        self._pages = []
+        try:
            self._pages.append({"id": "whats_new",
                                "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"),
                                "next_page_button_text": self._catalog.i18nc("@action:button", "Skip"),
                                "next_page_id": "changelog"
                                })
+        except FileNotFoundError:
+            Logger.warning("Unable to find what's new page")
+        try:
            self._pages.append({"id": "changelog",
                                "page_url": self._getBuiltinWelcomePagePath("ChangelogContent.qml"),
                                "next_page_button_text": self._catalog.i18nc("@action:button", "Close"),
                                })
+        except FileNotFoundError:
+            Logger.warning("Unable to find changelog page")
        self.setItems(self._pages)

        images, max_image = WhatsNewPagesModel._collectOrdinalFiles(Resources.Images, WhatsNewPagesModel.image_formats)
--- a/plugins/3MFReader/ThreeMFWorkspaceReader.py
+++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py
@ -664,10 +664,22 @@ class ThreeMFWorkspaceReader(WorkspaceReader):

        cura_file_names = [name for name in archive.namelist() if name.startswith("Cura/")]

-        # Create a shadow copy of the preferences (we don't want all of the preferences, but we do want to re-use its
+        # Create a shadow copy of the preferences (We don't want all of the preferences, but we do want to re-use its
        # parsing code.
        temp_preferences = Preferences()
+        try:
            serialized = archive.open("Cura/preferences.cfg").read().decode("utf-8")
+        except KeyError:
+            # If there is no preferences file, it's not a workspace, so notify user of failure.
+            Logger.log("w", "File %s is not a valid workspace.", file_name)
+            message = Message(i18n_catalog.i18nc("@info:error Don't translate the XML tags <filename> or <message>!",
+                                                 "Project file <filename>{0}</filename> is corrupt: <message>{1}</message>.",
+                                                 file_name, str(e)),
+                              title=i18n_catalog.i18nc("@info:title", "Can't Open Project File"),
+                              message_type=Message.MessageType.ERROR)
+            message.show()
+            self.setWorkspaceName("")
+            return [], {}
        temp_preferences.deserialize(serialized)

        # Copy a number of settings from the temp preferences to the global
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
@ -172,7 +172,14 @@ Item
            {
                id: printerConfiguration
                anchors.verticalCenter: parent.verticalCenter
-                buildplate: catalog.i18nc("@label", "Glass")
+                buildplate: {
+                    switch (printJob.assignedPrinter.buildplate) {
+                        case "glass":
+                            return catalog.i18nc("@label", "Glass");
+                        default:
+                            return null
+                    }
+                }
                configurations: base.printJob ? base.printJob.configuration.extruderConfigurations : null
                height: Math.round(72 * screenScaleFactor) // TODO: Theme!
            }
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
@ -175,7 +175,14 @@ Item
            {
                id: printerConfiguration
                anchors.verticalCenter: parent.verticalCenter
-                buildplate: printer ? catalog.i18nc("@label", "Glass") : null // 'Glass' as a default
+                buildplate: {
+                    switch (printer.buildplate) {
+                        case "glass":
+                            return catalog.i18nc("@label", "Glass");
+                        default:
+                            return null
+                    }
+                }
                configurations:
                {
                    var configs = []
--- a/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py
+++ b/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py
@ -31,7 +31,7 @@ class RemovedPrintersMessage(Message):
        super().__init__(title=self.i18n_catalog.i18ncp("info:status",
                                                        "A cloud connection is not available for a printer",
                                                        "A cloud connection is not available for some printers",
-                                                        len(self.removed_devices)),
+                                                        len(self._removed_devices)),
                         message_type=Message.MessageType.WARNING,
                         text = message_text)

--- a/plugins/USBPrinting/USBPrinterOutputDevice.py
+++ b/plugins/USBPrinting/USBPrinterOutputDevice.py
@ -429,7 +429,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
        print_job.updateTimeElapsed(elapsed_time)
        estimated_time = self._print_estimated_time
        if progress > .1:
-            estimated_time = self._print_estimated_time * (1 - progress) + elapsed_time
+            estimated_time = int(self._print_estimated_time * (1 - progress) + elapsed_time)
        print_job.updateTimeTotal(estimated_time)

        self._gcode_position += 1
--- a/resources/definitions/Mark2_for_Ultimaker2.def.json
+++ b/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"
        },
--- a/resources/definitions/SV01.def.json
+++ b/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 },
--- a/resources/definitions/SV02.def.json
+++ b/resources/definitions/SV02.def.json
@ -29,7 +29,6 @@
        "gantry_height": { "value": "30" },
        "speed_print": { "default_value": 50 },		
 	    "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 },
--- a/resources/definitions/SV03.def.json
+++ b/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 },
--- a/resources/definitions/abax_pri3.def.json
+++ b/resources/definitions/abax_pri3.def.json
@ -7,6 +7,7 @@
        "author": "Abax 3D Technologies",
        "manufacturer": "Abax 3D Technologies",
        "file_formats": "text/x-gcode",
+        "has_machine_quality": "true",
        "machine_extruder_trains":
        {
            "0": "abax_pri3_extruder_0"
--- a/resources/definitions/abax_pri5.def.json
+++ b/resources/definitions/abax_pri5.def.json
@ -7,6 +7,7 @@
        "author": "Abax 3D Technologies",
        "manufacturer": "Abax 3D Technologies",
        "file_formats": "text/x-gcode",
+        "has_machine_quality": "true",
        "machine_extruder_trains":
        {
            "0": "abax_pri5_extruder_0"
--- a/resources/definitions/alya3dp.def.json
+++ b/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,
--- a/resources/definitions/alyanx3dp.def.json
+++ b/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,
--- a/resources/definitions/anet3d.def.json
+++ b/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 },
@ -138,11 +131,7 @@
        "machine_use_extruder_offset_to_offset_coords": {"default_value": true},
        "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
        
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "gantry_height": {
-            "value": "0"
-        }
+        "machine_center_is_zero": { "default_value": false },
+        "gantry_height": { "value": "0"}
    }
 }
--- a/resources/definitions/anycubic_4max.def.json
+++ b/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" },
--- a/resources/definitions/anycubic_i3_mega_s.def.json
+++ b/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'" },
--- a/resources/definitions/anycubic_mega_zero.def.json
+++ b/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 },
--- a/resources/definitions/artillery_base.def.json
+++ b/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" }
-
    }
 }

--- a/resources/definitions/atmat_signal_pro_base.def.json
+++ b/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",
--- a/resources/definitions/atom3.def.json
+++ b/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,47 +99,41 @@
        "speed_layer_0": { "value": "20"},
        "speed_slowdown_layers": { "default_value": 1},

-
-
-
-        "retraction_amount": {
+        "retraction_amount":
+        {
            "default_value": 7,
-            "maximum_value_warning": 9 },
-        "retraction_speed": {
+            "maximum_value_warning": 9
+        },
+        "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)",
            "minimum_value": "0",
            "minimum_value_warning": "25",
            "maximum_value_warning": "4000"
        },
-        "skirt_gap": {
-            "default_value": "1`",
+        "skirt_gap":
+        {
+            "default_value": 1,
            "value": "3 * wall_line_width_0"
        }
    }
--- a/resources/definitions/biqu_base.def.json
+++ b/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'" },
--- a/resources/definitions/blv_mgn_cube_base.def.json
+++ b/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)"
    },
--- a/resources/definitions/builder_premium_large.def.json
+++ b/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" },
--- a/resources/definitions/builder_premium_medium.def.json
+++ b/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" },
--- a/resources/definitions/builder_premium_small.def.json
+++ b/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" },
--- a/resources/definitions/cartesio.def.json
+++ b/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" },
--- a/resources/definitions/creality_base.def.json
+++ b/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" },
@ -159,35 +111,24 @@
        "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" },
        "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'" },
--- a/resources/definitions/dagoma_pro_430_bowden.def.json
+++ b/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 },
--- a/resources/definitions/deltacomb_dc20flux.def.json
+++ b/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" }
--- a/resources/definitions/deltacomb_dc21flux.def.json
+++ b/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" }
--- a/resources/definitions/dxu.def.json
+++ b/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"
        },
--- a/resources/definitions/eryone_er20.def.json
+++ b/resources/definitions/eryone_er20.def.json
@ -156,9 +156,6 @@
        "skirt_line_count": {
            "value": 3
        },
-        "speed_infill": {
-            "value": "speed_print"
-        },
        "speed_topbottom": {
            "value": "math.ceil(speed_print * 20 / 50)"
        },
--- a/resources/definitions/eryone_thinker.def.json
+++ b/resources/definitions/eryone_thinker.def.json
@ -143,9 +143,6 @@
        "material_bed_temperature_layer_0": {
            "value": "material_bed_temperature"
        },
-        "speed_infill": {
-            "value": "speed_print"
-        },
        "speed_wall": {
            "value": "speed_print"
        },
@ -252,9 +249,6 @@
        },
        "smooth_spiralized_contours": {
            "value": false
-        },
-        "roofing_monotonic": {
-            "value": true
        }
    }
 }
--- a/resources/definitions/fdmprinter.def.json
+++ b/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
-                        ],
-                        [
-                            10,
-                            10
-                        ],
-                        [
-                            10,
-                            -10
-                        ],
-                        [
-                            -20,
-                            -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",
@ -1186,7 +1171,8 @@
                    "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. 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",
@ -1482,8 +1470,7 @@
                            "label": "Monotonic Top Surface Order",
                            "description": "Print top surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent.",
                            "type": "bool",
-                            "default_value": false,
-                            "value": "skin_monotonic",
+                            "value": true,
                            "enabled": "roofing_layer_count > 0 and top_layers > 0 and roofing_pattern != 'concentric'",
                            "limit_to_extruder": "roofing_extruder_nr",
                            "settable_per_mesh": true
@ -4418,7 +4405,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 +8053,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.",
--- a/resources/definitions/flyingbear_base.def.json
+++ b/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 },

--- a/resources/definitions/goofoo_base.def.json
+++ b/resources/definitions/goofoo_base.def.json
@ -60,15 +60,12 @@
        "jerk_enabled": { "value": false },

        "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" }

--- a/resources/definitions/hctech_hc300-m1&m1h.def.json
+++ b/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 }
--- a/resources/definitions/hctech_hc300-m2h.def.json
+++ b/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 },
--- a/resources/definitions/hctech_hc300-m3.def.json
+++ b/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 },
--- a/resources/definitions/hms434.def.json
+++ b/resources/definitions/hms434.def.json
@ -108,8 +108,7 @@

        "default_material_print_temperature":     {"maximum_value": "401" },
        "material_print_temperature":             {"maximum_value": "401" },
-        "material_print_temperature_layer_0":     {"value": "material_print_temperature",
-                                                   "maximum_value": "401" },
+        "material_print_temperature_layer_0":     {"maximum_value": "401" },
        "material_initial_print_temperature":     {"value": "material_print_temperature",
                                                   "maximum_value_warning": "material_print_temperature + 15",
                                                   "maximum_value": "401" },
@ -125,7 +124,6 @@
        "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_x":            {"value": "speed_wall"},
        "speed_layer_0":           {"value": "(speed_print / 5 * 4) if speed_print > 45 else speed_print"},
@ -166,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 },
--- a/resources/definitions/imade3d_jellybox_root.def.json
+++ b/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",
--- a/resources/definitions/inat_base.def.json
+++ b/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"
        },
--- a/resources/definitions/kingroon_base.def.json
+++ b/resources/definitions/kingroon_base.def.json
@ -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'" },
--- a/resources/definitions/koonovo_base.def.json
+++ b/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" },

@ -59,38 +58,27 @@
        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
    
        "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'" },
--- a/resources/definitions/koonovo_kn3.def.json
+++ b/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" },

@ -76,34 +75,24 @@
        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
    
        "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" },
        "default_material_bed_temperature": { "value": "55" },
-        "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 },


--- a/resources/definitions/koonovo_kn5.def.json
+++ b/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" },      
@ -78,36 +74,26 @@
        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
    
        "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" },
        "default_material_bed_temperature": { "value": "45" },
-        "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'" },
--- a/resources/definitions/kupido.def.json
+++ b/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,
--- a/resources/definitions/liquid.def.json
+++ b/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" },
--- a/resources/definitions/longer_base.def.json
+++ b/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'" },
--- a/resources/definitions/lotmaxx_sc10.def.json
+++ b/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 },
@ -35,14 +36,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" },
--- a/resources/definitions/lotmaxx_sc20.def.json
+++ b/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" },
--- a/resources/definitions/malyan_m200.def.json
+++ b/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}
    }
 }
--- a/resources/definitions/mingda_1000pro.def.json
+++ b/resources/definitions/mingda_1000pro.def.json
@ -0,0 +1,24 @@
+{
+    "name": "Mingda 1000Pro",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides":
+    {
+        "machine_name": { "default_value": "Mingda 1000Pro" },
+		
+		"machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F1200 ; move z up little to prevent scratching of surface\n G1 X4 Y20 Z0.3 F3000.0 ; move to start-line position\n G1 X4 Y380.0 Z0.3 F1500.0 E30 ; draw 1st line\n G1 X4 Y380.0 Z0.4 F3000.0 ; move to side a little\n G1 X4 Y20 Z0.4 F1500.0 E60 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F1500 ; 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 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" },
+		
+        "machine_width": { "default_value": 1000 },
+        "machine_depth": { "default_value": 1000 },
+        "machine_height": { "default_value": 1000 },
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata":
+    {
+        "quality_definition": "mingda_base",
+        "visible": true
+    }
+}
--- a/resources/definitions/mingda_4h.def.json
+++ b/resources/definitions/mingda_4h.def.json
@ -0,0 +1,19 @@
+{
+    "name": "Mingda 4H",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides":
+    {
+        "machine_name": { "default_value": "Mingda 4H" },
+		
+        "machine_width": { "default_value": 300 },
+        "machine_depth": { "default_value": 200 },
+        "machine_height": { "default_value": 200 },
+        "gantry_height": { "value": 25 }
+    },
+    "metadata":
+    {
+        "quality_definition": "mingda_base",
+        "visible": true
+    }
+}
--- a/resources/definitions/mingda_600pro.def.json
+++ b/resources/definitions/mingda_600pro.def.json
@ -0,0 +1,24 @@
+{
+    "name": "Mingda 600Pro",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides":
+    {
+        "machine_name": { "default_value": "Mingda 600Pro" },
+		
+		"machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F1200 ; move z up little to prevent scratching of surface\n G1 X4 Y20 Z0.3 F3000.0 ; move to start-line position\n G1 X4 Y380.0 Z0.3 F1500.0 E30 ; draw 1st line\n G1 X4 Y380.0 Z0.4 F3000.0 ; move to side a little\n G1 X4 Y20 Z0.4 F1500.0 E60 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F1500 ; 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 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" },
+		
+        "machine_width": { "default_value": 600 },
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 600 },
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata":
+    {
+        "quality_definition": "mingda_base",
+        "visible": true
+    }
+}
--- a/resources/definitions/mingda_6h.def.json
+++ b/resources/definitions/mingda_6h.def.json
@ -0,0 +1,19 @@
+{
+    "name": "Mingda 6H",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides":
+    {
+        "machine_name": { "default_value": "Mingda 6H" },
+		
+        "machine_width": { "default_value": 400 },
+        "machine_depth": { "default_value": 300 },
+        "machine_height": { "default_value": 500 },
+        "gantry_height": { "value": 25 }
+    },
+    "metadata":
+    {
+        "quality_definition": "mingda_base",
+        "visible": true
+    }
+}
--- a/resources/definitions/mingda_base.def.json
+++ b/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,16 +108,12 @@
        "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_travel": { "value": "80.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 1.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_travel_layer_0": { "value": "60 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 1.5" },
        "speed_prime_tower": { "value": "speed_topbottom" },
        "speed_support": { "value": "speed_wall_0" },
        "speed_support_interface": { "value": "speed_topbottom" },
@ -174,24 +121,24 @@

        "skirt_brim_speed": { "value": "speed_layer_0" },

-        "line_width": { "value": "machine_nozzle_size * 1.1" },
+        "line_width": { "value": "machine_nozzle_size * 1" },

        "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": "15" },
-        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" },
        "infill_before_walls": { "value": false },
        "infill_overlap": { "value": 30.0 },
        "skin_overlap": { "value": 10.0 },
        "infill_wipe_dist": { "value": 0.0 },
        "wall_0_wipe_dist": { "value": 0.0 },
+        "wall_0_material_flow": { "value": "0.95 * material_flow"},

        "fill_outline_gaps": { "value": false },

@ -219,14 +166,13 @@
 		"retraction_amount": { "value": 2 },
        "retraction_enable": { "value": true },
        "retraction_count_max": { "value": 100 },
-        "retraction_extrusion_window": { "value": 10 },
+        "retraction_extrusion_window": { "value": 3 },
        "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'" },
+        "adhesion_type": { "value": "'none' if support_enable else 'raft'" },
        "brim_replaces_support": { "value": false },
        "skirt_gap": { "value": 10.0 },
        "skirt_line_count": { "value": 4 },
@ -258,6 +204,5 @@
        "minimum_interface_area": { "value": 10 },
        "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
        "wall_thickness": {"value": "line_width * 2" }
-
    }
 }
--- a/resources/definitions/mingda_d2.def.json
+++ b/resources/definitions/mingda_d2.def.json
@ -2,15 +2,16 @@
    "name": "Mingda D2",
    "version": 2,
    "inherits": "mingda_base",
-    "overrides": {
+    "overrides":
+    {
        "machine_name": { "default_value": "MINGDA D2" },
        "machine_width": { "default_value": 230 },
        "machine_depth": { "default_value": 230 },
        "machine_height": { "default_value": 260 },
        "gantry_height": { "value": 25 }
-
    },
-    "metadata": {
+    "metadata":
+    {
        "quality_definition": "mingda_base",
        "visible": true,
        "platform": "mingda_d2_base.stl",
--- a/resources/definitions/mingda_d3pro.def.json
+++ b/resources/definitions/mingda_d3pro.def.json
@ -2,17 +2,16 @@
    "name": "Mingda D3/Pro",
    "version": 2,
    "inherits": "mingda_base",
-    "overrides": {
+    "overrides":
+    {
        "machine_name": { "default_value": "MINGDA D3/Pro" },
        "machine_width": { "default_value": 320 },
        "machine_depth": { "default_value": 320 },
        "machine_height": { "default_value": 400 },
        "gantry_height": { "value": 25 }
-		
-        
-
    },
-    "metadata": {
+    "metadata":
+    {
        "quality_definition": "mingda_base",
        "visible": true,
        "platform": "mingda_rock3_base.stl",
--- a/resources/definitions/mingda_d4pro.def.json
+++ b/resources/definitions/mingda_d4pro.def.json
@ -2,16 +2,17 @@
    "name": "Mingda D4 Pro",
    "version": 2,
    "inherits": "mingda_base",
-    "overrides": {
+    "overrides":
+    {
        "machine_name": { "default_value": "MINGDA D4 Pro" },
 		"machine_start_gcode": { "default_value": "G28 ; home all axes\n G29; ABL\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 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.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_width": { "default_value": 420 },
        "machine_depth": { "default_value": 420 },
        "machine_height": { "default_value": 400 },
        "gantry_height": { "value": 25 }
-
    },
-    "metadata": {
+    "metadata":
+    {
        "quality_definition": "mingda_base",
        "visible": true,
        "platform": "mingda_d4pro_base.stl",
--- a/resources/definitions/mingda_magician_max.def.json
+++ b/resources/definitions/mingda_magician_max.def.json
@ -4,6 +4,11 @@
    "inherits": "mingda_base",
    "overrides": {
        "machine_name": { "default_value": "Mingda Magician Max" },
+		
+		"machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\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 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.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 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M420 S0\n M106 S0 ; turn off fan" },
+		
        "machine_width": { "default_value": 320 },
        "machine_depth": { "default_value": 320 },
        "machine_height": { "default_value": 400 },
@ -13,7 +18,7 @@
    "metadata": {
 		"quality_definition": "mingda_base",
 		"visible": true,
-		"platform": "mingda_rock3_base.stl",
-		"platform_offset": [ -179, -108, 150]
+		"platform": "mingda_magician_max_base.stl",
+		"platform_offset": [ 0, 0, 4]
    }
 }
--- a/resources/definitions/mingda_magician_pro.def.json
+++ b/resources/definitions/mingda_magician_pro.def.json
@ -4,9 +4,11 @@
    "inherits": "mingda_base",
    "overrides": {
        "machine_name": { "default_value": "Mingda Magician Pro" },
-		"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 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.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_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\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 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.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 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M420 S0\n M106 S0 ; turn off fan" },
+		
        "machine_width": { "default_value": 400 },
        "machine_depth": { "default_value": 400 },
        "machine_height": { "default_value": 400 },
@ -16,7 +18,7 @@
    "metadata": {
        "quality_definition": "mingda_base",
        "visible": true,
-        "platform": "mingda_d4pro_base.stl",
-        "platform_offset": [ -177, -140, 170]
+        "platform": "mingda_magician_pro_base.stl",
+        "platform_offset": [ 0, 0, -4]
    }
 }
--- a/resources/definitions/mingda_magician_x.def.json
+++ b/resources/definitions/mingda_magician_x.def.json
@ -4,6 +4,11 @@
    "inherits": "mingda_base",
    "overrides": {
        "machine_name": { "default_value": "Mingda Magician X" },
+		
+		"machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\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 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.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 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M420 S0\n M106 S0 ; turn off fan" },
+		
        "machine_width": { "default_value": 230 },
        "machine_depth": { "default_value": 230 },
        "machine_height": { "default_value": 260 },
@ -13,7 +18,7 @@
    "metadata": {
        "quality_definition": "mingda_base",
        "visible": true,
-        "platform": "mingda_d2_base.stl",
-        "platform_offset": [ -205, -77, 65]
+        "platform": "mingda_magician_x_base.stl",
+        "platform_offset": [ 0, 0, 0]
    }
 }
--- a/resources/definitions/mixware_hyper_s.def.json
+++ b/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"
        },
--- a/resources/definitions/mp_mini_delta.def.json
+++ b/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 },
--- a/resources/definitions/renkforce_rf100_xl.def.json
+++ b/resources/definitions/renkforce_rf100_xl.def.json
@ -18,55 +18,55 @@
            "default_value": "skirt"
        },
        "bottom_thickness": {
-            "value": "0.6"
+            "value": 0.6
        },
        "brim_width": {
-            "value": "3.0"
+            "value": 3.0
        },
        "cool_fan_enabled": {
-            "value": "True"
+            "value": true
        },
        "cool_fan_full_at_height": {
-            "value": "0.5"
+            "value": 0.5
        },
        "cool_fan_speed_max": {
-            "value": "100.0"
+            "value": 100.0
        },
        "cool_fan_speed_min": {
-            "value": "100.0"
+            "value": 100.0
        },
        "cool_lift_head": {
-            "value": "True"
+            "value": true
        },
        "cool_min_layer_time": {
-            "value": "1.0"
+            "value": 1.0
        },
        "cool_min_speed": {
-            "value": "5.0"
+            "value": 5.0
        },
        "infill_before_walls": {
-            "value": "True"
+            "value": true
        },
        "infill_line_width": {
-            "value": "0.6"
+            "value": 0.6
        },
        "infill_overlap": {
-            "value": "15.0"
+            "value": 15.0
        },
        "infill_sparse_density": {
-            "value": "26.0"
+            "value": 26.0
        },
        "ironing_enabled": {
-            "value": "True"
+            "value": true
        },
        "layer_0_z_overlap": {
-            "value": "0.11"
+            "value": 0.11
        },
        "layer_height_0": {
-            "value": "0.3"
+            "value": 0.3
        },
        "machine_depth": {
-            "value": "200"
+            "value": 200
        },
        "machine_end_gcode": {
            "default_value": ";End GCode\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-4 F300 ;move Z up a bit and retract filament even more\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG0 Z{machine_height} F1800 ;move the platform all the way down\nG28 X0 Y0 F1800 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM117 Done"
@ -75,10 +75,10 @@
            "default_value": "RepRap (Marlin/Sprinter)"
        },
        "machine_heated_bed": {
-            "default_value": "true"
+            "default_value": true
        },
        "machine_height": {
-            "value": "200"
+            "value": 200
        },
        "machine_name": {
            "default_value": "Renkforce RF100 XL"
@ -87,109 +87,109 @@
            "default_value": ";Sliced at: {day} {date} {time}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG1 Z5.0 F1800 ;move Z to 5mm\nG28 X0 Y0 F1800 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstop\nG92 E0 ;zero the extruded length\nG1 F200 E6.0 ;extrude 6.0mm of feed stock to build pressure\nG1 Z5.0 F300 ;move the platform down 5mm\nG92 E0 ;zero the extruded length again\nG1 F1800\n;Put printing message on LCD screen\nM117 Printing..."
        },
        "machine_width": {
-            "value": "200"
+            "value": 200
        },
        "material_bed_temperature": {
-            "value": "70"
+            "value": 70
        },
        "ooze_shield_enabled": {
-            "value": "True"
+            "value": true
        },
        "raft_airgap": {
-            "value": "0.33"
+            "value": 0.33
        },
        "raft_base_line_spacing": {
-            "value": "3.0"
+            "value": 3.0
        },
        "raft_base_line_width": {
-            "value": "1.0"
+            "value": 1.0
        },
        "raft_base_thickness": {
-            "value": "0.3"
+            "value": 0.3
        },
        "raft_interface_line_spacing": {
-            "value": "3.0"
+            "value": 3.0
        },
        "raft_interface_line_width": {
-            "value": "0.4"
+            "value": 0.4
        },
        "raft_interface_thickness": {
-            "value": "0.27"
+            "value": 0.27
        },
        "raft_margin": {
-            "value": "6.0"
+            "value": 6.0
        },
        "raft_speed": {
-            "value": "20.0"
+            "value": 20.0
        },
        "raft_surface_layers": {
-            "value": "2"
+            "value": 2
        },
        "raft_surface_line_spacing": {
-            "value": "0.4"
+            "value": 0.4
        },
        "raft_surface_line_width": {
-            "value": "0.4"
+            "value": 0.4
        },
        "raft_surface_thickness": {
-            "value": "0.1"
+            "value": 0.1
        },
        "retraction_amount": {
-            "value": "5.0"
+            "value": 5.0
        },
        "retraction_combing": {
-            "value": "'all'"
+            "value": "all"
        },
        "retraction_enable": {
-            "value": "True"
+            "value": true
        },
        "retraction_min_travel": {
-            "value": "1.5"
+            "value": 1.5
        },
        "skin_overlap": {
-            "value": "15.0"
+            "value": 15.0
        },
        "skirt_brim_minimal_length": {
-            "value": "150.0"
+            "value": 150.0
        },
        "skirt_gap": {
-            "value": "3.0"
+            "value": 3.0
        },
        "skirt_line_count": {
-            "value": "3"
+            "value": 3
        },
        "speed_infill": {
-            "value": "50.0"
+            "value": 50.0
        },
        "speed_layer_0": {
-            "value": "15.0"
+            "value": 15.0
        },
        "speed_print": {
-            "value": "50.0"
+            "value": 50.0
        },
        "speed_topbottom": {
-            "value": "30.0"
+            "value": 30.0
        },
        "speed_travel": {
-            "value": "50.0"
+            "value": 50.0
        },
        "speed_wall_0": {
-            "value": "25.0"
+            "value": 25.0
        },
        "speed_wall_x": {
-            "value": "35.0"
+            "value": 35.0
        },
        "support_angle": {
-            "value": "60.0"
+            "value": 60.0
        },
        "support_enable": {
-            "value": "False"
+            "value": false
        },
        "support_infill_rate": {
            "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15"
        },
        "support_line_width": {
-            "value": "0.6"
+            "value": 0.6
        },
        "support_pattern": {
            "default_value": "lines"
@ -198,16 +198,16 @@
            "default_value": "everywhere"
        },
        "support_xy_distance": {
-            "value": "0.7"
+            "value": 0.7
        },
        "support_z_distance": {
-            "value": "0.35"
+            "value": 0.35
        },
        "top_bottom_thickness": {
-            "value": "0.8"
+            "value": 0.8
        },
        "wall_thickness": {
-            "value": "0.8"
+            "value": 0.8
        }
    }
 }
--- a/resources/definitions/rigid3d_base.def.json
+++ b/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"
@ -123,7 +113,7 @@
        "travel_avoid_other_parts": { "value": "False" },
        
        "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 },
--- a/resources/definitions/rigid3d_hobby.def.json
+++ b/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",
--- a/resources/definitions/rigid3d_mucit.def.json
+++ b/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",
--- a/resources/definitions/rigid3d_zero.def.json
+++ b/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",
--- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json
+++ b/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
        },
--- a/resources/definitions/tank_m_base.def.json
+++ b/resources/definitions/tank_m_base.def.json
@ -49,7 +49,6 @@
        "acceleration_print": { "value": 2500 },
        "acceleration_travel": { "value": 2500 },

-        "line_width": { "value": "machine_nozzle_size" },
        
        "wall_thickness": {"value": "line_width * 2" },

@ -59,38 +58,27 @@
        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
    
        "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 300.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": 1.0 },
        "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'" },
--- a/resources/definitions/tizyx_evy.def.json
+++ b/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":
        {
--- a/resources/definitions/tizyx_k25.def.json
+++ b/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,
--- a/resources/definitions/trimaker_cosmosII.def.json
+++ b/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",
--- a/resources/definitions/trimaker_nebula.def.json
+++ b/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",
--- a/Show more
+++ b/Show more