Merge branch 'Ultimaker:main' into main

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,33 @@
+# Description
+
+<!-- Please include a summary of which issue is fixed or feature was added. Please also include relevant motivation and context. 
+If this pull request adds settings definitions for machines/materials, list them here. 
+
+This fixes... OR This improves... -->
+
+## Type of change
+
+<!-- Please delete options that are not relevant. -->
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Printer definition file(s)
+- [ ] Translations
+
+# How Has This Been Tested?
+
+<!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration -->
+
+- [ ] Test A
+- [ ] Test B
+
+**Test Configuration**:
+* Operating System:
+
+# Checklist:
+<!-- Check if relevant -->
+
+- [ ] My code follows the style guidelines of this project as described in [UltiMaker Meta](https://github.com/Ultimaker/Meta) and [Cura QML best practices](https://github.com/Ultimaker/Cura/wiki/QML-Best-Practices)
+- [ ] I have read the [Contribution guide](https://github.com/Ultimaker/Cura/blob/main/contributing.md) 
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have uploaded any files required to test this change

.github/workflows/conan-package-create.yml

@@ -75,7 +75,8 @@ jobs:
                     cache-dependency-path: .github/workflows/requirements-conan-package.txt
 
             -   name: Install Python requirements for runner
-                run: pip install -r .github/workflows/requirements-conan-package.txt
+                run: pip install -r https://raw.githubusercontent.com/Ultimaker/Cura/main/.github/workflows/requirements-conan-package.txt
+                #  Note the runner requirements are always installed from the main branch in the Ultimaker/Cura repo
 
             -   name: Use Conan download cache (Bash)
                 if: ${{ runner.os != 'Windows' }}

.github/workflows/conan-recipe-export.yml

@@ -62,8 +62,9 @@ jobs:
 
             -   name: Install Python requirements and Create default Conan profile
                 run: |
-                    pip install -r .github/workflows/requirements-conan-package.txt
+                    pip install -r https://raw.githubusercontent.com/Ultimaker/Cura/main/.github/workflows/requirements-conan-package.txt
                     conan profile new default --detect
+                #  Note the runner requirements are always installed from the main branch in the Ultimaker/Cura repo
 
             -   name: Cache Conan local repository packages
                 uses: actions/cache@v3

.github/workflows/conan-recipe-version.yml

@@ -134,7 +134,8 @@ jobs:
                                 version = tools.Version(tag)
                             except ConanException:
                                 continue
-                            if version > latest_branch_version:
+                            if version > latest_branch_version and version < tools.Version("10.0.0"):
+                                # FIXME: stupid old Cura tags 13.04 etc. keep popping up
                                 latest_branch_version = version
                                 latest_branch_tag = repo.tag(tag)
                         

.github/workflows/cura-all-installers.yml

@@ -1,5 +1,5 @@
 name: Cura All Installers
-run-name: ${{ inputs.cura_conan_version }} by @${{ github.actor }}
+run-name: ${{ inputs.cura_conan_version }} for exe ${{ inputs.build_windows_exe }}, msi ${{ inputs.build_windows_msi }}, dmg ${{ inputs.build_macos }}, pkg ${{ inputs.build_macos_installer }}, appimage ${{ inputs.build_linux }} - enterprise ${{ inputs.enterprise }}
 
 on:
     workflow_dispatch:
@@ -34,8 +34,13 @@ on:
                 default: true
                 required: true
                 type: boolean
-            build_windows:
-                description: 'Build for Windows'
+            build_windows_exe:
+                description: 'Build for Windows exe'
+                default: false
+                required: true
+                type: boolean
+            build_windows_msi:
+                description: 'Build for msi+pkg'
                 default: true
                 required: true
                 type: boolean
@@ -45,7 +50,7 @@ on:
                 required: true
                 type: boolean
             build_macos:
-                description: 'Build for MacOs'
+                description: 'Build dmg for MacOS'
                 default: true
                 required: true
                 type: boolean
@@ -55,8 +60,8 @@ on:
     - cron: '25 3 * * 1-5'
 
 jobs:
-    windows-installer-create:
-        if: ${{ inputs.build_windows }}
+    windows-installer-create-exe:
+        if: ${{ inputs.build_windows_exe }}
         uses: ./.github/workflows/cura-installer.yml
         with:
             platform: 'windows-2022'
@@ -67,6 +72,22 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
+            msi_installer: false
+        secrets: inherit
+
+    windows-installer-create-msi:
+        if: ${{ inputs.build_windows_msi }}
+        uses: ./.github/workflows/cura-installer.yml
+        with:
+            platform: 'windows-2022'
+            os_name: 'win64'
+            cura_conan_version: ${{ inputs.cura_conan_version }}
+            conan_args: ${{ inputs.conan_args }}
+            conan_config: ${{ inputs.conan_config }}
+            enterprise: ${{ inputs.enterprise }}
+            staging: ${{ inputs.staging }}
+            installer: ${{ inputs.installer }}
+            msi_installer: true
         secrets: inherit
 
     linux-installer-create:
@@ -81,6 +102,7 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
+            msi_installer: false
         secrets: inherit
 
     linux-modern-installer-create:
@@ -95,6 +117,22 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
+            msi_installer: false
+        secrets: inherit
+
+    macos-dmg-create:
+        if: ${{ inputs.build_macos }}
+        uses: ./.github/workflows/cura-installer.yml
+        with:
+            platform: 'macos-11'
+            os_name: 'mac'
+            cura_conan_version: ${{ inputs.cura_conan_version }}
+            conan_args: ${{ inputs.conan_args }}
+            conan_config: ${{ inputs.conan_config }}
+            enterprise: ${{ inputs.enterprise }}
+            staging: ${{ inputs.staging }}
+            installer: ${{ inputs.installer }}
+            msi_installer: false
         secrets: inherit
 
     macos-installer-create:
@@ -109,4 +147,5 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
+            msi_installer: true
         secrets: inherit

.github/workflows/cura-installer.yml

@@ -44,6 +44,11 @@ on:
                 default: true
                 required: true
                 type: boolean
+            msi_installer:
+                description: 'Create the msi'
+                default: false
+                required: true
+                type: boolean
 
 env:
     CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@@ -57,10 +62,12 @@ env:
     MAC_NOTARIZE_USER: ${{ secrets.MAC_NOTARIZE_USER }}
     MAC_NOTARIZE_PASS: ${{ secrets.MAC_NOTARIZE_PASS }}
     MACOS_CERT_P12: ${{ secrets.MACOS_CERT_P12 }}
-    MACOS_CERT_PASS: ${{ secrets.MACOS_CERT_PASS }}
+    MACOS_CERT_INSTALLER_P12: ${{ secrets.MACOS_CERT_INSTALLER_P12 }}
     MACOS_CERT_USER: ${{ secrets.MACOS_CERT_USER }}
     GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
     MACOS_CERT_PASSPHRASE: ${{ secrets.MACOS_CERT_PASSPHRASE }}
+    WIN_CERT_INSTALLER_CER: ${{ secrets.WIN_CERT_INSTALLER_CER }}
+    WIN_CERT_INSTALLER_CER_PASS: ${{ secrets.WIN_CERT_INSTALLER_CER_PASS }}
     CURA_CONAN_VERSION: ${{ inputs.cura_conan_version }}
     ENTERPRISE: ${{ inputs.enterprise }}
     STAGING: ${{ inputs.staging }}
@@ -81,7 +88,8 @@ jobs:
                     cache-dependency-path: .github/workflows/requirements-conan-package.txt
 
             -   name: Install Python requirements for runner
-                run: pip install -r .github/workflows/requirements-conan-package.txt
+                run: pip install -r https://raw.githubusercontent.com/Ultimaker/Cura/main/.github/workflows/requirements-conan-package.txt
+                #  Note the runner requirements are always installed from the main branch in the Ultimaker/Cura repo
 
             -   name: Use Conan download cache (Bash)
                 if: ${{ runner.os != 'Windows' }}
@@ -112,7 +120,7 @@ jobs:
 
             -   name: Install MacOS system requirements
                 if:  ${{ runner.os == 'Macos' }}
-                run: brew install autoconf automake ninja create-dmg
+                run: brew install autoconf automake ninja create-dmg # Delete create-dmg when deprecating dmg
 
             -   name: Install Linux system requirements
                 if: ${{ runner.os == 'Linux' }}
@@ -126,14 +134,14 @@ jobs:
                     echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV
 
             -   name: Install GCC-12 on ubuntu-22.04
-                if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }}
+                if: ${{ startsWith(inputs.platform, '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: Use GCC-10 on ubuntu-20.04
-                if: ${{ startsWith(inputs.runs_on, 'ubuntu-20.04') }}
+                if: ${{ startsWith(inputs.platform, 'ubuntu-20.04') }}
                 run: |
                     sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
                     sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
@@ -145,24 +153,42 @@ jobs:
                 if: ${{ runner.os == 'Linux' }}
                 run: echo -n "$GPG_PRIVATE_KEY" | base64 --decode | gpg --import
 
-            -   name: Configure Macos keychain (Bash)
-                id: macos-keychain
+            -   name: Configure Macos keychain Developer Cert(Bash)
+                id: macos-keychain-developer-cert
                 if: ${{ runner.os == 'Macos' }}
                 uses: apple-actions/import-codesign-certs@v1
                 with:
+                    keychain-password: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }}
                     p12-file-base64: ${{ secrets.MACOS_CERT_P12 }}
                     p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }}
 
-            -   name: Clean Conan local cache
-                if: ${{ inputs.conan_clean_local_cache }}
-                run: conan remove "*" -f
+            -   name: Configure Macos keychain Installer Cert (Bash)
+                id: macos-keychain-installer-cert
+                if: ${{ runner.os == 'Macos' }}
+                uses: apple-actions/import-codesign-certs@v1
+                with:
+                    keychain-password: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }}
+                    create-keychain: false # keychain is created in previous use of action.
+                    p12-file-base64: ${{ secrets.MACOS_CERT_INSTALLER_P12 }}
+                    p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }}
+
+            -   name: Create PFX certificate from BASE64_PFX_CONTENT secret
+                if: ${{ runner.os == 'Windows' }}
+                id: create-pfx
+                env:
+                    PFX_CONTENT: ${{ secrets.WIN_CERT_INSTALLER_CER }}
+                run: |
+                    $pfxPath = Join-Path -Path $env:RUNNER_TEMP -ChildPath "cert.pfx"; 
+                    $encodedBytes = [System.Convert]::FromBase64String($env:PFX_CONTENT); 
+                    Set-Content $pfxPath -Value $encodedBytes -AsByteStream;
+                    echo "PFX_PATH=$pfxPath" >> $env:GITHUB_OUTPUT;
 
             -   name: Get Conan configuration from branch
-                if: ${{ inputs.conan_config_branch != '' }}
-                run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}"
+                if: ${{ inputs.conan_config != '' }}
+                run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config }}"
 
             -   name: Get Conan configuration
-                if: ${{ inputs.conan_config_branch == '' }}
+                if: ${{ inputs.conan_config == '' }}
                 run: conan config install https://github.com/Ultimaker/conan-config.git
 
             -   name: Create the Packages (Bash)
@@ -182,6 +208,7 @@ jobs:
             -   name: Set Environment variables for Cura (Powershell)
                 if: ${{ runner.os == 'Windows' }}
                 run: |
+                    echo "${Env:WIX}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
                     .\cura_inst\Scripts\activate_github_actions_env.ps1
                     .\cura_inst\Scripts\activate_github_actions_version_env.ps1
 
@@ -189,7 +216,7 @@ jobs:
                 if: ${{ runner.os == 'Macos' }}
                 run: security unlock -p $TEMP_KEYCHAIN_PASSWORD signing_temp.keychain
                 env:
-                    TEMP_KEYCHAIN_PASSWORD: ${{  steps.macos-keychain.outputs.keychain-password }}
+                    TEMP_KEYCHAIN_PASSWORD: ${{  steps.macos-keychain-developer-cert.outputs.keychain-password }}
 
                 # FIXME: This is a workaround to ensure that we use and pack a shared library for OpenSSL 1.1.1l. We currently compile
                 #  OpenSSL statically for CPython, but our Python Dependenies (such as PyQt6) require a shared library.
@@ -214,43 +241,86 @@ jobs:
             -   name: Create the Cura dist
                 run: pyinstaller ./cura_inst/UltiMaker-Cura.spec
 
+            -   name: Output the name file name and extension
+                id: filename
+                shell: python
+                run: |
+                    import os
+                    enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else ""
+                    installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-${{ inputs.os_name }}"
+                    if "${{ runner.os }}" == "Windows":
+                        installer_ext = "msi" if "${{ inputs.msi_installer }}" == "true" else "exe"
+                    elif "${{ runner.os }}" == "macOS":
+                        installer_ext = "pkg" if "${{ inputs.msi_installer }}" == "true" else "dmg"
+                    else:
+                        installer_ext = "AppImage"
+                    output_env = os.environ["GITHUB_OUTPUT"]
+                    content = ""
+                    if os.path.exists(output_env):
+                        with open(output_env, "r") as f:
+                            content = f.read()
+                    with open(output_env, "w") as f:
+                        f.write(content)
+                        f.writelines(f"INSTALLER_FILENAME={installer_filename}\n")
+                        f.writelines(f"INSTALLER_EXT={installer_ext}\n")
+                        f.writelines(f"FULL_INSTALLER_FILENAME={installer_filename}.{installer_ext}\n")
+
             -   name: Archive the artifacts (bash)
-                if: ${{ github.event.inputs.installer == 'false' && runner.os != 'Windows' }}
-                run: tar -zcf "./UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.tar.gz" "./UltiMaker-Cura/"
+                if: ${{ !inputs.installer && runner.os != 'Windows' }}
+                run: tar -zcf "./${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz" "./UltiMaker-Cura/"
                 working-directory: dist
 
             -   name: Archive the artifacts (Powershell)
-                if: ${{ github.event.inputs.installer == 'false' && runner.os == 'Windows' }}
-                run: Compress-Archive -Path ".\UltiMaker-Cura" -DestinationPath ".\UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.zip"
+                if: ${{ !inputs.installer && runner.os == 'Windows' }}
+                run: Compress-Archive -Path ".\UltiMaker-Cura" -DestinationPath ".\${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip"
                 working-directory: dist
 
             -   name: Create the Windows exe installer (Powershell)
-                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' }}
+                if: ${{ inputs.installer && runner.os == 'Windows' && !inputs.msi_installer }}
                 run: |
-                    python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.exe"
+                    python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}"
+                working-directory: dist
+
+            -   name: Create the Windows msi installer (Powershell)
+                if: ${{ inputs.installer && runner.os == 'Windows' && inputs.msi_installer }}
+                run: |
+                    python ..\cura_inst\packaging\msi\create_windows_msi.py ..\cura_inst .\UltiMaker-Cura "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" "$Env:CURA_APP_NAME"
+                working-directory: dist
+
+            -   name: Sign the Windows exe installer (Powershell)
+                if: ${{ inputs.installer && runner.os == 'Windows' && !inputs.msi_installer }}
+                env:
+                    PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }}
+                run: |
+                    & "C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe" sign /f $Env:PFX_PATH /p "$Env:WIN_CERT_INSTALLER_CER_PASS" /fd SHA256 /t http://timestamp.digicert.com "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}"
+                working-directory: dist
+
+            -   name: Sign the Windows msi installer (Powershell)
+                if: ${{ inputs.installer && runner.os == 'Windows' && inputs.msi_installer }}
+                env:
+                    PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }}
+                run: |
+                    & "C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe" sign /f $Env:PFX_PATH /p "$Env:WIN_CERT_INSTALLER_CER_PASS" /fd SHA256 /t http://timestamp.digicert.com "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}"
                 working-directory: dist
 
             -   name: Create the Linux AppImage (Bash)
-                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Linux' }}
-                run: python ../cura_inst/packaging/AppImage/create_appimage.py ./UltiMaker-Cura $CURA_VERSION_FULL "UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.AppImage"
+                if: ${{ inputs.installer && runner.os == 'Linux' }}
+                run: python ../cura_inst/packaging/AppImage/create_appimage.py ./UltiMaker-Cura $CURA_VERSION_FULL "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}"
                 working-directory: dist
 
-            -   name: Create the MacOS dmg (Bash)
+            -   name: Create the MacOS dmg and/or pkg (Bash)
                 if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }}
-                run: python ../cura_inst/packaging/dmg/dmg_sign_noterize.py ../cura_inst . "UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.dmg"
+                run: python ../cura_inst/packaging/MacOS/build_macos.py ../cura_inst . $CURA_CONAN_VERSION "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" "$CURA_APP_NAME"
                 working-directory: dist
 
             -   name: Upload the artifacts
                 uses: actions/upload-artifact@v3
                 with:
-                    name: UltiMaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ inputs.os_name }}
+                    name: ${{ steps.filename.outputs.INSTALLER_FILENAME }}-${{ steps.filename.outputs.INSTALLER_EXT }}
                     path: |
                         dist/*.tar.gz
                         dist/*.zip
-                        dist/*.exe
-                        dist/*.msi
-                        dist/*.dmg
-                        dist/*.AppImage
+                        dist/${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}
                         dist/*.asc
                     retention-days: 5
 

.github/workflows/printer-linter-format.yml

@@ -2,16 +2,15 @@ name: printer-linter-format
 
 on:
     push:
-        branches:
-            - main
-            - '[1-9].[0-9]'
-            - '[1-9].[0-9][0-9]'
-        path:
-            - 'resources/**'
+        paths:
+            - 'resources/definitions/**'
+            - 'resources/extruders/**'
+            - 'resources/intent/**'
+            - 'resources/quality/**'
+            - 'resources/variants/**'
 
 jobs:
     printer-linter-format:
-        if: ${{ github.repository_owner == 'Ultimaker' }}
         name: Printer linter auto format
 
         runs-on: ubuntu-latest

.github/workflows/printer-linter-pr-diagnose.yml

@@ -1,59 +1,59 @@
 name: printer-linter-pr-diagnose
 
 on:
-    pull_request:
-        path:
-            - 'resources/**'
+  pull_request:
+    path:
+      - "resources/**"
 
 jobs:
-    printer-linter-diagnose:
-        name: Printer linter PR diagnose
+  printer-linter-diagnose:
+    name: Printer linter PR diagnose
 
-        runs-on: ubuntu-latest
-        steps:
-            -   name: Checkout
-                uses: actions/checkout@v3
-                with:
-                    fetch-depth: 2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
 
-            -   name: Setup Python and pip
-                uses: actions/setup-python@v4
-                with:
-                    python-version: 3.11.x
-                    cache: 'pip'
-                    cache-dependency-path: .github/workflows/requirements-printer-linter.txt
+      - name: Setup Python and pip
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11.x
+          cache: "pip"
+          cache-dependency-path: .github/workflows/requirements-printer-linter.txt
 
-            -   uses: technote-space/get-diff-action@v6
-                with:
-                    PATTERNS: |
-                        resources/+(extruders|definitions)/*.def.json
-                        resources/+(intent|quality|variants)/**/*.inst.cfg
+      - uses: technote-space/get-diff-action@v6
+        with:
+          PATTERNS: |
+            resources/+(extruders|definitions)/*.def.json
+            resources/+(intent|quality|variants)/**/*.inst.cfg
 
-            -   name: Install Python requirements for runner
-                if: env.GIT_DIFF && !env.MATCHED_FILES
-                run: pip install -r .github/workflows/requirements-printer-linter.txt
+      - name: Install Python requirements for runner
+        if: env.GIT_DIFF && !env.MATCHED_FILES
+        run: pip install -r .github/workflows/requirements-printer-linter.txt
 
-            -   name: Create results directory
-                run: mkdir printer-linter-result
+      - name: Create results directory
+        run: mkdir printer-linter-result
 
-            -   name: Diagnose file(s)
-                if: env.GIT_DIFF && !env.MATCHED_FILES
-                run: python printer-linter/src/terminal.py --diagnose --report printer-linter-result/fixes.yml ${{ env.GIT_DIFF_FILTERED }}
+      - name: Diagnose file(s)
+        if: env.GIT_DIFF && !env.MATCHED_FILES
+        run: python printer-linter/src/terminal.py --diagnose --report printer-linter-result/fixes.yml ${{ env.GIT_DIFF_FILTERED }}
 
-            -   name: Save PR metadata
-                run: |
-                    echo ${{ github.event.number }} > printer-linter-result/pr-id.txt
-                    echo ${{ github.event.pull_request.head.repo.full_name }} > printer-linter-result/pr-head-repo.txt
-                    echo ${{ github.event.pull_request.head.ref }} > printer-linter-result/pr-head-ref.txt
+      - name: Save PR metadata
+        run: |
+          echo ${{ github.event.number }} > printer-linter-result/pr-id.txt
+          echo ${{ github.event.pull_request.head.repo.full_name }} > printer-linter-result/pr-head-repo.txt
+          echo ${{ github.event.pull_request.head.ref }} > printer-linter-result/pr-head-ref.txt
 
-            -   uses: actions/upload-artifact@v2
-                with:
-                    name: printer-linter-result
-                    path: printer-linter-result/
+      - uses: actions/upload-artifact@v2
+        with:
+          name: printer-linter-result
+          path: printer-linter-result/
 
-            -   name: Run clang-tidy-pr-comments action
-                uses: platisd/clang-tidy-pr-comments@fix_suggestions_for_multiline_comments
-                with:
-                    github_token: ${{ secrets.GITHUB_TOKEN }}
-                    clang_tidy_fixes: result.yml
-                    request_changes: true
+      - name: Run clang-tidy-pr-comments action
+        uses: platisd/clang-tidy-pr-comments@bc0bb7da034a8317d54e7fe1e819159002f4cc40
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          clang_tidy_fixes: result.yml
+          request_changes: true

.github/workflows/printer-linter-pr-post.yml

@@ -1,81 +1,81 @@
 name: printer-linter-pr-post
 
 on:
-    workflow_run:
-        workflows: [ "printer-linter-pr-diagnose" ]
-        types: [ completed ]
+  workflow_run:
+    workflows: ["printer-linter-pr-diagnose"]
+    types: [completed]
 
 jobs:
-    clang-tidy-results:
-        # Trigger the job only if the previous (insecure) workflow completed successfully
-        if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }}
-        runs-on: ubuntu-latest
-        steps:
-            -   name: Download analysis results
-                uses: actions/github-script@v3.1.0
-                with:
-                    script: |
-                        let artifacts = await github.actions.listWorkflowRunArtifacts({
-                            owner: context.repo.owner,
-                            repo: context.repo.repo,
-                            run_id: ${{github.event.workflow_run.id }},
-                        });
-                        let matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-                            return artifact.name == "printer-linter-result"
-                        })[0];
-                        let download = await github.actions.downloadArtifact({
-                            owner: context.repo.owner,
-                            repo: context.repo.repo,
-                            artifact_id: matchArtifact.id,
-                            archive_format: "zip",
-                        });
-                        let fs = require("fs");
-                        fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data));
+  clang-tidy-results:
+    # Trigger the job only if the previous (insecure) workflow completed successfully
+    if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download analysis results
+        uses: actions/github-script@v3.1.0
+        with:
+          script: |
+            let artifacts = await github.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: ${{github.event.workflow_run.id }},
+            });
+            let matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+                return artifact.name == "printer-linter-result"
+            })[0];
+            let download = await github.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: matchArtifact.id,
+                archive_format: "zip",
+            });
+            let fs = require("fs");
+            fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data));
 
-            -   name: Set environment variables
-                run: |
-                    mkdir printer-linter-result
-                    unzip printer-linter-result.zip -d printer-linter-result
-                    echo "pr_id=$(cat printer-linter-result/pr-id.txt)" >> $GITHUB_ENV
-                    echo "pr_head_repo=$(cat printer-linter-result/pr-head-repo.txt)" >> $GITHUB_ENV
-                    echo "pr_head_ref=$(cat printer-linter-result/pr-head-ref.txt)" >> $GITHUB_ENV
+      - name: Set environment variables
+        run: |
+          mkdir printer-linter-result
+          unzip printer-linter-result.zip -d printer-linter-result
+          echo "pr_id=$(cat printer-linter-result/pr-id.txt)" >> $GITHUB_ENV
+          echo "pr_head_repo=$(cat printer-linter-result/pr-head-repo.txt)" >> $GITHUB_ENV
+          echo "pr_head_ref=$(cat printer-linter-result/pr-head-ref.txt)" >> $GITHUB_ENV
 
-            -   uses: actions/checkout@v3
-                with:
-                    repository: ${{ env.pr_head_repo }}
-                    ref: ${{ env.pr_head_ref }}
-                    persist-credentials: false
+      - uses: actions/checkout@v3
+        with:
+          repository: ${{ env.pr_head_repo }}
+          ref: ${{ env.pr_head_ref }}
+          persist-credentials: false
 
-            -   name: Redownload analysis results
-                uses: actions/github-script@v3.1.0
-                with:
-                    script: |
-                        let artifacts = await github.actions.listWorkflowRunArtifacts({
-                            owner: context.repo.owner,
-                            repo: context.repo.repo,
-                            run_id: ${{github.event.workflow_run.id }},
-                        });
-                        let matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-                            return artifact.name == "printer-linter-result"
-                        })[0];
-                        let download = await github.actions.downloadArtifact({
-                            owner: context.repo.owner,
-                            repo: context.repo.repo,
-                            artifact_id: matchArtifact.id,
-                            archive_format: "zip",
-                        });
-                        let fs = require("fs");
-                        fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data));
+      - name: Redownload analysis results
+        uses: actions/github-script@v3.1.0
+        with:
+          script: |
+            let artifacts = await github.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: ${{github.event.workflow_run.id }},
+            });
+            let matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+                return artifact.name == "printer-linter-result"
+            })[0];
+            let download = await github.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: matchArtifact.id,
+                archive_format: "zip",
+            });
+            let fs = require("fs");
+            fs.writeFileSync("${{github.workspace}}/printer-linter-result.zip", Buffer.from(download.data));
 
-            -   name: Extract analysis results
-                run: |
-                    mkdir printer-linter-result
-                    unzip printer-linter-result.zip -d printer-linter-result
+      - name: Extract analysis results
+        run: |
+          mkdir printer-linter-result
+          unzip printer-linter-result.zip -d printer-linter-result
 
-            -   name: Run clang-tidy-pr-comments action
-                uses: platisd/clang-tidy-pr-comments@fix_suggestions_for_multiline_comments
-                with:
-                    github_token: ${{ secrets.GITHUB_TOKEN }}
-                    clang_tidy_fixes: printer-linter-result/fixes.yml
-                    pull_request_id: ${{ env.pr_id }}
-                    request_changes: true
+      - name: Run clang-tidy-pr-comments action
+        uses: platisd/clang-tidy-pr-comments@bc0bb7da034a8317d54e7fe1e819159002f4cc40
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          clang_tidy_fixes: printer-linter-result/fixes.yml
+          pull_request_id: ${{ env.pr_id }}
+          request_changes: true

.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,!=1.52.0,!=1.57.0
 sip

.printer-linter

@@ -12,4 +12,6 @@ format:
     format-definition-single-value-single-line: true # Format dicts and lists with a single item on one line "dict": { "value": 10 }
     format-profile-space-around-delimiters: true
     format-profile-sort-keys: true
-diagnostic-mesh-file-size: 1200000
+diagnostic-mesh-file-size: 1200000
+diagnostic-definition-redundant-override-ignore:
+  - machine_.*

UltiMaker-Cura.spec.jinja

@@ -16,9 +16,9 @@ datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 # Add dynamic libs in the venv bin/Script Path. This is needed because we might copy some additional libs
 # e.q.: OpenSSL 1.1.1l in that directory with a separate:
 # `conan install openssl@1.1.1l -g deploy && cp openssl/bin/*.so cura_inst/bin`
-binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.so*")])
-binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dll")])
-binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dylib")])
+binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.so*")])
+binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dll")])
+binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dylib")])
 
 block_cipher = None
 
@@ -141,6 +141,7 @@ class UMBUNDLE(BUNDLE):
             "CFBundleIconFile": os.path.basename(self.icon),
             "CFBundleInfoDictionaryVersion": "6.0",
             "CFBundlePackageType": "APPL",
+            "CFBundleVersionString": self.version,
             "CFBundleShortVersionString": self.version,
         }
 
@@ -252,9 +253,9 @@ class UMBUNDLE(BUNDLE):
 
 app = UMBUNDLE(
     coll,
-    name='{{ name }}.app',
+    name='{{ display_name }}.app',
     icon={{ icon }},
-    bundle_identifier={{ osx_bundle_identifier }},
+    bundle_identifier={{ osx_bundle_identifier }} + "_" + '{{ display_name }}'.replace(" ", "_") + "_" {{ short_version }},
     version={{ version }},
     info_plist={
         'CFBundleDisplayName': '{{ display_name }}',
@@ -263,6 +264,7 @@ app = UMBUNDLE(
         'CFBundleExecutable': '{{ name }}',
         'CFBundleInfoDictionaryVersion': '6.0',
         'CFBundlePackageType': 'APPL',
+        'CFBundleVersionString': {{ version }},
         'CFBundleShortVersionString': {{ short_version }},
         'CFBundleDocumentTypes': [{
                 'CFBundleTypeRole': 'Viewer',

conandata.yml

@@ -12,10 +12,10 @@
 # Subject to change in the future!
 "5.3.0-alpha":
     requirements:
-        - "pyarcus/(latest)@ultimaker/testing"
+        - "pyarcus/5.2.2"
         - "curaengine/(latest)@ultimaker/testing"
-        - "pysavitar/(latest)@ultimaker/testing"
-        - "pynest2d/(latest)@ultimaker/testing"
+        - "pysavitar/5.2.2"
+        - "pynest2d/5.2.2"
         - "uranium/(latest)@ultimaker/testing"
         - "fdm_materials/(latest)@ultimaker/testing"
         - "cura_binary_data/(latest)@ultimaker/testing"
@@ -225,216 +225,6 @@
             Windows: "./icons/Cura.ico"
             Macos: "./icons/cura.icns"
             Linux: "./icons/cura-128.png"
-"5.2.0-beta.2":
-    requirements:
-        - "pyarcus/(latest)@ultimaker/stable"
-        - "curaengine/(latest)@ultimaker/stable"
-        - "pysavitar/(latest)@ultimaker/stable"
-        - "pynest2d/(latest)@ultimaker/stable"
-        - "uranium/(latest)@ultimaker/stable"
-        - "fdm_materials/(latest)@ultimaker/stable"
-        - "cura_binary_data/(latest)@ultimaker/stable"
-        - "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-beta.1":
-    requirements:
-        - "pyarcus/5.2.0-beta.1"
-        - "curaengine/5.2.0-beta.1"
-        - "pysavitar/5.2.0-beta.1"
-        - "pynest2d/5.2.0-beta.1"
-        - "uranium/5.2.0-beta.1"
-        - "fdm_materials/5.2.0-beta.1"
-        - "cura_binary_data/5.2.0-beta.1"
-        - "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":
     requirements:
         - "pyarcus/5.2.0"
@@ -540,111 +330,6 @@
             Windows: "./icons/Cura.ico"
             Macos: "./icons/cura.icns"
             Linux: "./icons/cura-128.png"
-"5.2.0-alpha":
-    requirements:
-        - "pyarcus/5.2@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.1.0":
     requirements:
         - "arcus/5.1.0"

conanfile.py

@@ -85,6 +85,12 @@ class CuraConan(ConanFile):
     def _enterprise(self):
         return self.options.enterprise in ["True", 'true']
 
+    @property
+    def _app_name(self):
+        if self._enterprise:
+            return str(self.options.display_name) + " Enterprise"
+        return str(self.options.display_name)
+
     @property
     def _cloud_api_root(self):
         return "https://api-staging.ultimaker.com" if self._staging else "https://api.ultimaker.com"
@@ -161,7 +167,7 @@ class CuraConan(ConanFile):
         with open(Path(location, "CuraVersion.py"), "w") as f:
             f.write(cura_version_py.render(
                 cura_app_name = self.name,
-                cura_app_display_name = self.options.display_name,
+                cura_app_display_name = self._app_name,
                 cura_version = cura_version,
                 cura_build_type = "Enterprise" if self._enterprise else "",
                 cura_debug_mode = self.options.cura_debug_mode,
@@ -235,7 +241,7 @@ class CuraConan(ConanFile):
         with open(Path(location, "UltiMaker-Cura.spec"), "w") as f:
             f.write(pyinstaller.render(
                 name = str(self.options.display_name).replace(" ", "-"),
-                display_name = self.options.display_name,
+                display_name = self._app_name,
                 entrypoint = entrypoint_location,
                 datas = datas,
                 binaries = binaries,
@@ -311,7 +317,7 @@ class CuraConan(ConanFile):
         self._generate_cura_version(Path(self.source_folder, "cura"))
 
         if self.options.devtools:
-            entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "dmg", "cura.entitlements"))
+            entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements"))
             self._generate_pyinstaller_spec(location = self.generators_folder,
                                             entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
                                             icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
@@ -425,11 +431,13 @@ echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_EN
 echo "CURA_VERSION_PATCH={{ cura_version_patch }}" >> ${{ env_prefix }}GITHUB_ENV
 echo "CURA_VERSION_BUILD={{ cura_version_build }}" >> ${{ env_prefix }}GITHUB_ENV
 echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV
+echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV
         """).render(cura_version_major = cura_version.major,
                     cura_version_minor = cura_version.minor,
                     cura_version_patch = cura_version.patch,
                     cura_version_build = cura_version.build if cura_version.build != "" else "0",
                     cura_version_full = self.version,
+                    cura_app_name = self._app_name,
                     env_prefix = env_prefix)
 
         ext = ".sh" if self.settings.os != "Windows" else ".ps1"
@@ -437,7 +445,7 @@ echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV
 
         self._generate_cura_version(Path(self._site_packages, "cura"))
 
-        entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "dmg", "cura.entitlements"))
+        entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements"))
         self._generate_pyinstaller_spec(location = self._base_dir,
                                         entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
                                         icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),

cura/ApplicationMetadata.py

@@ -64,7 +64,7 @@ try:
     if CuraAppDisplayName == "":
         CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME
     if IsEnterpriseVersion:
-        CuraAppDisplayName = CuraAppDisplayName + " Enterprise"
+        CuraAppDisplayName = CuraAppDisplayName
 
 except ImportError:
     CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME

cura/Machines/Models/MachineListModel.py

@@ -115,7 +115,9 @@ class MachineListModel(ListModel):
             online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks))
             online_machine_stacks.sort(key=lambda machine: machine.getName().upper())
 
-            other_machine_stacks.remove(abstract_machine)
+            if abstract_machine in other_machine_stacks:
+                other_machine_stacks.remove(abstract_machine)
+
             if abstract_machine in online_machine_stacks:
                 online_machine_stacks.remove(abstract_machine)
 

cura/Machines/Models/UserChangesModel.py

@@ -118,12 +118,14 @@ class UserChangesModel(ListModel):
                     if original_value is not None:
                         break
 
-                item_to_add = {"key": setting_key,
-                               "label": label,
-                               "user_value": str(user_changes.getProperty(setting_key, "value")),
-                               "original_value": str(original_value),
-                               "extruder": "",
-                               "category": category_label}
+                item_to_add = {
+                    "key": setting_key,
+                    "label": label,
+                    "user_value": str(user_changes.getProperty(setting_key, "value", default_value_resolve_context)),
+                    "original_value": str(original_value),
+                    "extruder": "",
+                    "category": category_label,
+                }
 
                 if stack != global_stack:
                     item_to_add["extruder"] = stack.getName()

cura/Settings/ExtruderManager.py

@@ -2,13 +2,15 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from PyQt6.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant  # For communicating data and events to Qt.
+
+from UM.Application import Application
 from UM.FlameProfiler import pyqtSlot
 
 import cura.CuraApplication # To get the global container stack to find the current machine.
+from UM.Util import parseBool
 from cura.Settings.GlobalStack import GlobalStack
 from UM.Logger import Logger
 from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
-from UM.Scene.SceneNode import SceneNode
 from UM.Scene.Selection import Selection
 from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator
 from UM.Settings.ContainerRegistry import ContainerRegistry  # Finding containers by ID.
@@ -45,6 +47,7 @@ class ExtruderManager(QObject):
         self._selected_object_extruders = []  # type: List[Union[str, "ExtruderStack"]]
 
         Selection.selectionChanged.connect(self.resetSelectedObjectExtruders)
+        Application.getInstance().globalContainerStackChanged.connect(self.emitGlobalStackExtrudersChanged)  # When the machine is swapped we must update the active machine extruders
 
     extrudersChanged = pyqtSignal(QVariant)
     """Signal to notify other components when the list of extruders for a machine definition changes."""
@@ -52,6 +55,21 @@ class ExtruderManager(QObject):
     activeExtruderChanged = pyqtSignal()
     """Notify when the user switches the currently active extruder."""
 
+    def emitGlobalStackExtrudersChanged(self):
+        # HACK
+        # The emit function can't be directly connected to another signal. This wrapper function is required.
+        # The extrudersChanged signal is emitted early when changing machines. This triggers it a second time
+        # after the extruder have changed properly. This is important for any QML using ExtruderManager.extruderIds
+        # This is a hack, but other behaviour relys on the updating in this order.
+        self.extrudersChanged.emit(self._application.getGlobalContainerStack().getId())
+
+    @pyqtProperty(int, notify = extrudersChanged)
+    def enabledExtruderCount(self) -> int:
+        global_container_stack = self._application.getGlobalContainerStack()
+        if global_container_stack:
+            return len([extruder for extruder in global_container_stack.extruderList if parseBool(extruder.getMetaDataEntry("enabled", "True"))])
+        return 0
+
     @pyqtProperty(str, notify = activeExtruderChanged)
     def activeExtruderStackId(self) -> Optional[str]:
         """Gets the unique identifier of the currently active extruder stack.

cura/Settings/SimpleModeSettingsManager.py

@@ -42,21 +42,8 @@ class SimpleModeSettingsManager(QObject):
             for extruder_stack in global_stack.extruderList:
                 user_setting_keys.update(extruder_stack.userChanges.getAllKeys())
 
-        # remove settings that are visible in recommended (we don't show the reset button for those)
-        for skip_key in self.__ignored_custom_setting_keys:
-            if skip_key in user_setting_keys:
-                user_setting_keys.remove(skip_key)
-
         has_customized_user_settings = len(user_setting_keys) > 0
 
         if has_customized_user_settings != self._is_profile_customized:
             self._is_profile_customized = has_customized_user_settings
             self.isProfileCustomizedChanged.emit()
-
-    # These are the settings included in the Simple ("Recommended") Mode, so only when the other settings have been
-    # changed, we consider it as a user customized profile in the Simple ("Recommended") Mode.
-    __ignored_custom_setting_keys = ["support_enable",
-                                     "infill_sparse_density",
-                                     "gradual_infill_steps",
-                                     "adhesion_type",
-                                     "support_extruder_nr"]

packaging/AppImage/AppRun

@@ -17,4 +17,9 @@ export OPENSSL_CONF="$scriptdir/openssl.cnf"
 # unset `QT_STYLE_OVERRIDE` as a precaution
 unset QT_STYLE_OVERRIDE
 
-$scriptdir/UltiMaker-Cura "$@"
+BIN=`basename "$ARGV0" .AppImage`
+if [ -f $scriptdir/$BIN ]; then
+    $scriptdir/$BIN "$@"
+else
+    $scriptdir/UltiMaker-Cura "$@"
+fi;

packaging/MacOS/build_macos.py

@@ -0,0 +1,155 @@
+# Copyright (c) 2023 UltiMaker
+# Cura is released under the terms of the LGPLv3 or higher.
+
+
+import os
+import argparse  # Command line arguments parsing and help.
+import subprocess
+from pathlib import Path
+
+ULTIMAKER_CURA_DOMAIN = os.environ.get("ULTIMAKER_CURA_DOMAIN", "nl.ultimaker.cura")
+
+def build_dmg(source_path: str, dist_path: str, filename: str, app_name: str) -> None:
+    create_dmg_executable = os.environ.get("CREATE_DMG_EXECUTABLE", "create-dmg")
+
+    arguments = [create_dmg_executable,
+                 "--window-pos", "640", "360",
+                 "--window-size", "690", "503",
+                 "--app-drop-link", "520", "272",
+                 "--volicon", f"{source_path}/packaging/icons/VolumeIcons_Cura.icns",
+                 "--icon-size", "90",
+                 "--icon", app_name, "169", "272",
+                 "--eula", f"{source_path}/packaging/cura_license.txt",
+                 "--background", f"{source_path}/packaging/MacOs/cura_background_dmg.png",
+                 f"{dist_path}/{filename}",
+                 f"{dist_path}/{app_name}"]
+
+    subprocess.run(arguments)
+
+
+def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_version: str, installer_filename: str) -> None:
+    """ Builds and signs the pkg installer.
+
+    @param dist_path: Path to put output pkg in
+    @param app_filename: name of the .app file to bundle inside the pkg
+    @param component_filename: Name of the pkg component package to bundle the app in
+    @param cura_version: The version is used when automatically replacing existing versions with the installer.
+    @param installer_filename: Name of the installer that contains the component package
+    """
+    pkg_build_executable = os.environ.get("PKG_BUILD_EXECUTABLE", "pkgbuild")
+    product_build_executable = os.environ.get("PRODUCT_BUILD_EXECUTABLE", "productbuild")
+    codesign_identity = os.environ.get("CODESIGN_IDENTITY")
+
+    # This builds the component package that contains UltiMaker-Cura.app. This component package will be bundled in a distribution package.
+    pkg_build_arguments = [
+        pkg_build_executable,
+        "--identifier", f"{ULTIMAKER_CURA_DOMAIN}_{cura_version}", # If we want to replace previous version automatically remove {cure_version}
+        "--component",
+        Path(dist_path, app_filename),
+        Path(dist_path, component_filename),
+        "--install-location", "/Applications",
+    ]
+
+    if codesign_identity:
+        pkg_build_arguments.extend(["--sign", codesign_identity])
+    else:
+        print("CODESIGN_IDENTITY missing. The installer is not being signed")
+
+    subprocess.run(pkg_build_arguments)
+
+    # This automatically generates a distribution.xml file that is used to build the installer.
+    # If you want to make any changes to how the installer functions, this file should be changed to do that.
+    # TODO: Use --product {property_list_file} to pull keys out of file for distribution.xml. This can be used to set min requirements
+    distribution_creation_arguments = [
+        product_build_executable,
+        "--synthesize",
+        "--package", Path(dist_path, component_filename),  # Package that will be inside installer
+        Path(dist_path, "distribution.xml"),  # Output location for sythesized distributions file
+    ]
+    subprocess.run(distribution_creation_arguments)
+
+    # This creates the distributable package (Installer)
+    installer_creation_arguments = [
+        product_build_executable,
+        "--distribution", Path(dist_path, "distribution.xml"),
+        "--package-path", dist_path,  # Where to find the component packages mentioned in distribution.xml (UltiMaker-Cura.pkg)
+        Path(dist_path, installer_filename),
+    ]
+
+    if codesign_identity:
+        installer_creation_arguments.extend(["--sign", codesign_identity])
+
+    subprocess.run(installer_creation_arguments)
+
+
+def notarize_file(dist_path: str, filename: str) -> None:
+    """ Notarize a file. This takes 5+ minutes, there is indication that this step is successful."""
+    notarize_user = os.environ.get("MAC_NOTARIZE_USER")
+    notarize_password = os.environ.get("MAC_NOTARIZE_PASS")
+    altool_executable = os.environ.get("ALTOOL_EXECUTABLE", "altool")
+
+    notarize_arguments = [
+        "xcrun", altool_executable,
+        "--notarize-app",
+        "--primary-bundle-id", ULTIMAKER_CURA_DOMAIN,
+        "--username", notarize_user,
+        "--password", notarize_password,
+        "--file", Path(dist_path, filename)
+    ]
+
+    subprocess.run(notarize_arguments)
+
+
+def create_pkg_installer(filename: str,  dist_path: str, cura_version: str, app_name: str) -> None:
+    """ Creates a pkg installer from {filename}.app called {filename}-Installer.pkg
+
+    The final package structure is UltiMaker-Cura-XXX-Installer.pkg[UltiMaker-Cura.pkg[UltiMaker-Cura.app]]. The outer
+    pkg file is a distributable pkg (Installer). Inside the distributable pkg there is a component pkg. The component
+    pkg contains the .app file that will be installed in the users Applications folder.
+
+    @param filename: The name of the app file and the app component package file without the extension
+    @param dist_path: The location to read the app from and save the pkg to
+    """
+
+    filename_stem = Path(filename).stem
+    cura_component_package_name = f"{filename_stem}-Component.pkg"  # This is a component package that is nested inside the installer, it contains the UltiMaker-Cura.app file This is the app file that will end up in your applications folder
+
+    build_pkg(dist_path, app_name, cura_component_package_name, cura_version, filename)
+
+    notarize = bool(os.environ.get("NOTARIZE_INSTALLER", "FALSE"))
+    if notarize:
+        notarize_file(dist_path, filename)
+
+
+def create_dmg(filename: str, dist_path: str, source_path: str, app_name: str) -> None:
+    """ Creates a dmg executable from UltiMaker-Cura.app named {filename}.dmg
+
+    @param filename: The name of the app file and the output dmg file without the extension
+    @param dist_path: The location to read the app from and save the dmg to
+    @param source_path: The location of the project source files
+    """
+
+    build_dmg(source_path, dist_path, filename, app_name)
+
+    notarize_dmg = bool(os.environ.get("NOTARIZE_DMG", "TRUE"))
+    if notarize_dmg:
+        notarize_file(dist_path, filename)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description = "Create installer for Cura.")
+    parser.add_argument("source_path", type = str, help = "Path to Pyinstaller source folder")
+    parser.add_argument("dist_path", type = str, help = "Path to Pyinstaller dist folder")
+    parser.add_argument("cura_conan_version", type = str, help="The version of cura")
+    parser.add_argument("filename", type = str, help = "Filename of the pkg/dmg (e.g. 'UltiMaker-Cura-5.1.0-beta-Macos-X64.pkg' or 'UltiMaker-Cura-5.1.0-beta-Macos-X64.dmg')")
+    parser.add_argument("app_name", type = str, help = "Filename of the .app that will be contained within the dmg/pkg")
+    args = parser.parse_args()
+
+    cura_version = args.cura_conan_version.split("/")[-1]
+
+    app_name = f"{args.app_name}.app"
+
+    if Path(args.filename).suffix == ".pkg":
+        create_pkg_installer(args.filename, args.dist_path, cura_version, app_name)
+    else:
+        create_dmg(args.filename, args.dist_path, args.source_path, app_name)

packaging/dmg/dmg_sign_noterize.py

@@ -1,71 +0,0 @@
-# Copyright (c) 2022 UltiMaker
-# Cura is released under the terms of the LGPLv3 or higher.
-
-
-import os
-import argparse  # Command line arguments parsing and help.
-import subprocess
-
-ULTIMAKER_CURA_DOMAIN = os.environ.get("ULTIMAKER_CURA_DOMAIN", "nl.ultimaker.cura")
-
-
-def build_dmg(source_path: str, dist_path: str, filename: str) -> None:
-    create_dmg_executable = os.environ.get("CREATE_DMG_EXECUTABLE", "create-dmg")
-
-    arguments = [create_dmg_executable,
-                 "--window-pos", "640", "360",
-                 "--window-size", "690", "503",
-                 "--app-drop-link", "520", "272",
-                 "--volicon", f"{source_path}/packaging/icons/VolumeIcons_Cura.icns",
-                 "--icon-size", "90",
-                 "--icon", "UltiMaker-Cura.app", "169", "272",
-                 "--eula", f"{source_path}/packaging/cura_license.txt",
-                 "--background", f"{source_path}/packaging/dmg/cura_background_dmg.png",
-                 f"{dist_path}/{filename}",
-                 f"{dist_path}/UltiMaker-Cura.app"]
-
-    subprocess.run(arguments)
-
-
-def sign(dist_path: str, filename: str) -> None:
-    codesign_executable = os.environ.get("CODESIGN", "codesign")
-    codesign_identity = os.environ.get("CODESIGN_IDENTITY")
-
-    arguments = [codesign_executable,
-                 "-s", codesign_identity,
-                 "--timestamp",
-                 "-i", f"{ULTIMAKER_CURA_DOMAIN}.dmg",  # TODO: check if this really should have the extra dmg. We seem to be doing this also in the old Rundeck scripts
-                 f"{dist_path}/{filename}"]
-
-    subprocess.run(arguments)
-
-
-def notarize(dist_path: str, filename: str) -> None:
-    notarize_user = os.environ.get("MAC_NOTARIZE_USER")
-    notarize_password = os.environ.get("MAC_NOTARIZE_PASS")
-    altool_executable = os.environ.get("ALTOOL_EXECUTABLE", "altool")
-
-    arguments = [
-        "xcrun", altool_executable,
-        "--notarize-app",
-        "--primary-bundle-id", ULTIMAKER_CURA_DOMAIN,
-        "--username", notarize_user,
-        "--password", notarize_password,
-        "--file", f"{dist_path}/{filename}"
-    ]
-
-    subprocess.run(arguments)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description = "Create dmg of Cura.")
-    parser.add_argument("source_path", type=str, help="Path to Conan install Cura folder.")
-    parser.add_argument("dist_path", type=str, help="Path to Pyinstaller dist folder")
-    parser.add_argument("filename", type = str, help = "Filename of the dmg (e.g. 'UltiMaker-Cura-5.1.0-beta-Linux-X64.dmg')")
-    args = parser.parse_args()
-    build_dmg(args.source_path, args.dist_path, args.filename)
-    sign(args.dist_path, args.filename)
-
-    notarize_dmg = bool(os.environ.get("NOTARIZE_DMG", "TRUE"))
-    if notarize_dmg:
-        notarize(args.dist_path, args.filename)

packaging/msi/ExcludeComponents.xslt

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:wix="http://schemas.microsoft.com/wix/2006/wi"
+        xmlns="http://schemas.microsoft.com/wix/2006/wi"
+        version="1.0"
+        exclude-result-prefixes="xsl wix" >
+
+    <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
+    <xsl:strip-space elements="*"/>
+
+    <!--
+    Find all <Component> elements with <File> elements with Source="" attributes ending in ".exe" and tag it with the "ExeToRemove" key.
+
+    <Component Id="cmpSYYKP6B1M7WSD5KLEQ7PZW4YLOPYG61L" Directory="INSTALLDIR" Guid="*">
+        <File Id="filKUS7ZRMJ0AOKDU6ATYY6IRUSR2ECPDFO" KeyPath="yes" Source="!(wix.StagingAreaPath)\ProofOfPEqualsNP.exe" />
+    </Component>
+
+    Because WiX's Heat.exe only supports XSLT 1.0 and not XSLT 2.0 we cannot use `ends-with( haystack, needle )` (e.g. `ends-with( wix:File/@Source, '.exe' )`...
+    ...but we can use this longer `substring` expression instead (see https://github.com/wixtoolset/issues/issues/5609 )
+    -->
+    <xsl:key
+            name="ExeToRemove"
+            match="wix:Component[ substring( wix:File/@Source, string-length( wix:File/@Source ) - 3 ) = '.exe' ]"
+            use="@Id"
+    /> <!-- Get the last 4 characters of a string using `substring( s, len(s) - 3 )`, it uses -3 and not -4 because XSLT uses 1-based indexes, not 0-based indexes. -->
+
+    <!-- By default, copy all elements and nodes into the output... -->
+    <xsl:template match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <!-- ...but if the element has the "ExeToRemove" key then don't render anything (i.e. removing it from the output) -->
+    <xsl:template match="*[ self::wix:Component or self::wix:ComponentRef ][ key( 'ExeToRemove', @Id ) ]"/>
+</xsl:stylesheet>

packaging/msi/UltiMaker-Cura.wxs.jinja

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension">
+    <Product
+        Id="*"
+        Name="{{ app_name }}"
+        Language="1033"
+        Version="{{ version_major }}.{{ version_minor }}.{{ version_patch }}"
+        Manufacturer="{{ company }}"
+        UpgradeCode="{{ upgrade_code }}"
+    >
+        <Package
+            Id="*"
+            InstallerVersion="500"
+            Compressed="yes"
+            InstallScope="perMachine"
+            Manufacturer="{{ company }}"
+            Description="UltiMaker Cura the most popular 3D printing slicer"
+            Keywords="UltiMaker,Cura,3D,printing,slicer"
+            Comments="Copyright (c) {{ year }} {{ company }}" />
+
+        <InstallExecuteSequence>
+            <RemoveExistingProducts After="InstallFinalize">
+            <![CDATA[&UninstallOlderVersionFeature=3]]>
+            </RemoveExistingProducts>
+        </InstallExecuteSequence>
+
+        <Property Id="PREVIOUS_VERSIONS_INSTALLED" Secure="yes" />
+        <Upgrade Id="{{ upgrade_code }}">
+            <UpgradeVersion
+                Minimum="4.13.2" Maximum="{{ version_major }}.{{ version_minor }}.{{ version_patch }}"
+                Property="PREVIOUS_VERSIONS_INSTALLED"
+                IncludeMinimum="no" IncludeMaximum="yes"
+            />
+        </Upgrade>
+
+        {% if "Enterprise" in app_name %}
+        <Property Id="PREVIOUS_413_INSTALLED" Secure="yes" />
+        <Upgrade Id="53C603BB-2B17-4206-A609-29C2E0D0B0AE">
+            <UpgradeVersion
+                Minimum="1.0.0" Maximum="4.13.2"
+                Property="PREVIOUS_VERSIONS_INSTALLED"
+                IncludeMinimum="yes" IncludeMaximum="yes"
+            />
+        </Upgrade>
+        {% endif %}
+
+        <Condition Message= "OS must be Windows 8.1 64bit or higher.">
+            <![CDATA[Installed OR VersionNT64 >= 600]]>
+        </Condition>
+
+        <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
+
+        <UIRef Id="WixUI_Mondo" />
+
+        <WixVariable Id="WixUILicenseRtf" Value="{{ cura_license_file }}" />
+        <WixVariable Id="WixUIDialogBmp" Value="{{ cura_banner_side }}" />
+        <WixVariable Id="WixUIBannerBmp" Value="{{ cura_banner_top }}" />
+
+        <Icon Id="ICO_Cura" SourceFile="{{ cura_icon }}" />
+        <Property Id="ARPPRODUCTICON" Value="ICO_Cura" />
+
+        <!--Directory structure-->
+        <Directory Id="TARGETDIR" Name="SourceDir">
+           <Directory Id="ProgramFiles64Folder">
+               <Directory Id="APPLICATIONFOLDER" Name="{{ app_name }} {{ version }}" />
+               <Directory Id="ProgramMenuFolder">
+                   <Directory Id="ShortCutDir" Name="{{ app_name }}" />
+               </Directory>
+           </Directory>
+        </Directory>
+
+        <Property Id="ApplicationFolderName" Value="{{ app_name }} {{ version }}" />
+        <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+
+        <Component Id="CMP_UltiMaker_Cura_exe" Directory="APPLICATIONFOLDER" Guid="*">
+            <File Id="FILE_UltiMaker_Cura_exe" KeyPath="yes" Source="$(var.CuraDir)\{{ main_app }}" />
+
+            <ProgId Id="Cura" Description="{{ app_name }}" Icon="ICO_Cura" Advertise="yes">
+                <ProgId Id="3mf" Advertise="yes">
+                    <Extension Id="3mf" ContentType="application/3mf">
+                        <Verb Id="open_3mf" Command="Open" Argument='"%1"' />
+                        <MIME Advertise="yes" ContentType="application/3mf" Default="yes" />
+                    </Extension>
+                </ProgId>
+                <ProgId Id="stl" Advertise="yes">
+                    <Extension Id="stl" ContentType="application/stl">
+                        <Verb Id="open_stl" Command="Open" Argument='"%1"' />
+                        <MIME Advertise="yes" ContentType="application/stl" Default="yes" />
+                    </Extension>
+                </ProgId>
+                <ProgId Id="gcode" Advertise="yes">
+                    <Extension Id="gcode" ContentType="text/x-gcode">
+                        <Verb Id="open_gcode" Command="Open" Argument='"%1"' />
+                        <MIME Advertise="yes" ContentType="text/x-gcode" Default="yes" />
+                    </Extension>
+                </ProgId>
+                <ProgId Id="ufp" Advertise="yes">
+                    <Extension Id="ufp" ContentType="application/x-ufp">
+                        <Verb Id="open_ufp" Command="Open" Argument='"%1"' />
+                        <MIME Advertise="yes" ContentType="application/x-ufp" Default="yes" />
+                    </Extension>
+                </ProgId>
+                <ProgId Id="curapackage" Advertise="yes">
+                    <Extension Id='curapackage' ContentType='application/curapackage'>
+                        <Verb Id='open_curapackage' Command="Open" Argument='"%1"' />
+                        <MIME Advertise="yes" ContentType="application/curapackage" Default="yes" />
+                    </Extension>
+                </ProgId>
+            </ProgId>
+
+            <fw:FirewallException Id="FirewallExceptLocalFrontend" Name="Cura (Frontend) Connection (LocalHost)" File="FILE_UltiMaker_Cura_exe" IgnoreFailure="yes">
+                <fw:RemoteAddress>127.0.0.1</fw:RemoteAddress>
+            </fw:FirewallException>
+        </Component>
+        <Component Id="CMP_CuraEngine_exe" Directory="APPLICATIONFOLDER" Guid="*">
+            <File Id="FILE_CuraEngine_exe" KeyPath="yes" Source="$(var.CuraDir)\CuraEngine.exe" />
+
+            <fw:FirewallException Id="FirewallExceptLocalEngine" Name="CuraEngine (Backend) Connection (LocalHost)" File="FILE_CuraEngine_exe" IgnoreFailure="yes">
+                <fw:RemoteAddress>127.0.0.1</fw:RemoteAddress>
+            </fw:FirewallException>
+        </Component>
+
+        <!--Shortcuts-->
+        <DirectoryRef Id="ShortCutDir">
+            <Component Id="CMP_Shortcuts" Guid="*">
+                <Shortcut Id="SHRT_Cura"
+                          Name="{{ app_name }} {{ version }}"
+                          Description="{{ app_name }} {{ version }}"
+                          Target="[APPLICATIONFOLDER]\{{ main_app }}"
+                          Icon="ICO_Cura"  />
+                <Shortcut Id="SHRT_UninstallShortcut"
+                          Name="Uninstall {{ app_name }} {{ version }}"
+                          Description= "Uninstalls {{ app_name }} {{ version }}"
+                          Target="[System64Folder]msiexec.exe"
+                          Arguments="/x [ProductCode]" />
+                <RemoveFolder Id="RemoveMyShortcutsDir"
+                              On="uninstall" />
+                <RegistryValue Root="HKCU"
+                               Key="Software\{{ company }}\{{ app_name }}\{{ version }}"
+                               Name="installed"
+                               Type="integer"
+                               Value="1"
+                               KeyPath="yes" />
+            </Component>
+        </DirectoryRef>
+
+        <Feature Id="ProductFeature" Title="{{ app_name }}" Level="1" ConfigurableDirectory="APPLICATIONFOLDER">
+            <ComponentRef Id="CMP_UltiMaker_Cura_exe" />
+            <ComponentRef Id="CMP_CuraEngine_exe" />
+            <ComponentGroupRef Id="NewFilesGroup" />
+            <ComponentRef Id="CMP_Shortcuts" />
+        </Feature>
+        <Feature Id="UninstallOlderVersionFeature" Title="Uninstall previous versions" Level="{{ 1 if "Enterprise" in app_name else 0 }}" Description="..."/>
+    </Product>
+</Wix>

packaging/msi/create_windows_msi.py

@@ -0,0 +1,122 @@
+# Copyright (c) 2022 UltiMaker
+# Cura is released under the terms of the LGPLv3 or higher.
+
+
+import argparse  # Command line arguments parsing and help.
+import os
+import shutil
+import subprocess
+import uuid
+from datetime import datetime
+from pathlib import Path
+
+from jinja2 import Template
+
+
+def work_path(filename: Path) -> Path:
+    if not filename.is_absolute():
+        return Path(os.getcwd(), filename.parent)
+    else:
+        return filename.parent
+
+
+def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: str):
+    source_loc = Path(os.getcwd(), source_path)
+    dist_loc = Path(os.getcwd(), dist_path)
+    work_loc = work_path(filename)
+    work_loc.mkdir(parents=True, exist_ok=True)
+
+    jinja_template_path = Path(source_loc.joinpath("packaging", "msi", "UltiMaker-Cura.wxs.jinja"))
+    with open(jinja_template_path, "r") as f:
+        template = Template(f.read())
+
+    wxs_content = template.render(
+        app_name=f"{app_name}",
+        main_app="UltiMaker-Cura.exe",
+        version=os.getenv('CURA_VERSION_FULL'),
+        version_major=os.environ.get("CURA_VERSION_MAJOR"),
+        version_minor=os.environ.get("CURA_VERSION_MINOR"),
+        version_patch=os.environ.get("CURA_VERSION_PATCH"),
+        company="UltiMaker",
+        web_site="https://ultimaker.com",
+        year=datetime.now().year,
+        upgrade_code=str(uuid.uuid5(uuid.NAMESPACE_DNS, app_name)),
+        cura_license_file=str(source_loc.joinpath("packaging", "msi", "cura_license.rtf")),
+        cura_banner_top=str(source_loc.joinpath("packaging", "msi", "banner_top.bmp")),
+        cura_banner_side=str(source_loc.joinpath("packaging", "msi", "banner_side.bmp")),
+        cura_icon=str(source_loc.joinpath("packaging", "icons", "Cura.ico")),
+    )
+
+    with open(work_loc.joinpath("UltiMaker-Cura.wxs"), "w") as f:
+        f.write(wxs_content)
+
+    try:
+        shutil.copy(source_loc.joinpath("packaging", "msi", "ExcludeComponents.xslt"),
+                    work_loc.joinpath("ExcludeComponents.xslt"))
+    except shutil.SameFileError:
+        pass
+
+
+def cleanup_artifacts(dist_path: Path):
+    dist_loc = Path(os.getcwd(), dist_path)
+    dirt = [d for d in dist_loc.rglob("__pycache__") if d.is_dir()]
+    dirt += [d for d in dist_loc.rglob("*.dist-info") if d.is_dir()]
+    for d in dirt:
+        if d.exists():
+            shutil.rmtree(d, ignore_errors=True)
+
+
+def build(dist_path: Path, filename: Path):
+    dist_loc = Path(os.getcwd(), dist_path)
+    work_loc = work_path(filename)
+    wxs_loc = work_loc.joinpath("UltiMaker-Cura.wxs")
+    heat_loc = work_loc.joinpath("HeatFile.wxs")
+    exclude_components_loc = work_loc.joinpath("ExcludeComponents.xslt")
+    build_loc = work_loc.joinpath("build_msi")
+
+    heat_command = ["heat",
+                    "dir", f"{dist_loc.as_posix()}\\",
+                    "-dr", "APPLICATIONFOLDER",
+                    "-cg", "NewFilesGroup",
+                    "-sw5150",  # Don't pollute logs with warnings from auto generated content
+                    "-gg",
+                    "-g1",
+                    "-sf",
+                    "-srd",
+                    "-var", "var.CuraDir",
+                    "-t", f"{exclude_components_loc.as_posix()}",
+                    "-out", f"{heat_loc.as_posix()}"]
+    subprocess.call(heat_command)
+
+    build_command = ["candle",
+                     "-arch", "x64",
+                     f"-dCuraDir={dist_loc}\\",
+                     "-ext", "WixFirewallExtension",
+                     "-out", f"{build_loc.as_posix()}\\",
+                     f"{wxs_loc.as_posix()}",
+                     f"{heat_loc.as_posix()}"]
+    subprocess.call(build_command)
+
+    link_command = ["light",
+                    f"{build_loc.joinpath(wxs_loc.name).with_suffix('.wixobj')}",
+                    f"{build_loc.joinpath(heat_loc.name).with_suffix('.wixobj')}",
+                    "-sw1076",  # Don't pollute logs with warnings from auto generated content
+                    "-dcl:high",  # Use high compression ratio
+                    "-sval",  # Disable ICE validation otherwise the CI complains
+                    "-ext", "WixUIExtension",
+                    "-ext", "WixFirewallExtension",
+                    "-out", f"{work_loc.joinpath(filename.name)}"]
+    subprocess.call(link_command)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Create Windows msi installer of Cura.")
+    parser.add_argument("source_path", type=Path, help="Path to Conan install Cura folder.")
+    parser.add_argument("dist_path", type=Path, help="Path to Pyinstaller dist folder")
+    parser.add_argument("filename", type=Path,
+                        help="Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.msi')")
+    parser.add_argument("name", type=str, help="App name (e.g. 'UltiMaker Cura')")
+    args = parser.parse_args()
+    generate_wxs(args.source_path.resolve(), args.dist_path.resolve(), args.filename.resolve(), args.name)
+    cleanup_artifacts(args.dist_path.resolve())
+    build(args.dist_path.resolve(), args.filename)

packaging/msi/cura_license.rtf

@@ -0,0 +1,183 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fmodern\fprq1\fcharset0 Courier New;}}
+{\colortbl ;\red0\green0\blue255;}
+{\stylesheet{ Normal;}{\s1 heading 1;}{\s2 heading 2;}{\s3 heading 3;}{\s4 heading 4;}}
+{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\s3\sb100\sa100\qc\b\f0\fs27 GNU LESSER GENERAL PUBLIC LICENSE\par
+\pard\sb100\sa100\qc\b0\fs24 Version 3, 29 June 2007\par
+\pard Copyright \'a9 2007 Free Software Foundation, Inc. <{\field{\*\fldinst{HYPERLINK "http://fsf.org/"}}{\fldrslt{\ul\cf1 http://fsf.org/}}}\f0\fs24 >\par
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par
+This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.\par
+\pard\s4\sb100\sa100\b 0. Additional Definitions.\par
+\pard\sb100\sa100\b0 As used herein, \ldblquote this License\rdblquote  refers to version 3 of the GNU Lesser General Public License, and the \ldblquote GNU GPL\rdblquote  refers to version 3 of the GNU General Public License.\par
+\ldblquote The Library\rdblquote  refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.\par
+An \ldblquote Application\rdblquote  is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.\par
+A \ldblquote Combined Work\rdblquote  is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the \ldblquote Linked Version\rdblquote .\par
+The \ldblquote Minimal Corresponding Source\rdblquote  for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.\par
+The \ldblquote Corresponding Application Code\rdblquote  for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.\par
+\pard\s4\sb100\sa100\b 1. Exception to Section 3 of the GNU GPL.\par
+\pard\sb100\sa100\b0 You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.\par
+\pard\s4\sb100\sa100\b 2. Conveying Modified Versions.\par
+\pard\sb100\sa100\b0 If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:\par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or\par
+\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.\par
+\pard\s4\sb100\sa100\b 3. Object Code Incorporating Material from Library Header Files.\par
+\pard\sb100\sa100\b0 The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:\par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.\par
+\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Accompany the object code with a copy of the GNU GPL and this license document.\par
+\pard\s4\sb100\sa100\b 4. Combined Works.\par
+\pard\sb100\sa100\b0 You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:\par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.\par
+\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Accompany the Combined Work with a copy of the GNU GPL and this license document.\par
+\f1\fs20\'b7\tab\f0\fs24 c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.\par
+\f1\fs20\'b7\tab\f0\fs24 d) Do one of the following: \par
+\pard\fi-360\li1440\sb100\sa100\tx1440\f2\fs20 o\tab\f0\fs24 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.\par
+\pard\fi-360\li1440\sb100\sa100\f2\fs20 o\tab\f0\fs24 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.\par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)\par
+\pard\s4\sb100\sa100\b 5. Combined Libraries.\par
+\pard\sb100\sa100\b0 You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:\par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.\par
+\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.\par
+\pard\s4\sb100\sa100\b 6. Revised Versions of the GNU Lesser General Public License.\par
+\pard\sb100\sa100\b0 The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par
+Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License \ldblquote or any later version\rdblquote  applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.\par
+If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.\par
+\par
+\pard\s3\sb100\sa100\qc\b\fs27 GNU GENERAL PUBLIC LICENSE\par
+\pard\sb100\sa100\qc\b0\fs24 Version 3, 29 June 2007\par
+\pard Copyright \'a9 2007 Free Software Foundation, Inc. <{\field{\*\fldinst{HYPERLINK "http://fsf.org/"}}{\fldrslt{\ul\cf1 http://fsf.org/}}}\f0\fs24 >\par
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par
+\pard\s3\sb100\sa100\b\fs27 Preamble\par
+\pard\sb100\sa100\b0\fs24 The GNU General Public License is a free, copyleft license for software and other kinds of works.\par
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.\par
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.\par
+To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.\par
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\par
+Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.\par
+For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.\par
+Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.\par
+Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.\par
+The precise terms and conditions for copying, distribution and modification follow.\par
+\pard\s3\sb100\sa100\b\fs27 TERMS AND CONDITIONS\par
+\pard\s4\sb100\sa100\fs24 0. Definitions.\par
+\pard\sb100\sa100\b0\ldblquote This License\rdblquote  refers to version 3 of the GNU General Public License.\par
+\ldblquote Copyright\rdblquote  also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.\par
+\ldblquote The Program\rdblquote  refers to any copyrightable work licensed under this License. Each licensee is addressed as \ldblquote you\rdblquote . \ldblquote Licensees\rdblquote  and \ldblquote recipients\rdblquote  may be individuals or organizations.\par
+To \ldblquote modify\rdblquote  a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a \ldblquote modified version\rdblquote  of the earlier work or a work \ldblquote based on\rdblquote  the earlier work.\par
+A \ldblquote covered work\rdblquote  means either the unmodified Program or a work based on the Program.\par
+To \ldblquote propagate\rdblquote  a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.\par
+To \ldblquote convey\rdblquote  a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.\par
+An interactive user interface displays \ldblquote Appropriate Legal Notices\rdblquote  to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.\par
+\pard\s4\sb100\sa100\b 1. Source Code.\par
+\pard\sb100\sa100\b0 The \ldblquote source code\rdblquote  for a work means the preferred form of the work for making modifications to it. \ldblquote Object code\rdblquote  means any non-source form of a work.\par
+A \ldblquote Standard Interface\rdblquote  means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.\par
+The \ldblquote System Libraries\rdblquote  of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A \ldblquote Major Component\rdblquote , in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.\par
+The \ldblquote Corresponding Source\rdblquote  for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.\par
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.\par
+The Corresponding Source for a work in source code form is that same work.\par
+\pard\s4\sb100\sa100\b 2. Basic Permissions.\par
+\pard\sb100\sa100\b0 All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.\par
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.\par
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.\par
+\pard\s4\sb100\sa100\b 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\par
+\pard\sb100\sa100\b0 No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.\par
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.\par
+\pard\s4\sb100\sa100\b 4. Conveying Verbatim Copies.\par
+\pard\sb100\sa100\b0 You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.\par
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.\par
+\pard\s4\sb100\sa100\b 5. Conveying Modified Source Versions.\par
+\pard\sb100\sa100\b0 You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:\par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) The work must carry prominent notices stating that you modified it, and giving a relevant date.\par
+\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to \ldblquote keep intact all notices\rdblquote .\par
+\f1\fs20\'b7\tab\f0\fs24 c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.\par
+\f1\fs20\'b7\tab\f0\fs24 d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.\par
+\pard\sb100\sa100 A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an \ldblquote aggregate\rdblquote  if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.\par
+\pard\s4\sb100\sa100\b 6. Conveying Non-Source Forms.\par
+\pard\sb100\sa100\b0 You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:\par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.\par
+\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.\par
+\f1\fs20\'b7\tab\f0\fs24 c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.\par
+\f1\fs20\'b7\tab\f0\fs24 d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.\par
+\f1\fs20\'b7\tab\f0\fs24 e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.\par
+\pard\sb100\sa100 A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.\par
+A \ldblquote User Product\rdblquote  is either (1) a \ldblquote consumer product\rdblquote , which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, \ldblquote normally used\rdblquote  refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.\par
+\ldblquote Installation Information\rdblquote  for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.\par
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).\par
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.\par
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.\par
+\pard\s4\sb100\sa100\b 7. Additional Terms.\par
+\pard\sb100\sa100\b0\ldblquote Additional permissions\rdblquote  are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.\par
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.\par
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:\par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or\par
+\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or\par
+\f1\fs20\'b7\tab\f0\fs24 c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or\par
+\f1\fs20\'b7\tab\f0\fs24 d) Limiting the use for publicity purposes of names of licensors or authors of the material; or\par
+\f1\fs20\'b7\tab\f0\fs24 e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or\par
+\f1\fs20\'b7\tab\f0\fs24 f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.\par
+\pard\sb100\sa100 All other non-permissive additional terms are considered \ldblquote further restrictions\rdblquote  within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.\par
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.\par
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.\par
+\pard\s4\sb100\sa100\b 8. Termination.\par
+\pard\sb100\sa100\b0 You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).\par
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.\par
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.\par
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.\par
+\pard\s4\sb100\sa100\b 9. Acceptance Not Required for Having Copies.\par
+\pard\sb100\sa100\b0 You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.\par
+\pard\s4\sb100\sa100\b 10. Automatic Licensing of Downstream Recipients.\par
+\pard\sb100\sa100\b0 Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.\par
+An \ldblquote entity transaction\rdblquote  is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.\par
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.\par
+\pard\s4\sb100\sa100\b 11. Patents.\par
+\pard\sb100\sa100\b0 A \ldblquote contributor\rdblquote  is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's \ldblquote contributor version\rdblquote .\par
+A contributor's \ldblquote essential patent claims\rdblquote  are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, \ldblquote control\rdblquote  includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.\par
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.\par
+In the following three paragraphs, a \ldblquote patent license\rdblquote  is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To \ldblquote grant\rdblquote  such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.\par
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. \ldblquote Knowingly relying\rdblquote  means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.\par
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.\par
+A patent license is \ldblquote discriminatory\rdblquote  if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.\par
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.\par
+\pard\s4\sb100\sa100\b 12. No Surrender of Others' Freedom.\par
+\pard\sb100\sa100\b0 If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.\par
+\pard\s4\sb100\sa100\b 13. Use with the GNU Affero General Public License.\par
+\pard\sb100\sa100\b0 Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.\par
+\pard\s4\sb100\sa100\b 14. Revised Versions of this License.\par
+\pard\sb100\sa100\b0 The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License \ldblquote or any later version\rdblquote  applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.\par
+If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.\par
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.\par
+\pard\s4\sb100\sa100\b 15. Disclaimer of Warranty.\par
+\pard\sb100\sa100\b0 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \ldblquote AS IS\rdblquote  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par
+\pard\s4\sb100\sa100\b 16. Limitation of Liability.\par
+\pard\sb100\sa100\b0 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par
+\pard\s4\sb100\sa100\b 17. Interpretation of Sections 15 and 16.\par
+\pard\sb100\sa100\b0 If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.\par
+END OF TERMS AND CONDITIONS\par
+\pard\s3\sb100\sa100\b\fs27 How to Apply These Terms to Your New Programs\par
+\pard\sb100\sa100\b0\fs24 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the \ldblquote copyright\rdblquote  line and a pointer to where the full notice is found.\par
+\pard\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f2\fs20     <one line to give the program's name and a brief idea of what it does.>\par
+    Copyright (C) <year>  <name of author>\par
+\par
+    This program is free software: you can redistribute it and/or modify\par
+    it under the terms of the GNU General Public License as published by\par
+    the Free Software Foundation, either version 3 of the License, or\par
+    (at your option) any later version.\par
+\par
+    This program is distributed in the hope that it will be useful,\par
+    but WITHOUT ANY WARRANTY; without even the implied warranty of\par
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\par
+    GNU General Public License for more details.\par
+\par
+    You should have received a copy of the GNU General Public License\par
+    along with this program.  If not, see <{\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt{\ul\cf1 http://www.gnu.org/licenses/}}}\f2\fs20 >.\par
+\pard\sb100\sa100\f0\fs24 Also add information on how to contact you by electronic and paper mail.\par
+If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:\par
+\pard\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f2\fs20     <program>  Copyright (C) <year>  <name of author>\par
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\par
+    This is free software, and you are welcome to redistribute it\par
+    under certain conditions; type `show c' for details.\par
+\pard\sb100\sa100\f0\fs24 The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an \ldblquote about box\rdblquote .\par
+\pard You should also get your employer (if you work as a programmer) or school, if any, to sign a \ldblquote copyright disclaimer\rdblquote  for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <{\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt{\ul\cf1 http://www.gnu.org/licenses/}}}\f0\fs24 >.\par
+The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <{\field{\*\fldinst{HYPERLINK "http://www.gnu.org/philosophy/why-not-lgpl.html"}}{\fldrslt{\ul\cf1 http://www.gnu.org/philosophy/why-not-lgpl.html}}}\f0\fs24 >.\par
+\pard\sb100\sa100\par
+}

plugins/Marketplace/resources/qml/PackageCardHeader.qml

@@ -45,8 +45,6 @@ Item
             visible: parent.packageHasIcon
             anchors.fill: parent
             source: packageData.iconUrl
-            sourceSize.height: height
-            sourceSize.width: width
         }
 
         UM.ColorImage

plugins/PostProcessingPlugin/scripts/FilamentChange.py

@@ -24,20 +24,29 @@ class FilamentChange(Script):
             "version": 2,
             "settings":
             {
+                "enabled":
+                {
+                    "label": "Enable",
+                    "description": "Uncheck to temporarily disable this feature.",
+                    "type": "bool",
+                    "default_value": true
+                },
                 "layer_number":
                 {
                     "label": "Layer",
                     "description": "At what layer should color change occur. This will be before the layer starts printing. Specify multiple color changes with a comma.",
                     "unit": "",
                     "type": "str",
-                    "default_value": "1"
+                    "default_value": "1",
+                    "enabled": "enabled"
                 },
                 "firmware_config":
                 {
                     "label": "Use Firmware Configuration",
                     "description": "Use the settings in your firmware, or customise the parameters of the filament change here.",
                     "type": "bool",
-                    "default_value": false
+                    "default_value": false,
+                    "enabled": "enabled"
                 },
                 "initial_retract":
                 {
@@ -46,7 +55,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 30.0,
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },
                 "later_retract":
                 {
@@ -55,7 +64,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 300.0,
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },
                 "x_position":
                 {
@@ -64,7 +73,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0,
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },
                 "y_position":
                 {
@@ -73,7 +82,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0,
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },
                 "z_position":
                 {
@@ -82,7 +91,8 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0,
-                    "minimum_value": 0
+                    "minimum_value": 0,
+                    "enabled": "enabled"
                 },
                 "retract_method":
                 {
@@ -92,7 +102,7 @@ class FilamentChange(Script):
                     "options": {"U": "Marlin (M600 U)", "L": "Reprap (M600 L)"},
                     "default_value": "U",
                     "value": "\\\"L\\\" if machine_gcode_flavor==\\\"RepRap (RepRap)\\\" else \\\"U\\\"",
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },                    
                 "machine_gcode_flavor":
                 {
@@ -113,6 +123,40 @@ class FilamentChange(Script):
                     },
                     "default_value": "RepRap (Marlin/Sprinter)",
                     "enabled": "false"
+                },
+                "enable_before_macro":
+                {
+                    "label": "Enable G-code Before",
+                    "description": "Use this to insert a custom G-code macro before the filament change happens",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "enabled"
+                },
+                "before_macro":
+                {
+                    "label": "G-code Before",
+                    "description": "Any custom G-code to run before the filament change happens, for example, M300 S1000 P10000 for a long beep.",
+                    "unit": "",
+                    "type": "str",
+                    "default_value": "M300 S1000 P10000",
+                    "enabled": "enabled and enable_before_macro"
+                },
+                "enable_after_macro":
+                {
+                    "label": "Enable G-code After",
+                    "description": "Use this to insert a custom G-code macro after the filament change",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "enabled"
+                },
+                "after_macro":
+                {
+                    "label": "G-code After",
+                    "description": "Any custom G-code to run after the filament has been changed right before continuing the print, for example, you can add a sequence to purge filament and wipe the nozzle.",
+                    "unit": "",
+                    "type": "str",
+                    "default_value": "M300 S440 P500",
+                    "enabled": "enabled and enable_after_macro"
                 }
             }
         }"""
@@ -134,6 +178,7 @@ class FilamentChange(Script):
         :param data: A list of layers of g-code.
         :return: A similar list, with filament change commands inserted.
         """
+        enabled = self.getSettingValueByKey("enabled")
         layer_nums = self.getSettingValueByKey("layer_number")
         initial_retract = self.getSettingValueByKey("initial_retract")
         later_retract = self.getSettingValueByKey("later_retract")
@@ -141,8 +186,20 @@ class FilamentChange(Script):
         y_pos = self.getSettingValueByKey("y_position")
         z_pos = self.getSettingValueByKey("z_position")
         firmware_config = self.getSettingValueByKey("firmware_config")
+        enable_before_macro = self.getSettingValueByKey("enable_before_macro")
+        before_macro = self.getSettingValueByKey("before_macro")
+        enable_after_macro = self.getSettingValueByKey("enable_after_macro")
+        after_macro = self.getSettingValueByKey("after_macro")
 
-        color_change = "M600"
+        if not enabled:
+            return data
+
+        color_change = ";BEGIN FilamentChange plugin\n"
+
+        if enable_before_macro:
+            color_change = color_change + before_macro + "\n"
+
+        color_change = color_change + "M600\n"
 
         if not firmware_config:
             if initial_retract is not None and initial_retract > 0.:
@@ -163,7 +220,10 @@ class FilamentChange(Script):
             if z_pos is not None and z_pos > 0.:
                 color_change = color_change + (" Z%.2f" % z_pos)
 
-        color_change = color_change + " ; Generated by FilamentChange plugin\n"
+        if enable_after_macro:
+            color_change = color_change + after_macro + "\n"
+
+        color_change = color_change + ";END FilamentChange plugin\n"
 
         layer_targets = layer_nums.split(",")
         if len(layer_targets) > 0:

plugins/UFPWriter/UFPWriter.py

@@ -229,22 +229,24 @@ class UFPWriter(MeshWriter):
             "quality": asdict(machine_manager.activeQualityDisplayNameMap()),
         }
 
+        def _retrieveValue(container: InstanceContainer, setting_: str):
+            value_ = container.getProperty(setting_, "value")
+            for _ in range(0, 1024):  # Prevent possibly endless loop by not using a limit.
+                if not isinstance(value_, SettingFunction):
+                    return value_  # Success!
+                value_ = value_(container)
+            return 0  # Fallback value after breaking possibly endless loop.
+
         global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack())
 
         # Add global user or quality changes
         global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges)
         for setting in global_flattened_changes.getAllKeys():
-            value = global_flattened_changes.getProperty(setting, "value")
-            if isinstance(value, SettingFunction):
-                value = value(global_flattened_changes)
-            settings["global"]["changes"][setting] = value
+            settings["global"]["changes"][setting] = _retrieveValue(global_flattened_changes, setting)
 
         # Get global all settings values without user or quality changes
         for setting in global_stack.getAllKeys():
-            value = global_stack.getProperty(setting, "value")
-            if isinstance(value, SettingFunction):
-                value = value(global_stack)
-            settings["global"]["all_settings"][setting] = value
+            settings["global"]["all_settings"][setting] = _retrieveValue(global_stack, setting)
 
         for i, extruder in enumerate(global_stack.extruderList):
             # Add extruder fields to settings dictionary
@@ -256,16 +258,10 @@ class UFPWriter(MeshWriter):
             # Add extruder user or quality changes
             extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges)
             for setting in extruder_flattened_changes.getAllKeys():
-                value = extruder_flattened_changes.getProperty(setting, "value")
-                if isinstance(value, SettingFunction):
-                    value = value(extruder_flattened_changes)
-                settings[f"extruder_{i}"]["changes"][setting] = value
+                settings[f"extruder_{i}"]["changes"][setting] = _retrieveValue(extruder_flattened_changes, setting)
 
             # Get extruder all settings values without user or quality changes
             for setting in extruder.getAllKeys():
-                value = extruder.getProperty(setting, "value")
-                if isinstance(value, SettingFunction):
-                    value = value(extruder)
-                settings[f"extruder_{i}"]["all_settings"][setting] = value
+                settings[f"extruder_{i}"]["all_settings"][setting] = _retrieveValue(extruder, setting)
 
         return settings

plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml

@@ -1,71 +0,0 @@
-// Copyright (c) 2019 Ultimaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.2
-import QtQuick.Controls 2.0
-import UM 1.5 as UM
-
-/**
- * This component comprises a buildplate icon and the buildplate name. It is
- * used by the MonitorPrinterConfiguration component along with two instances
- * of MonitorExtruderConfiguration.
- *
- * NOTE: For most labels, a fixed height with vertical alignment is used to make
- * layouts more deterministic (like the fixed-size textboxes used in original
- * mock-ups). This is also a stand-in for CSS's 'line-height' property. Denoted
- * with '// FIXED-LINE-HEIGHT:'.
- */
-Item
-{
-    // The buildplate name
-    property var buildplate: null
-
-    // Height is one 18px label/icon
-    height: 18 * screenScaleFactor // TODO: Theme!
-    width: childrenRect.width
-
-    Row
-    {
-        height: parent.height
-        spacing: UM.Theme.getSize("print_setup_slider_handle").width // TODO: Theme! (Should be same as extruder spacing)
-
-        // This wrapper ensures that the buildplate icon is located centered
-        // below an extruder icon.
-        Item
-        {
-            height: parent.height
-            width: 32 * screenScaleFactor // Ensure the icon is centered under the extruder icon (same width)
-
-            Rectangle
-            {
-                anchors.centerIn: parent
-                height: parent.height
-                width: height
-                color: buildplateIcon.visible > 0 ? "transparent" : UM.Theme.getColor("monitor_skeleton_loading")
-                radius: Math.floor(height / 2)
-            }
-
-            UM.ColorImage
-            {
-                id: buildplateIcon
-                anchors.centerIn: parent
-                color: UM.Theme.getColor("monitor_icon_primary")
-                height: UM.Theme.getSize("medium_button_icon").width
-                source: UM.Theme.getIcon("Buildplate")
-                width: height
-                visible: buildplate
-            }
-        }
-
-        UM.Label
-        {
-            id: buildplateLabel
-            elide: Text.ElideRight
-            text: buildplate ? buildplate : ""
-            visible: text !== ""
-
-            // FIXED-LINE-HEIGHT:
-            height: 18 * screenScaleFactor // TODO: Theme!
-        }
-    }
-}

plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml

@@ -102,9 +102,6 @@ UM.Dialog
                     case "print_core_change":
                         text = catalog.i18nc("@label", "Change print core %1 from %2 to %3.").arg(change.index + 1).arg(change.originName).arg(change.targetName)
                         break
-                    case "buildplate_change":
-                        text = catalog.i18nc("@label", "Change build plate to %1 (This cannot be overridden).").arg(formatBuildPlateType(change.target_name))
-                        break
                     default:
                         text = "unknown"
                 }
@@ -143,19 +140,4 @@ UM.Dialog
         }
         return true
     }
-    function formatBuildPlateType(buildPlateType)
-    {
-        var translationText = ""
-        switch (buildPlateType) {
-            case "glass":
-                translationText = catalog.i18nc("@label", "Glass")
-                break
-            case "aluminum":
-                translationText = catalog.i18nc("@label", "Aluminum")
-                break
-            default:
-                translationText = null
-        }
-        return translationText
-    }
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml

@@ -23,7 +23,7 @@ Item
     //So compute here the visibility of the menu items, so that we can use it for the visibility of the button.
     property bool sendToTopVisible:
     {
-        if (printJob && printJob.state in ("queued",  "error") && !isAssigned(printJob)) {
+        if (printJob && (printJob.state == "queued" || printJob.state == "error")) {
             if (OutputDevice && OutputDevice.queuedPrintJobs[0] && OutputDevice.canWriteOthersPrintJobs) {
                 return OutputDevice.queuedPrintJobs[0].key != printJob.key;
             }
@@ -246,10 +246,4 @@ Item
     function close() {
         popUp.close()
     }
-    function isAssigned(job) {
-        if (!job) {
-            return false;
-        }
-        return job.assignedPrinter ? true : false;
-    }
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml

@@ -10,7 +10,7 @@ import Cura 1.6 as Cura
 /**
  * This component comprises a colored extruder icon, the material name, and the
  * print core name. It is used by the MonitorPrinterConfiguration component with
- * a sibling instance as well as a MonitorBuildplateConfiguration instance.
+ * a sibling instance.
  *
  * NOTE: For most labels, a fixed height with vertical alignment is used to make
  * layouts more deterministic (like the fixed-size textboxes used in original

plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml

@@ -172,14 +172,6 @@ Item
             {
                 id: printerConfiguration
                 anchors.verticalCenter: parent.verticalCenter
-                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!
             }

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -175,14 +175,7 @@ Item
             {
                 id: printerConfiguration
                 anchors.verticalCenter: parent.verticalCenter
-                buildplate: {
-                    switch (printer.buildplate) {
-                        case "glass":
-                            return catalog.i18nc("@label", "Glass");
-                        default:
-                            return null
-                    }
-                }
+
                 configurations:
                 {
                     var configs = []

plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterConfiguration.qml

@@ -7,17 +7,13 @@ import UM 1.3 as UM
 
 /**
  * The MonitorPrinterConfiguration accepts 2 configuration objects as input and
- * applies them to a MonitorBuildplateConfiguration instance and two instances
- * of MonitorExtruderConfiguration. It's used in both the MonitorPrintJobCard
- * component as well as the MonitorPrinterCard component.
+ * applies them to two instances of MonitorExtruderConfiguration.
+ * It's used in both the MonitorPrintJobCard component as well as the MonitorPrinterCard component.
  */
 Item
 {
     id: base
 
-    // Extracted buildplate configuration
-    property alias buildplate: buildplateConfig.buildplate
-
     // Array of extracted extruder configurations
     property var configurations: [null,null]
 
@@ -48,11 +44,4 @@ Item
 
         }
     }
-
-    MonitorBuildplateConfiguration
-    {
-        id: buildplateConfig
-        anchors.bottom: parent.bottom
-        buildplate: null
-    }
 }

plugins/USBPrinting/USBPrinterOutputDeviceManager.py

@@ -9,6 +9,7 @@ from re import search
 
 from PyQt6.QtCore import QObject, pyqtSignal
 
+from UM.Platform import Platform
 from UM.Signal import Signal, signalemitter
 from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin
 from UM.i18n import i18nCatalog
@@ -83,7 +84,8 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin):
             if container_stack.getMetaDataEntry("supports_usb_connection"):
                 machine_file_formats = [file_type.strip() for file_type in container_stack.getMetaDataEntry("file_formats").split(";")]
                 if "text/x-gcode" in machine_file_formats:
-                    port_list = self.getSerialPortList(only_list_usb=True)
+                    # We only limit listing usb on windows is a fix for connecting tty/cu printers on MacOS and Linux
+                    port_list = self.getSerialPortList(only_list_usb=Platform.isWindows())
             self._addRemovePorts(port_list)
             time.sleep(5)
 

printer-linter/README.md

@@ -3,9 +3,9 @@ Printer linter is a python package that does linting on Cura definitions files.
 Running this on your definition files will get them ready for a pull request.
 
 ## Running Locally
-From the Cura root folder.
+From the Cura root folder and pointing to the relative paths of the wanted definition files:
 
-```python3 printer-linter/src/terminal.py "flashforge_dreamer_nx.def.json" "flashforge_base.def.json" --fix  --format```
+```python3 printer-linter/src/terminal.py "resources/definitions/flashforge_dreamer_nx.def.json" "resources/definitions/flashforge_base.def.json" --fix --format```
 
 ## Developing
 ### Printer Linter Rules

printer-linter/src/printerlinter/linters/defintion.py

@@ -41,21 +41,28 @@ class Definition(Linter):
         definition = self._definitions[definition_name]
         if "overrides" in definition and definition_name not in ("fdmprinter", "fdmextruder"):
             for key, value_dict in definition["overrides"].items():
-                is_redefined, value, parent = self._isDefinedInParent(key, value_dict, definition['inherits'])
+                is_redefined, child_key, child_value, parent = self._isDefinedInParent(key, value_dict, definition['inherits'])
                 if is_redefined:
                     redefined = re.compile(r'.*(\"' + key + r'\"[\s\:\S]*?)\{[\s\S]*?\},?')
                     found = redefined.search(self._content)
-                    yield Diagnostic(
-                        file = self._file,
-                        diagnostic_name = "diagnostic-definition-redundant-override",
-                        message = f"Overriding {key} with the same value ({value}) as defined in parent definition: {definition['inherits']}",
-                        level = "Warning",
-                        offset = found.span(0)[0],
+                    # TODO: Figure out a way to support multiline fixes in the PR review GH Action, for now suggest no fix to ensure no ill-formed json are created
+                    #  see: https://github.com/platisd/clang-tidy-pr-comments/issues/37
+                    if len(found.group().splitlines()) > 1:
+                        replacements = []
+                    else:
                         replacements = [Replacement(
                             file = self._file,
                             offset = found.span(1)[0],
                             length = len(found.group()),
                             replacement_text = "")]
+
+                    yield Diagnostic(
+                        file = self._file,
+                        diagnostic_name = "diagnostic-definition-redundant-override",
+                        message = f"Overriding {key} with the same value ({child_key}: {child_value}) as defined in parent definition: {definition['inherits']}",
+                        level = "Warning",
+                        offset = found.span(0)[0],
+                        replacements = replacements
                     )
 
     def _loadDefinitionFiles(self, definition_file) -> None:
@@ -77,6 +84,8 @@ class Definition(Linter):
             self._loadDefinitionFiles(parent_file)
 
     def _isDefinedInParent(self, key, value_dict, inherits_from):
+        if self._ignore(key, "diagnostic-definition-redundant-override"):
+            return False, None, None, None
         if "overrides" not in self._definitions[inherits_from]:
             return self._isDefinedInParent(key, value_dict, self._definitions[inherits_from]["inherits"])
 
@@ -85,31 +94,33 @@ class Definition(Linter):
             is_number = False
         else:
             is_number = self._definitions[self.base_def]["overrides"][key]["type"] in ("float", "int")
-        for value in value_dict.values():
+        for child_key, child_value in value_dict.items():
             if key in parent:
-                check_values = [cv for cv in [parent[key].get("default_value", None), parent[key].get("value", None)] if cv is not None]
+                if child_key in ("default_value", "value"):
+                    check_values = [cv for cv in [parent[key].get("default_value", None), parent[key].get("value", None)] if cv is not None]
+                else:
+                    check_values = [parent[key].get(child_key, None)]
                 for check_value in check_values:
-                    if is_number:
+                    if is_number and child_key in ("default_value", "value"):
                         try:
-                            v = str(float(value))
+                            v = str(float(child_value))
                         except:
-                            v = value
+                            v = child_value
                         try:
                             cv = str(float(check_value))
                         except:
                             cv = check_value
                     else:
-                        v = value
+                        v = child_value
                         cv = check_value
                     if v == cv:
-                        return True, value, parent
+                        return True, child_key, child_value, parent
 
                 if "inherits" in parent:
                     return self._isDefinedInParent(key, value_dict, parent["inherits"])
-        return False, None, None
+        return False, None, None, None
 
     def _loadBasePrinterSettings(self):
-        """ TODO @Jelle please explain why this """
         settings = {}
         for k, v in self._definitions[self.base_def]["settings"].items():
             self._getSetting(k, v, settings)
@@ -120,3 +131,11 @@ class Definition(Linter):
             for childname, child in setting["children"].items():
                 self._getSetting(childname, child, settings)
         settings |= {name: setting}
+
+    def _ignore(self, key: dict, type_of_check: str) -> bool:
+        if f"{type_of_check}-ignore" in self._settings:
+            filters = [re.compile(f) for f in self._settings[f"{type_of_check}-ignore"]]
+            for f in filters:
+                if f.match(key):
+                    return True
+        return False

printer-linter/src/printerlinter/linters/meshes.py

@@ -4,12 +4,14 @@ from typing import Iterator
 from ..diagnostic import Diagnostic
 from .linter import Linter
 
+MAX_MESH_FILE_SIZE = 1 * 1024 * 1024  # 1MB
+
 
 class Meshes(Linter):
     def __init__(self, file: Path, settings: dict) -> None:
         """ Finds issues in model files, such as incorrect file format or too large size """
         super().__init__(file, settings)
-        self._max_file_size = self._settings.get("diagnostic-mesh-file-size", 1e6)
+        self._max_file_size = self._settings.get("diagnostic-mesh-file-size", MAX_MESH_FILE_SIZE)
 
     def check(self) -> Iterator[Diagnostic]:
         if self._settings["checks"].get("diagnostic-mesh-file-extension", False):

printer-linter/src/terminal.py

@@ -1,5 +1,6 @@
 from argparse import ArgumentParser
 from os import getcwd
+from os import path
 from pathlib import Path
 from typing import List
 
@@ -41,6 +42,11 @@ def main() -> None:
 
     full_body_check = {"Diagnostics": []}
 
+    for file in files:
+        if not path.exists(file):
+            print(f"Can't find the file: {file}")
+            return
+
     if to_fix or to_diagnose:
         for file in files:
             diagnostics = diagnoseIssuesWithFile(file, settings)
@@ -107,8 +113,11 @@ def extractFilePaths(paths: List[Path]) -> List[Path]:
     for path in paths:
         if path.is_dir():
             file_paths.extend(path.rglob("**/*"))
-        else:
+        if not path.match("*"):
             file_paths.append(path)
+        else:
+            file_paths.extend(Path(*path.parts[:-1]).glob(path.parts[-1]))
+            continue
 
     return file_paths
 

requirements-dev.txt

@@ -1,5 +1,5 @@
 pytest
-pyinstaller
+pyinstaller==5.6.2
 pyinstaller-hooks-contrib
 pyyaml
 sip==6.5.1

resources/definitions/101Hero.def.json

@@ -1,52 +1,46 @@
 {
-    "version": 2, 
+    "version": 2,
     "name": "101Hero",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "rikky",
         "manufacturer": "101Hero",
         "file_formats": "text/x-gcode",
         "platform": "101hero-platform.3mf",
-        "supports_usb_connection": true,
+        "machine_extruder_trains": { "0": "101Hero_extruder_0" },
         "preferred_quality_type": "draft",
-        "machine_extruder_trains":
-        {
-            "0": "101Hero_extruder_0"
-        }
+        "supports_usb_connection": true
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "101Hero" },
-        "machine_shape": { "default_value": "elliptic"},
-        "machine_heated_bed": { "default_value": false },
-        "machine_width": { "default_value": 149.86 },
-        "machine_depth": { "default_value": 149.86 },
-        "machine_height": { "default_value": 99.822 },
+    "overrides":
+    {
+        "gantry_height": { "value": "0" },
         "machine_center_is_zero": { "default_value": true },
-        "machine_head_with_fans_polygon": {
+        "machine_depth": { "default_value": 149.86 },
+        "machine_end_gcode": { "default_value": "M104 S0     ;extruder heater off\nM140 S0     ;heated bed heater off (if you have it)\nG91         ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z0.5 E-5 F840 ;move Z up a bit and retract even more\nG28 X0 Y0   ;home X/Y, so the head is out of the way\nM84         ;steppers off\nG90         ;absolute positioning" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_head_with_fans_polygon":
+        {
             "default_value": [
-                [ 0, 0 ],
-                [ 0, 0 ],
-                [ 0, 0 ],
-                [ 0, 0 ]
+                [0, 0],
+                [0, 0],
+                [0, 0],
+                [0, 0]
             ]
         },
-        "speed_print": {  "default_value": 14 },
-        "speed_travel": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print * 0.7" },
-        "speed_topbottom": { "value": "speed_print * 0.7" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 99.822 },
+        "machine_name": { "default_value": "101Hero" },
+        "machine_shape": { "default_value": "elliptic" },
+        "machine_start_gcode": { "default_value": "G21       ;metric values\nG90       ;absolute positioning\nM82       ;set extruder to absolute mode\nM107      ;start with the fan off\nG28 Z0    ;home Z\nG1 Z15.0 F840\nG92 E0    ;zero the extruded length\nG1 F200 E3              ;extrude 3mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F840\n;Put printing message on LCD screen\nM117 Printing...\n" },
+        "machine_width": { "default_value": 149.86 },
+        "retraction_amount": { "default_value": 2.5 },
+        "retraction_speed": { "default_value": 10 },
         "speed_layer_0": { "value": "speed_print * 0.7" },
-        "gantry_height": { "value": "0" },
-        "retraction_speed": { "default_value" : 10 },
-        "retraction_amount": { "default_value" : 2.5 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-
-        "machine_start_gcode": {
-            "default_value": "G21       ;metric values\nG90       ;absolute positioning\nM82       ;set extruder to absolute mode\nM107      ;start with the fan off\nG28 Z0    ;home Z\nG1 Z15.0 F840\nG92 E0    ;zero the extruded length\nG1 F200 E3              ;extrude 3mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F840\n;Put printing message on LCD screen\nM117 Printing...\n"
-         },
-        "machine_end_gcode": {
-            "default_value": "M104 S0     ;extruder heater off\nM140 S0     ;heated bed heater off (if you have it)\nG91         ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z0.5 E-5 F840 ;move Z up a bit and retract even more\nG28 X0 Y0   ;home X/Y, so the head is out of the way\nM84         ;steppers off\nG90         ;absolute positioning"
-        }
+        "speed_print": { "default_value": 14 },
+        "speed_topbottom": { "value": "speed_print * 0.7" },
+        "speed_travel": { "value": "speed_print" },
+        "speed_wall": { "value": "speed_print * 0.7" }
     }
-}
+}

resources/definitions/3dator.def.json

@@ -2,34 +2,28 @@
     "version": 2,
     "name": "3Dator",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "3Dator GmbH",
         "manufacturer": "3Dator GmbH",
         "file_formats": "text/x-gcode",
-        "supports_usb_connection": true,
         "platform": "3dator_platform.3mf",
-        "machine_extruder_trains":
-        {
-            "0": "3dator_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "3dator_extruder_0" },
+        "supports_usb_connection": true
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "3Dator" },
-        "prime_tower_size": { "default_value": 8.660254037844387 },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "none" },
+        "gantry_height": { "value": "30" },
         "infill_sparse_density": { "default_value": 20 },
         "layer_height": { "default_value": 0.2 },
-        "speed_print": { "default_value": 50 },
-        "machine_heated_bed": { "default_value": true },
         "machine_center_is_zero": { "default_value": false },
-        "machine_height": { "default_value": 260 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_depth": { "default_value": 170 },
-        "machine_width": { "default_value": 180 },
-        "retraction_speed": {"default_value":100},
-        "adhesion_type": { "default_value": "none" },
-        "machine_head_with_fans_polygon": {
+        "machine_end_gcode": { "default_value": "M104 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91                                    ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28                          ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_head_with_fans_polygon":
+        {
             "default_value": [
                 [-15, -25],
                 [-15, 35],
@@ -37,13 +31,13 @@
                 [40, -25]
             ]
         },
-        "gantry_height": {
-            "value": "30"
-        },
-        "machine_start_gcode": {
-            "default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21  ;metric values\nG90  ;absolute positioning\nM82  ;set extruder to absolute mode\nM107  ;start with the fan off\nG28 Z0  ;move Z to min endstops\nG28 X0 Y0  ;move X/Y to min endstops\nG29  ;Auto Level\nG1 Z0.6 F{speed_travel} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0  ;zero the extruded length\nG1 X10 E30 F500  ;printing a Line from right to left\nG92 E0  ;zero the extruded length again\nG1 Z2\nG1 F{speed_travel}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white"      },
-        "machine_end_gcode": {
-            "default_value": "M104 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91                                    ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28                          ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning"
-        }
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 260 },
+        "machine_name": { "default_value": "3Dator" },
+        "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21  ;metric values\nG90  ;absolute positioning\nM82  ;set extruder to absolute mode\nM107  ;start with the fan off\nG28 Z0  ;move Z to min endstops\nG28 X0 Y0  ;move X/Y to min endstops\nG29  ;Auto Level\nG1 Z0.6 F{speed_travel} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0  ;zero the extruded length\nG1 X10 E30 F500  ;printing a Line from right to left\nG92 E0  ;zero the extruded length again\nG1 Z2\nG1 F{speed_travel}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white" },
+        "machine_width": { "default_value": 180 },
+        "prime_tower_size": { "default_value": 8.660254037844387 },
+        "retraction_speed": { "default_value": 100 },
+        "speed_print": { "default_value": 50 }
     }
-}
+}

resources/definitions/3di_base.def.json

@@ -1,49 +1,26 @@
-{
-    "version": 2,
-    "name": "3DI Base Printer",
-    "inherits": "fdmprinter",
-    "metadata": {
-        "visible": false,
-        "author": "Vaibhav Jain",
-        "manufacturer": "3Deometry Innovations",
-        "file_formats": "text/x-gcode",
-        "machine_extruder_trains":
-        {
-            "0": "3di_base_extruder_0"
-        }
-    },
-
-    "overrides": {
-		"machine_name":{
-			"default_value": "3DI Base Printer"
-		},
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_center_is_zero": {
-            "default_value": true
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode": {
-            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning"
-        },
-        "machine_shape": {
-            "default_value": "elliptic"
-        }
-    }
-}
-
+{
+    "version": 2,
+    "name": "3DI Base Printer",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": false,
+        "author": "Vaibhav Jain",
+        "manufacturer": "3Deometry Innovations",
+        "file_formats": "text/x-gcode",
+        "machine_extruder_trains": { "0": "3di_base_extruder_0" }
+    },
+    "overrides":
+    {
+        "machine_center_is_zero": { "default_value": true },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 220 },
+        "machine_name": { "default_value": "3DI Base Printer" },
+        "machine_shape": { "default_value": "elliptic" },
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." },
+        "machine_width": { "default_value": 220 }
+    }
+}

resources/definitions/3di_d300.def.json

@@ -1,26 +1,22 @@
-{
-    "version": 2,
-    "name": "3DI D300",
-    "inherits": "3di_base",
-    "metadata": {
-        "visible": true,
-        "platform": "3di_d300_platform.STL",
-        "platform_offset": [-200, -5, 173.205]
-    },
-
-    "overrides": {
-		"machine_name": { 
-		    "default_value": "3DI D300" 
-			},
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        }
-    }
-}
-
+{
+    "version": 2,
+    "name": "3DI D300",
+    "inherits": "3di_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "3di_d300_platform.STL",
+        "platform_offset": [
+            -200,
+            -5,
+            173.205
+        ]
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_height": { "default_value": 300 },
+        "machine_name": { "default_value": "3DI D300" },
+        "machine_width": { "default_value": 300 }
+    }
+}

resources/definitions/3dtech_semi_professional.def.json

@@ -2,40 +2,29 @@
     "version": 2,
     "name": "3DTech Semi-Professional",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "3DTech",
         "manufacturer": "3DTech",
         "file_formats": "text/x-gcode",
         "platform": "3dtech_semi_professional_platform.3mf",
-        "platform_offset": [0, -2.5, 0 ],
-        "machine_extruder_trains":
-        {
-            "0": "3dtech_semi_professional_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "3dtech_semi_professional_extruder_0" },
+        "platform_offset": [
+            0,
+            -2.5,
+            0
+        ]
     },
-    "overrides": {
+    "overrides":
+    {
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 250 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0 ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_height": { "default_value": 300 },
         "machine_name": { "default_value": "3DTECH SP Control" },
-        "machine_width": {
-            "default_value": 250
-        },
-        "machine_depth": {
-            "default_value": 250
-        },
-		"machine_height": {
-            "default_value": 300
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ; home all axes\nG29 ;\nG1 Z5 F3000 ; lift\nG1 X5 Y25 F5000 ; move to prime\nG1 Z0.2 F3000 ; get ready to prime\nG92 E0 ; reset extrusion distance\nG1 Y100 E20 F600 ; prime nozzle\nG1 Y140 F5000 ; quick wipe"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0 ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ; home all axes\nG29 ;\nG1 Z5 F3000 ; lift\nG1 X5 Y25 F5000 ; move to prime\nG1 Z0.2 F3000 ; get ready to prime\nG92 E0 ; reset extrusion distance\nG1 Y100 E20 F600 ; prime nozzle\nG1 Y140 F5000 ; quick wipe" },
+        "machine_width": { "default_value": 250 }
     }
-}
+}

resources/definitions/Geeetech_Base_Dual_Extruder.def.json

@@ -0,0 +1,148 @@
+{
+    "version": 2,
+    "name": "Geeetech Base Dual-Extruder Printer",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": false,
+        "author": "Teddy.Hu",
+        "manufacturer": "Geeetech",
+        "file_formats": "text/x-gcode",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": false,
+        "machine_extruder_trains":
+        {
+            "0": "Geeetech_Dual_Extruder_0",
+            "1": "Geeetech_Dual_Extruder_1"
+        },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle",
+        "quality_definition": "Geeetech_Base_Single_Extruder",
+        "variants_name": "Nozzle Size"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 500 },
+        "acceleration_travel": { "value": 500 },
+        "acceleration_travel_layer_0": { "value": "acceleration_travel" },
+        "adhesion_type": { "value": "'skirt'" },
+        "brim_replaces_support": { "value": false },
+        "cool_min_layer_time": { "value": "1.3 if speed_infill>=200  else 5" },
+        "gantry_height": { "value": 40 },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" },
+        "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" },
+        "machine_acceleration": { "value": 500 },
+        "machine_depth": { "default_value": 350 },
+        "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-40, 40],
+                [40, 40],
+                [40, -40],
+                [-40, -40]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 350 },
+        "machine_max_acceleration_e": { "value": 1000 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 111 },
+        "machine_max_feedrate_e": { "value": 40 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 10 },
+        "machine_max_jerk_e": { "value": 4.9 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Geeetech Base Dual-Extruder Printer" },
+        "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" },
+        "machine_width": { "default_value": 350 },
+        "material_bed_temperature": { "maximum_value_warning": 110 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_initial_print_temperature":
+        {
+            "minimum_value_warning": "material_standby_temperature - 10",
+            "value": "material_print_temperature - 5"
+        },
+        "material_print_temperature":
+        {
+            "maximum_value": "250",
+            "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230"
+        },
+        "material_print_temperature_layer_0":
+        {
+            "maximum_value_warning": 250,
+            "value": "material_print_temperature + 5"
+        },
+        "minimum_interface_area": { "value": 10 },
+        "minimum_support_area": { "value": 2 },
+        "optimize_wall_printing_order": { "value": true },
+        "prime_tower_brim_enable": { "value": true },
+        "prime_tower_min_volume":
+        {
+            "maximum_value_warning": 150,
+            "value": 85
+        },
+        "prime_tower_size": { "value": 30 },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" },
+        "retraction_combing_max_distance": { "value": 30 },
+        "retraction_hop": { "value": 0.5 },
+        "retraction_speed": { "value": 35 },
+        "skirt_brim_speed":
+        {
+            "maximum_value_warning": "60",
+            "value": "speed_print_layer_0"
+        },
+        "skirt_gap": { "value": 6 },
+        "small_hole_max_size": { "value": "5 if speed_infill>=150  else 0" },
+        "speed_layer_0":
+        {
+            "maximum_value_warning": "100",
+            "value": "50 if speed_infill <= 150 else 75"
+        },
+        "speed_print_layer_0":
+        {
+            "maximum_value_warning": "60",
+            "value": "25 if speed_infill <= 150 else 35"
+        },
+        "speed_support": { "value": "speed_print*0.5" },
+        "speed_support_bottom": { "value": "speed_support_roof" },
+        "speed_support_interface": { "value": "speed_support / 0.8" },
+        "speed_support_roof": { "value": "speed_support_interface / 2" },
+        "speed_topbottom": { "value": "speed_print" },
+        "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" },
+        "speed_travel_layer_0":
+        {
+            "maximum_value_warning": "150",
+            "value": "speed_layer_0"
+        },
+        "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" },
+        "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" },
+        "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" },
+        "support_brim_enable": { "value": true },
+        "support_brim_width": { "value": 5 },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
+        "support_interface_density": { "value": 33.333 },
+        "support_interface_height": { "value": "layer_height * 3" },
+        "support_interface_pattern": { "value": "zigzag" },
+        "support_interface_skip_height": { "value": 0.2 },
+        "support_pattern": { "value": "'zigzag'" },
+        "support_use_towers": { "value": false },
+        "support_wall_count": { "value": 0 },
+        "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" },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
+        "travel_avoid_supports": { "value": true },
+        "wall_thickness": { "value": "line_width * 2" },
+        "wall_transition_filter_deviation": { "value": 0.15 },
+        "z_seam_corner": { "value": "'z_seam_corner_inner'" },
+        "z_seam_type": { "value": "'sharpest_corner'" }
+    }
+}

resources/definitions/Geeetech_Base_Multi_Extruder.def.json

@@ -0,0 +1,149 @@
+{
+    "version": 2,
+    "name": "Geeetech Base Multi-Extruder Printer",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": false,
+        "author": "Teddy.Hu",
+        "manufacturer": "Geeetech",
+        "file_formats": "text/x-gcode",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": false,
+        "machine_extruder_trains":
+        {
+            "0": "Geeetech_Multi_Extruder_0",
+            "1": "Geeetech_Multi_Extruder_1",
+            "2": "Geeetech_Multi_Extruder_2"
+        },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle",
+        "quality_definition": "Geeetech_Base_Single_Extruder",
+        "variants_name": "Nozzle Size"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 500 },
+        "acceleration_travel": { "value": 500 },
+        "acceleration_travel_layer_0": { "value": "acceleration_travel" },
+        "adhesion_type": { "value": "'skirt'" },
+        "brim_replaces_support": { "value": false },
+        "cool_min_layer_time": { "value": "1.3 if speed_infill>=200  else 5" },
+        "gantry_height": { "value": 40 },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" },
+        "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" },
+        "machine_acceleration": { "value": 500 },
+        "machine_depth": { "default_value": 350 },
+        "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" },
+        "machine_extruder_count": { "default_value": 3 },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-40, 40],
+                [40, 40],
+                [40, -40],
+                [-40, -40]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 350 },
+        "machine_max_acceleration_e": { "value": 1000 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 111 },
+        "machine_max_feedrate_e": { "value": 40 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 10 },
+        "machine_max_jerk_e": { "value": 4.9 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Geeetech Base Multi-Extruder Printer" },
+        "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" },
+        "machine_width": { "default_value": 350 },
+        "material_bed_temperature": { "maximum_value_warning": 110 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_initial_print_temperature":
+        {
+            "minimum_value_warning": "material_standby_temperature - 10",
+            "value": "material_print_temperature - 5"
+        },
+        "material_print_temperature":
+        {
+            "maximum_value": "250",
+            "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230"
+        },
+        "material_print_temperature_layer_0":
+        {
+            "maximum_value_warning": 250,
+            "value": "material_print_temperature + 5"
+        },
+        "minimum_interface_area": { "value": 10 },
+        "minimum_support_area": { "value": 2 },
+        "optimize_wall_printing_order": { "value": true },
+        "prime_tower_brim_enable": { "value": true },
+        "prime_tower_min_volume":
+        {
+            "maximum_value_warning": 150,
+            "value": 85
+        },
+        "prime_tower_size": { "value": 30 },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" },
+        "retraction_combing_max_distance": { "value": 30 },
+        "retraction_hop": { "value": 0.5 },
+        "retraction_speed": { "value": 35 },
+        "skirt_brim_speed":
+        {
+            "maximum_value_warning": "60",
+            "value": "speed_print_layer_0"
+        },
+        "skirt_gap": { "value": 6 },
+        "small_hole_max_size": { "value": "5 if speed_infill>=150  else 0" },
+        "speed_layer_0":
+        {
+            "maximum_value_warning": "100",
+            "value": "50 if speed_infill <= 150 else 75"
+        },
+        "speed_print_layer_0":
+        {
+            "maximum_value_warning": "60",
+            "value": "25 if speed_infill <= 150 else 35"
+        },
+        "speed_support": { "value": "speed_print*0.5" },
+        "speed_support_bottom": { "value": "speed_support_roof" },
+        "speed_support_interface": { "value": "speed_support / 0.8" },
+        "speed_support_roof": { "value": "speed_support_interface / 2" },
+        "speed_topbottom": { "value": "speed_print" },
+        "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" },
+        "speed_travel_layer_0":
+        {
+            "maximum_value_warning": "150",
+            "value": "speed_layer_0"
+        },
+        "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" },
+        "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" },
+        "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" },
+        "support_brim_enable": { "value": true },
+        "support_brim_width": { "value": 5 },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
+        "support_interface_density": { "value": 33.333 },
+        "support_interface_height": { "value": "layer_height * 3" },
+        "support_interface_pattern": { "value": "zigzag" },
+        "support_interface_skip_height": { "value": 0.2 },
+        "support_pattern": { "value": "'zigzag'" },
+        "support_use_towers": { "value": false },
+        "support_wall_count": { "value": 0 },
+        "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" },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
+        "travel_avoid_supports": { "value": true },
+        "wall_thickness": { "value": "line_width * 2" },
+        "wall_transition_filter_deviation": { "value": 0.15 },
+        "z_seam_corner": { "value": "'z_seam_corner_inner'" },
+        "z_seam_type": { "value": "'sharpest_corner'" }
+    }
+}

resources/definitions/Geeetech_Base_Single_Extruder.def.json

@@ -0,0 +1,136 @@
+{
+    "version": 2,
+    "name": "Geeetech Base Single Extruder Printer",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": false,
+        "author": "Teddy.Hu",
+        "manufacturer": "Geeetech",
+        "file_formats": "text/x-gcode",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle",
+        "quality_definition": "Geeetech_Base_Single_Extruder",
+        "variants_name": "Nozzle Size"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 500 },
+        "acceleration_travel": { "value": 500 },
+        "acceleration_travel_layer_0": { "value": "acceleration_travel" },
+        "adhesion_type": { "value": "'skirt'" },
+        "brim_replaces_support": { "value": false },
+        "cool_min_layer_time": { "value": "1.3 if speed_infill>=200  else 5" },
+        "gantry_height": { "value": 40 },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" },
+        "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" },
+        "machine_acceleration": { "value": 500 },
+        "machine_depth": { "default_value": 350 },
+        "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-40, 40],
+                [40, 40],
+                [40, -40],
+                [-40, -40]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 350 },
+        "machine_max_acceleration_e": { "value": 1000 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 111 },
+        "machine_max_feedrate_e": { "value": 40 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 10 },
+        "machine_max_jerk_e": { "value": 4.9 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Geeetech Base Single Extruder Printer" },
+        "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" },
+        "machine_width": { "default_value": 350 },
+        "material_bed_temperature": { "maximum_value_warning": 110 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_initial_print_temperature":
+        {
+            "minimum_value_warning": "material_standby_temperature - 10",
+            "value": "material_print_temperature - 5"
+        },
+        "material_print_temperature":
+        {
+            "maximum_value": "250",
+            "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230"
+        },
+        "material_print_temperature_layer_0":
+        {
+            "maximum_value_warning": 250,
+            "value": "material_print_temperature + 5"
+        },
+        "minimum_interface_area": { "value": 10 },
+        "minimum_support_area": { "value": 2 },
+        "optimize_wall_printing_order": { "value": true },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" },
+        "retraction_combing_max_distance": { "value": 30 },
+        "retraction_hop": { "value": 0.5 },
+        "retraction_speed": { "value": 40 },
+        "skirt_brim_speed":
+        {
+            "maximum_value_warning": "60",
+            "value": "speed_print_layer_0"
+        },
+        "skirt_gap": { "value": 6 },
+        "small_hole_max_size": { "value": "5 if speed_infill>=150  else 0" },
+        "speed_layer_0":
+        {
+            "maximum_value_warning": "100",
+            "value": "50 if speed_infill <= 150 else 75"
+        },
+        "speed_print_layer_0":
+        {
+            "maximum_value_warning": "60",
+            "value": "25 if speed_infill <= 150 else 35"
+        },
+        "speed_support": { "value": "speed_print*0.5" },
+        "speed_support_bottom": { "value": "speed_support_roof" },
+        "speed_support_interface": { "value": "speed_support / 0.8" },
+        "speed_support_roof": { "value": "speed_support_interface / 2" },
+        "speed_topbottom": { "value": "speed_print" },
+        "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" },
+        "speed_travel_layer_0":
+        {
+            "maximum_value_warning": "150",
+            "value": "speed_layer_0"
+        },
+        "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" },
+        "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" },
+        "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" },
+        "support_brim_enable": { "value": true },
+        "support_brim_width": { "value": 5 },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
+        "support_interface_density": { "value": 33.333 },
+        "support_interface_height": { "value": "layer_height * 3" },
+        "support_interface_pattern": { "value": "zigzag" },
+        "support_interface_skip_height": { "value": 0.2 },
+        "support_pattern": { "value": "'zigzag'" },
+        "support_use_towers": { "value": false },
+        "support_wall_count": { "value": 0 },
+        "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" },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
+        "travel_avoid_supports": { "value": true },
+        "wall_thickness": { "value": "line_width * 2" },
+        "wall_transition_filter_deviation": { "value": 0.15 },
+        "z_seam_corner": { "value": "'z_seam_corner_inner'" },
+        "z_seam_type": { "value": "'sharpest_corner'" }
+    }
+}

resources/definitions/I3MetalMotion.def.json

@@ -2,32 +2,26 @@
     "version": 2,
     "name": "I3 Metal Motion",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Peter Felecan",
         "manufacturer": "eMotionTech",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "preferred_material": "emotiontech_pla",
-        "machine_extruder_trains":
-        {
-            "0": "I3MetalMotion_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "I3MetalMotion_extruder_0" },
+        "preferred_material": "emotiontech_pla"
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "I3MetalMotion" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_width": { "default_value": 200 },
-        "machine_height": { "default_value": 200 },
-        "machine_depth": { "default_value": 200 },
+    "overrides":
+    {
         "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 200 },
+        "machine_end_gcode": { "default_value": "G28 Z\nG28 X\nG28 Y\nM107 ; Turn off the fan\nG91; Relative positioning\nG1 E-1 ; reduce filament pressure\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn the steppers off" },
         "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" },
-        "machine_start_gcode": {
-            "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position"
-        },
-        "machine_end_gcode": {
-            "default_value": "G28 Z\nG28 X\nG28 Y\nM107 ; Turn off the fan\nG91; Relative positioning\nG1 E-1 ; reduce filament pressure\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn the steppers off"
-        }
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 200 },
+        "machine_name": { "default_value": "I3MetalMotion" },
+        "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" },
+        "machine_width": { "default_value": 200 }
     }
-}
+}

resources/definitions/Mark2_for_Ultimaker2.def.json

@@ -2,179 +2,69 @@
     "version": 2,
     "name": "Mark2 for Ultimaker2",
     "inherits": "ultimaker2_plus",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "TheUltimakerCommunity",
         "manufacturer": "Foehnsturm",
-        "weight": 0,
-        "has_variants": true,
-        "has_materials": true,
-        "has_machine_quality": false,
         "file_formats": "text/x-gcode",
-        "icon": "icon_ultimaker.png",
         "platform": "ultimaker2_platform.obj",
-        "platform_texture": "Mark2_for_Ultimaker2_backplate.png",
+        "has_machine_quality": false,
+        "has_materials": true,
+        "has_variants": true,
+        "icon": "icon_ultimaker.png",
         "machine_extruder_trains":
         {
             "0": "Mark2_extruder1",
             "1": "Mark2_extruder2"
         },
-        "supported_actions": ["MachineSettingsAction", "UpgradeFirmware"]
+        "platform_texture": "Mark2_for_Ultimaker2_backplate.png",
+        "supported_actions": [
+            "MachineSettingsAction",
+            "UpgradeFirmware"
+        ],
+        "weight": 0
     },
-    "overrides": {
-        "machine_name": { "default_value": "Mark2_for_Ultimaker2" },
-        "machine_width": {
-            "default_value": 223
-        },
-        "machine_depth": {
-            "default_value": 223
-        },
-        "machine_height": {
-            "default_value": 203
-        },
-        "gantry_height": {
-            "value": "52"
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
-        "machine_nozzle_heat_up_speed": {
-            "default_value": 3.5
-        },
-        "machine_nozzle_cool_down_speed": {
-            "default_value": 1.5
-        },
-        "machine_min_cool_heat_time_window":
-        {
-            "default_value": 15.0
-        },
-        "machine_show_variants": {
-            "default_value": true
-        },
-        "machine_nozzle_head_distance": {
-            "default_value": 5
-        },
-        "machine_heat_zone_length": {
-            "default_value": 20
-        },
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "speed_wall_x": {
-            "value": "speed_wall"
-        },
-        "layer_height_0": {
-            "value": "round(machine_nozzle_size / 1.5, 2)"
-        },
-        "line_width": {
-            "value": "round(machine_nozzle_size * 0.875, 2)"
-        },
-        "speed_support": {
-            "value": "speed_wall_0"
-        },
-        "machine_max_feedrate_x": {
-            "default_value": 250
-        },
-        "machine_max_feedrate_y": {
-            "default_value": 250
-        },
-        "machine_max_feedrate_z": {
-            "default_value": 40
-        },
-        "machine_max_feedrate_e": {
-            "default_value": 45
-        },
-        "machine_acceleration": {
-            "default_value": 3000
-        },
-        "retraction_amount": {
-            "default_value": 5.1
-        },
-        "retraction_speed": {
-            "default_value": 25
-        },
-        "switch_extruder_retraction_amount": {
-            "value": "retraction_amount",
-            "enabled": false
-        },
-        "switch_extruder_retraction_speeds": {
-            "value": "retraction_speed",
-            "enabled": false
-        },
-        "switch_extruder_retraction_speed": {
-            "value": "retraction_retract_speed",
-            "enabled": false
-        },
-        "switch_extruder_prime_speed": {
-            "value": "retraction_prime_speed",
-            "enabled": false
-        },
-        "machine_head_with_fans_polygon":
-        {
-            "default_value": [
-                [ -44, 14 ],
-                [ -44, -34 ],
-                [ 64, 14 ],
-                [ 64, -34 ]
-            ]
-        },
-        "machine_use_extruder_offset_to_offset_coords": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode" : {
-            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 Z0; home all\\nG28 X0 Y0\\nG0 Z20 F2400 ;move the platform to 20mm\\nG92 E0\\nM190 S{material_bed_temperature_layer_0}\\nM109 T0 S{material_standby_temperature, 0}\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nT1 ; move to the 2th head\\nG0 Z20 F2400\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-5.1 F1500 ; retract\\nG1 X90 Z0.01 F5000 ; move away from the prime poop\\nG1 X50 F9000\\nG0 Z20 F2400\\nT0 ; move to the first head\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM104 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 X60 Z0.01 F5000 ; move away from the prime poop\\nG1 X20 F9000\\nM400 ;finish all moves\\nG92 E0\\n;end of startup sequence\\n\""
-        },
-        "machine_end_gcode" : {
-            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\""
-        },
-        "machine_extruder_count": {
-            "default_value": 2
-        },
-        "acceleration_enabled":
-        {
-            "default_value": true
-        },
-        "acceleration_print":
-        {
-            "value": "2000"
-        },
-        "acceleration_travel":
-        {
-            "value": "acceleration_print if magic_spiralize else 3000"
-        },
+    "overrides":
+    {
+        "acceleration_enabled": { "default_value": true },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_print": { "value": "2000" },
         "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_support_interface": { "value": "acceleration_topbottom" },
         "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" },
+        "acceleration_travel": { "value": "acceleration_print if magic_spiralize else 3000" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" },
-        "jerk_enabled":
+        "extruder_prime_pos_abs": { "default_value": false },
+        "extruder_prime_pos_x":
         {
-            "default_value": true
+            "default_value": 0.0,
+            "enabled": false
         },
-        "jerk_travel":
+        "extruder_prime_pos_y":
         {
-            "value": "jerk_print if magic_spiralize else 20"
+            "default_value": 0.0,
+            "enabled": false
         },
+        "extruder_prime_pos_z":
+        {
+            "default_value": 0.0,
+            "enabled": false
+        },
+        "gantry_height": { "value": "52" },
+        "jerk_enabled": { "default_value": true },
         "jerk_layer_0": { "value": "jerk_topbottom" },
         "jerk_prime_tower": { "value": "10 if jerk_print < 16 else math.ceil(jerk_print * 15 / 25)" },
         "jerk_support": { "value": "10 if jerk_print < 16 else math.ceil(jerk_print * 15 / 25)" },
         "jerk_support_interface": { "value": "jerk_topbottom" },
         "jerk_topbottom": { "value": "10 if jerk_print < 25 else math.ceil(jerk_print * 10 / 25)" },
+        "jerk_travel": { "value": "jerk_print if magic_spiralize else 20" },
+        "jerk_travel_layer_0": { "value": "math.ceil(jerk_layer_0 * jerk_travel / jerk_print)" },
         "jerk_wall": { "value": "10 if jerk_print < 16 else math.ceil(jerk_print * 15 / 25)" },
         "jerk_wall_0": { "value": "10 if jerk_wall < 16 else math.ceil(jerk_wall * 6 / 10)" },
-        "jerk_travel_layer_0": { "value": "math.ceil(jerk_layer_0 * jerk_travel / jerk_print)" },
-        "extruder_prime_pos_abs": { "default_value": false },
-        "extruder_prime_pos_x": { "default_value": 0.0, "enabled": false },
-        "extruder_prime_pos_y": { "default_value": 0.0, "enabled": false },
-        "extruder_prime_pos_z": { "default_value": 0.0, "enabled": false },
+        "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x":
         {
             "default_value": 105.0,
@@ -185,19 +75,93 @@
             "default_value": 27.0,
             "enabled": false
         },
-        "prime_tower_position_x": {
-            "value": "185"
-        },
-        "prime_tower_position_y": {
-            "value": "160"
-        },
-        "machine_disallowed_areas": {
+        "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
+        "machine_acceleration": { "default_value": 3000 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 223 },
+        "machine_disallowed_areas":
+        {
             "default_value": [
-                [[-115,  112.5], [ -10,  112.5], [ -10,  72.5], [-115,  72.5]],
-                [[ 115,  112.5], [ 115,  72.5], [ 15,  72.5], [ 15,  112.5]],
-                [[-115, -112.5], [-115, -87.5], [ 115, -87.5], [ 115, -112.5]],
-                [[-115, 72.5], [-97, 72.5], [-97, -112.5], [-115, -112.5]]
+                [
+                    [-115, 112.5],
+                    [-10, 112.5],
+                    [-10, 72.5],
+                    [-115, 72.5]
+                ],
+                [
+                    [115, 112.5],
+                    [115, 72.5],
+                    [15, 72.5],
+                    [15, 112.5]
+                ],
+                [
+                    [-115, -112.5],
+                    [-115, -87.5],
+                    [115, -87.5],
+                    [115, -112.5]
+                ],
+                [
+                    [-115, 72.5],
+                    [-97, 72.5],
+                    [-97, -112.5],
+                    [-115, -112.5]
+                ]
             ]
+        },
+        "machine_end_gcode": { "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-44, 14],
+                [-44, -34],
+                [64, 14],
+                [64, -34]
+            ]
+        },
+        "machine_heat_zone_length": { "default_value": 20 },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 203 },
+        "machine_max_feedrate_e": { "default_value": 45 },
+        "machine_max_feedrate_x": { "default_value": 250 },
+        "machine_max_feedrate_y": { "default_value": 250 },
+        "machine_max_feedrate_z": { "default_value": 40 },
+        "machine_min_cool_heat_time_window": { "default_value": 15.0 },
+        "machine_name": { "default_value": "Mark2_for_Ultimaker2" },
+        "machine_nozzle_cool_down_speed": { "default_value": 1.5 },
+        "machine_nozzle_head_distance": { "default_value": 5 },
+        "machine_nozzle_heat_up_speed": { "default_value": 3.5 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "machine_show_variants": { "default_value": true },
+        "machine_start_gcode": { "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 Z0; home all\\nG28 X0 Y0\\nG0 Z20 F2400 ;move the platform to 20mm\\nG92 E0\\nM190 S{material_bed_temperature_layer_0}\\nM109 T0 S{material_standby_temperature, 0}\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nT1 ; move to the 2th head\\nG0 Z20 F2400\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-5.1 F1500 ; retract\\nG1 X90 Z0.01 F5000 ; move away from the prime poop\\nG1 X50 F9000\\nG0 Z20 F2400\\nT0 ; move to the first head\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM104 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 X60 Z0.01 F5000 ; move away from the prime poop\\nG1 X20 F9000\\nM400 ;finish all moves\\nG92 E0\\n;end of startup sequence\\n\"" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 223 },
+        "prime_tower_position_x": { "value": "185" },
+        "prime_tower_position_y": { "value": "160" },
+        "retraction_amount": { "default_value": 5.1 },
+        "retraction_speed": { "default_value": 25 },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "switch_extruder_prime_speed":
+        {
+            "enabled": false,
+            "value": "retraction_prime_speed"
+        },
+        "switch_extruder_retraction_amount":
+        {
+            "enabled": false,
+            "value": "retraction_amount"
+        },
+        "switch_extruder_retraction_speed":
+        {
+            "enabled": false,
+            "value": "retraction_retract_speed"
+        },
+        "switch_extruder_retraction_speeds":
+        {
+            "enabled": false,
+            "value": "retraction_speed"
         }
     }
-}
+}

resources/definitions/SV01.def.json

@@ -1,6 +1,6 @@
 {
     "version": 2,
-    "name": "Sovol-SV01",
+    "name": "Sovol-SV01 (Legacy)",
     "inherits": "fdmprinter",
     "metadata":
     {
@@ -15,7 +15,6 @@
     },
     "overrides":
     {
-        "acceleration_enabled": { "value": false },
         "acceleration_print": { "value": 500 },
         "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
         "acceleration_travel": { "value": 500 },
@@ -38,7 +37,6 @@
         "machine_max_acceleration_e": { "value": 5000 },
         "machine_max_acceleration_x": { "value": 500 },
         "machine_max_acceleration_y": { "value": 500 },
-        "machine_max_acceleration_z": { "value": 100 },
         "machine_max_feedrate_e": { "value": 50 },
         "machine_max_feedrate_x": { "value": 500 },
         "machine_max_feedrate_y": { "value": 500 },
@@ -56,7 +54,6 @@
         "retraction_amount": { "default_value": 3 },
         "retraction_speed": { "default_value": 50 },
         "skin_overlap": { "value": 10.0 },
-        "skirt_brim_speed": { "value": "speed_layer_0" },
         "speed_print": { "value": 50.0 },
         "wall_0_wipe_dist": { "value": 0.0 },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },

resources/definitions/SV02.def.json

@@ -1,6 +1,6 @@
 {
     "version": 2,
-    "name": "Sovol-SV02",
+    "name": "Sovol-SV02 (Legacy)",
     "inherits": "fdmprinter",
     "metadata":
     {
@@ -19,7 +19,6 @@
     },
     "overrides":
     {
-        "acceleration_enabled": { "value": false },
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
         "acceleration_travel_layer_0": { "value": "acceleration_travel" },
@@ -40,11 +39,9 @@
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
         "machine_acceleration": { "value": 500 },
-        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 240 },
         "machine_end_gcode": { "default_value": "M104 S0  ;hotend off\nM140 S0  ;bed off\nG92 E0\nG1 F2000 E-100  ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y240  ;move bed for easy part removal\nM84  ;disable steppers" },
         "machine_extruder_count": { "default_value": 2 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 300 },
         "machine_max_acceleration_e": { "value": 500 },
@@ -55,16 +52,14 @@
         "machine_max_feedrate_x": { "value": 500 },
         "machine_max_feedrate_y": { "value": 500 },
         "machine_max_feedrate_z": { "value": 10 },
-        "machine_max_jerk_e": { "default_value": 5.0 },
         "machine_max_jerk_xy": { "default_value": 5.0 },
         "machine_max_jerk_z": { "default_value": 0.4 },
         "machine_name": { "default_value": "SV02" },
         "machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E5 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" },
         "machine_width": { "default_value": 280 },
         "material_diameter": { "default_value": 1.75 },
-        "material_final_print_temperature": { "value": 195 },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
-        "prime_tower_min_volume": { "value": "((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height'))/2" },
+        "prime_tower_min_volume": { "value": "((reveOrValue('layer_height'))/2" },
         "prime_tower_position_x": { "value": "240" },
         "prime_tower_position_y": { "value": "190" },
         "prime_tower_size": { "value": "30" },
@@ -76,7 +71,6 @@
         "skirt_line_count": { "value": 3 },
         "speed_print": { "default_value": 50 },
         "top_bottom_thickness": { "default_value": 1 },
-        "travel_retract_before_outer_wall": { "default_value": true },
         "wall_0_wipe_dist": { "value": 0.0 }
     }
 }

resources/definitions/SV03.def.json

@@ -1,66 +1,64 @@
-{
-    "version": 2,
-    "name": "Sovol-SV03",
-    "inherits": "fdmprinter",
-    "metadata": {
-        "visible": true,
-        "author": "Sovol",
-        "manufacturer": "Sovol 3D",
-        "file_formats": "text/x-gcode",
-        "has_variants": false,
-        "has_machine_quality": false,
-        "preferred_quality_type": "draft",
-        "machine_extruder_trains": {
-            "0": "SV03_extruder_0"
-        }
-    },
-
-    "overrides": {
-        "machine_name": { "default_value": "SV03" },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_width": { "default_value": 350 },
-        "machine_depth": { "default_value": 350 },
-        "machine_height": { "default_value": 400 },	
-        "machine_max_feedrate_x": { "value": 500 },
-        "machine_max_feedrate_y": { "value": 500 },
-        "machine_max_feedrate_z": { "value": 10 },
-        "machine_max_feedrate_e": { "value": 50 },
-        "machine_max_acceleration_x": { "value": 500 },
-        "machine_max_acceleration_y": { "value": 500 },
-        "machine_max_acceleration_z": { "value": 100 },
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_acceleration": { "value": 500 },
-        "machine_max_jerk_xy": { "value": 10 },
-        "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 },
-        "machine_heated_bed": { "default_value": true },
-        "material_diameter": { "default_value": 1.75 },
-        "acceleration_print": { "value": 500 },
-        "acceleration_travel": { "value": 500 },
-        "acceleration_travel_layer_0": { "value": "acceleration_travel" },
-        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
-        "jerk_print": { "value": 8 },
-        "jerk_travel": { "value": "jerk_print" },
-        "jerk_travel_layer_0": { "value": "jerk_travel" },
-        "acceleration_enabled": { "value": false },
-        "jerk_enabled": { "value": false },
-        "speed_print": { "value": 50.0 } ,
-        "skirt_brim_speed": { "value": "speed_layer_0" },
-        "optimize_wall_printing_order": { "value": "True" },
-        "material_initial_print_temperature": { "value": "material_print_temperature" },
-        "material_final_print_temperature": { "value": "material_print_temperature" },
-        "z_seam_type": { "value": "'back'" },
-        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
-        "infill_pattern": { "value": "'lines'" },
-        "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 },      
-        "retraction_amount": { "default_value": 3},
-        "retraction_speed": { "default_value": 50},
-        "adhesion_type": { "value": "'skirt'" },
-        "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\nG29 ;Automatic Leveling\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 X0 Y240 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" }
-    }
-}
+{
+    "version": 2,
+    "name": "Sovol-SV03 (Legacy)",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Sovol",
+        "manufacturer": "Sovol 3D",
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": false,
+        "has_variants": false,
+        "machine_extruder_trains": { "0": "SV03_extruder_0" },
+        "preferred_quality_type": "draft"
+    },
+    "overrides":
+    {
+        "acceleration_enabled": { "value": false },
+        "acceleration_print": { "value": 500 },
+        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
+        "acceleration_travel": { "value": 500 },
+        "acceleration_travel_layer_0": { "value": "acceleration_travel" },
+        "adhesion_type": { "value": "'skirt'" },
+        "infill_before_walls": { "value": false },
+        "infill_overlap": { "value": 30.0 },
+        "infill_pattern": { "value": "'lines'" },
+        "infill_wipe_dist": { "value": 0.0 },
+        "jerk_enabled": { "value": false },
+        "jerk_print": { "value": 8 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "machine_acceleration": { "value": 500 },
+        "machine_depth": { "default_value": 350 },
+        "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 X0 Y240 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" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 400 },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 100 },
+        "machine_max_feedrate_e": { "value": 50 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 10 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_name": { "default_value": "SV03" },
+        "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\nG29 ;Automatic Leveling\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_width": { "default_value": 350 },
+        "material_diameter": { "default_value": 1.75 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "default_value": 3 },
+        "retraction_speed": { "default_value": 50 },
+        "skin_overlap": { "value": 10.0 },
+        "skirt_brim_speed": { "value": "speed_layer_0" },
+        "speed_print": { "value": 50.0 },
+        "wall_0_wipe_dist": { "value": 0.0 },
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
+        "z_seam_type": { "value": "'back'" }
+    }
+}

resources/definitions/abax_pri3.def.json

@@ -1,60 +1,31 @@
 {
-    "name": "Abax PRi3",
     "version": 2,
+    "name": "Abax PRi3",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "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"
-        }
+        "machine_extruder_trains": { "0": "abax_pri3_extruder_0" }
     },
-    "overrides": {
-        "machine_start_gcode": {
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --"
-        },
-        "machine_width": {
-            "default_value": 225
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 200
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        }
+    "overrides":
+    {
+        "layer_height": { "default_value": 0.2 },
+        "layer_height_0": { "default_value": 0.2 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
+        "machine_gcode_flavor": { "default_value": "RepRap" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 200 },
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --" },
+        "machine_width": { "default_value": 225 },
+        "speed_print": { "default_value": 40 },
+        "support_enable": { "default_value": true },
+        "top_bottom_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" }
     }
-}
+}

resources/definitions/abax_pri5.def.json

@@ -1,60 +1,31 @@
 {
-    "name": "Abax PRi5",
     "version": 2,
+    "name": "Abax PRi5",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "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"
-        }
+        "machine_extruder_trains": { "0": "abax_pri5_extruder_0" }
     },
-    "overrides": {
-        "machine_start_gcode": {
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --"
-        },
-        "machine_width": {
-            "default_value": 310
-        },
-        "machine_depth": {
-            "default_value": 310
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        }
+    "overrides":
+    {
+        "layer_height": { "default_value": 0.2 },
+        "layer_height_0": { "default_value": 0.2 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 310 },
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
+        "machine_gcode_flavor": { "default_value": "RepRap" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 300 },
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --" },
+        "machine_width": { "default_value": 310 },
+        "speed_print": { "default_value": 40 },
+        "support_enable": { "default_value": true },
+        "top_bottom_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" }
     }
-}
+}

resources/definitions/abax_titan.def.json

@@ -1,59 +1,30 @@
 {
-    "name": "Abax Titan",
     "version": 2,
+    "name": "Abax Titan",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Abax 3D Technologies",
         "manufacturer": "Abax 3D Technologies",
         "file_formats": "text/x-gcode",
-        "machine_extruder_trains":
-        {
-            "0": "abax_titan_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "abax_titan_extruder_0" }
     },
-    "overrides": {
-        "machine_start_gcode": {
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --"
-        },
-        "machine_width": {
-            "default_value": 310
-        },
-        "machine_depth": {
-            "default_value": 310
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        }
+    "overrides":
+    {
+        "layer_height": { "default_value": 0.2 },
+        "layer_height_0": { "default_value": 0.2 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 310 },
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
+        "machine_gcode_flavor": { "default_value": "RepRap" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 300 },
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --" },
+        "machine_width": { "default_value": 310 },
+        "speed_print": { "default_value": 40 },
+        "support_enable": { "default_value": true },
+        "top_bottom_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" }
     }
-}
+}

resources/definitions/alfawise_u20.def.json

@@ -1,72 +1,35 @@
 {
-    "name": "Alfawise U20",
     "version": 2,
+    "name": "Alfawise U20",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Samuel Pinches",
         "manufacturer": "Alfawise",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fast",
-        "machine_extruder_trains":
-        {
-            "0": "alfawise_u20_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "alfawise_u20_extruder_0" },
+        "preferred_quality_type": "fast"
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "Alfawise U20"
-        },
-        "machine_start_gcode": {
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28                     ;home all axis\nG92 E0                  ;zero the extruded length\nG1 Z1 F1000             ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0                  ;zero the extruded length again\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "default_value": "; -- END GCODE --\nM104 S0                 ;turn off nozzle heater\nM140 S0                 ;turn off bed heater\nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament slightly\nG90                     ;set to absolute positioning\nG28 X0                  ;move to the X-axis origin (Home)\nG0 Y280 F600            ;bring the bed to the front for easy print removal\nM84                     ;turn off stepper motors\n; -- end of END GCODE --"
-        },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "gantry_height": {
-            "value": "10"
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },    
-        "material_diameter": {
-            "default_value": 1.75
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1.2"
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        },
-        "retraction_enable": {
-            "default_value": true
-        },
-        "retraction_amount": {
-            "default_value": 5
-        },
-        "retraction_speed": {
-            "default_value": 45
-        }
+    "overrides":
+    {
+        "gantry_height": { "value": "10" },
+        "layer_height_0": { "default_value": 0.2 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;turn off nozzle heater\nM140 S0                 ;turn off bed heater\nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament slightly\nG90                     ;set to absolute positioning\nG28 X0                  ;move to the X-axis origin (Home)\nG0 Y280 F600            ;bring the bed to the front for easy print removal\nM84                     ;turn off stepper motors\n; -- end of END GCODE --" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 400 },
+        "machine_name": { "default_value": "Alfawise U20" },
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28                     ;home all axis\nG92 E0                  ;zero the extruded length\nG1 Z1 F1000             ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0                  ;zero the extruded length again\n; -- end of START GCODE --" },
+        "machine_width": { "default_value": 300 },
+        "material_diameter": { "default_value": 1.75 },
+        "retraction_amount": { "default_value": 5 },
+        "retraction_enable": { "default_value": true },
+        "retraction_speed": { "default_value": 45 },
+        "speed_print": { "default_value": 40 },
+        "support_enable": { "default_value": true },
+        "wall_thickness": { "value": "1.2" }
     }
-}
+}

resources/definitions/alfawise_u30.def.json

@@ -1,59 +1,54 @@
 {
-    "name": "Alfawise U30",
     "version": 2,
+    "name": "Alfawise U30",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Nicolas Nussbaum",
         "manufacturer": "Alfawise",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fast",
-        "machine_extruder_trains":
-        {
-            "0": "alfawise_u30_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "alfawise_u30_extruder_0" },
+        "preferred_quality_type": "fast"
     },
-    "overrides": {
-        "machine_name": { "default_value": "Alfawise U30" },
-        "machine_start_gcode": {
-            "default_value": "; -- START GCODE --\nG21        ;metric values\nG90        ;absolute positioning\nM82        ;set extruder to absolute mode\nM107       ;start with the fan off\nG28 X0 Y0  ;move X/Y to min endstops\nG28 Z0     ;move Z to min endstops\nG1 Z1 F1000             ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0                  ;zero the extruded length again\nG1 F80\n;Put printing message on LCD screen\nM117 Printing...\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "default_value": "; -- END GCODE --\nM104 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91                                    ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F80 ;move Z up a bit and retract filament even more\nG28 X0 Y0                              ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning\nM107       ;turn the fan off; -- end of END GCODE --"
-        },
-        "material_diameter": { "default_value": 1.75 },
-        "layer_height_0": { "default_value": 0.2 },
-        "wall_thickness": { "value": "1.2" },
-        "speed_print": { "default_value": 40 },
-        "support_enable": { "default_value": true },
-        "retraction_enable": { "default_value": true },
-        "retraction_amount": { "default_value": 5 },
-        "retraction_speed": { "default_value": 45 },
+    "overrides":
+    {
         "gantry_height": { "value": "25" },
-        "machine_width": { "default_value": 220 },
-        "machine_height": { "default_value": 250 },
-        "machine_depth": { "default_value": 220 },
+        "layer_height_0": { "default_value": 0.2 },
+        "machine_acceleration": { "default_value": 300 },
         "machine_center_is_zero": { "default_value": false },
-        "machine_heated_bed": {	"default_value": true },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91                                    ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F80 ;move Z up a bit and retract filament even more\nG28 X0 Y0                              ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning\nM107       ;turn the fan off; -- end of END GCODE --" },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_max_feedrate_x": { "default_value": 200 },
-        "machine_max_feedrate_y": { "default_value": 200 },
-        "machine_max_feedrate_z": { "default_value": 5 },
-        "machine_max_feedrate_e": { "default_value": 100 },
-        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 250 },
+        "machine_max_acceleration_e": { "default_value": 3000 },
         "machine_max_acceleration_x": { "default_value": 500 },
         "machine_max_acceleration_y": { "default_value": 500 },
         "machine_max_acceleration_z": { "default_value": 10 },
-        "machine_max_acceleration_e": { "default_value": 3000 },
-        "machine_acceleration": { "default_value": 300 },
+        "machine_max_feedrate_e": { "default_value": 100 },
+        "machine_max_feedrate_x": { "default_value": 200 },
+        "machine_max_feedrate_y": { "default_value": 200 },
+        "machine_max_feedrate_z": { "default_value": 5 },
+        "machine_max_jerk_e": { "default_value": 5.0 },
         "machine_max_jerk_xy": { "default_value": 20.0 },
         "machine_max_jerk_z": { "default_value": 0.4 },
-        "machine_max_jerk_e": { "default_value": 5.0 },
+        "machine_name": { "default_value": "Alfawise U30" },
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21        ;metric values\nG90        ;absolute positioning\nM82        ;set extruder to absolute mode\nM107       ;start with the fan off\nG28 X0 Y0  ;move X/Y to min endstops\nG28 Z0     ;move Z to min endstops\nG1 Z1 F1000             ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0                  ;zero the extruded length again\nG1 F80\n;Put printing message on LCD screen\nM117 Printing...\n; -- end of START GCODE --" },
+        "machine_steps_per_mm_e": { "default_value": 93 },
         "machine_steps_per_mm_x": { "default_value": 80 },
         "machine_steps_per_mm_y": { "default_value": 80 },
         "machine_steps_per_mm_z": { "default_value": 400 },
-        "machine_steps_per_mm_e": { "default_value": 93 },
+        "machine_width": { "default_value": 220 },
+        "material_diameter": { "default_value": 1.75 },
+        "retraction_amount": { "default_value": 5 },
+        "retraction_enable": { "default_value": true },
+        "retraction_speed": { "default_value": 45 },
+        "skirt_brim_minimal_length": { "default_value": 250 },
         "skirt_line_count": { "default_value": 1 },
-        "skirt_brim_minimal_length": { "default_value": 250 }
+        "speed_print": { "default_value": 40 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "support_enable": { "default_value": true },
+        "wall_thickness": { "value": "1.2" }
     }
-}
+}

resources/definitions/alya3dp.def.json

@@ -9,41 +9,103 @@
         "manufacturer": "Kati Hal ARGE",
         "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", "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",
+        "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"
+        ],
         "has_machine_quality": true,
         "has_materials": true,
         "has_variants": false,
-        "supports_usb_connection": false,
-        "machine_extruder_trains":
-        {
-            "0": "alya3dp_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "alya3dp_extruder_0" },
+        "platform_offset": [
+            -60,
+            -45,
+            75
+        ],
+        "preferred_material": "generic_pla",
+        "supports_usb_connection": false
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "adhesion_type":
+        {
+            "default_value": "raft",
+            "options":
+            {
+                "brim": "Brim",
+                "none": "None",
+                "raft": "Raft"
+            }
+        },
+        "gantry_height": { "value": "55" },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 100 },
+        "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [75, 18],
+                [18, 18],
+                [18, 35],
+                [75, 35]
+            ]
+        },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 133 },
         "machine_name": { "default_value": "ALYA 3DP" },
-        "machine_heated_bed":          {   "default_value": false            },
-        "machine_width":               {   "default_value": 100             },
-        "machine_height":              {   "default_value": 133             },
-        "machine_depth":               {   "default_value": 100             },
-        "machine_center_is_zero":      {   "default_value": false           },
-        "gantry_height":               {   "value": "55"},
-        "retraction_amount":           {   "default_value": 1.5 },
-        "support_enable":              {   "default_value": true},
-        "machine_head_with_fans_polygon": {
-            "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]]
-        },
-        "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"},  "default_value": "raft"},
-        "machine_gcode_flavor":        {   "default_value": "RepRap (Marlin/Sprinter)"      },
-        "machine_start_gcode":
-        {
-            "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0  ;move X Y to endstops \n G28 Z0     ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0                  ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n  G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen"
-        },
-        "machine_end_gcode":
-        {
-            "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}"
-        }
+        "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0  ;move X Y to endstops \n G28 Z0     ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0                  ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n  G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" },
+        "machine_width": { "default_value": 100 },
+        "retraction_amount": { "default_value": 1.5 },
+        "support_enable": { "default_value": true }
     }
 }

resources/definitions/alyanx3dp.def.json

@@ -9,41 +9,103 @@
         "manufacturer": "Kati Hal ARGE",
         "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", "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",
+        "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"
+        ],
         "has_machine_quality": true,
         "has_materials": true,
         "has_variants": false,
-        "supports_usb_connection": false,
-        "machine_extruder_trains":
-        {
-            "0": "alya3dp_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "alya3dp_extruder_0" },
+        "platform_offset": [
+            -104,
+            0,
+            93
+        ],
+        "preferred_material": "generic_pla",
+        "supports_usb_connection": false
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "adhesion_type":
+        {
+            "default_value": "raft",
+            "options":
+            {
+                "brim": "Brim",
+                "none": "None",
+                "raft": "Raft"
+            }
+        },
+        "gantry_height": { "value": "55" },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 160 },
+        "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [75, 18],
+                [18, 18],
+                [18, 35],
+                [75, 35]
+            ]
+        },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 170 },
         "machine_name": { "default_value": "ALYA NX 3DP" },
-        "machine_heated_bed":          {   "default_value": false            },
-        "machine_width":               {   "default_value": 180             },
-        "machine_height":              {   "default_value": 170             },
-        "machine_depth":               {   "default_value": 160             },
-        "machine_center_is_zero":      {   "default_value": false           },
-        "gantry_height":               {   "value": "55"},
-        "retraction_amount":           {   "default_value": 1.5 },
-        "support_enable":              {   "default_value": true},
-        "machine_head_with_fans_polygon": {
-            "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]]
-        },
-        "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"},  "default_value": "raft"},
-        "machine_gcode_flavor":        {   "default_value": "RepRap (Marlin/Sprinter)"      },
-        "machine_start_gcode":
-        {
-            "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0  ;move X Y to endstops \n G28 Z0     ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0                  ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n  G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen"
-        },
-        "machine_end_gcode":
-        {
-            "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}"
-        }
+        "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0  ;move X Y to endstops \n G28 Z0     ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0                  ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n  G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" },
+        "machine_width": { "default_value": 180 },
+        "retraction_amount": { "default_value": 1.5 },
+        "support_enable": { "default_value": true }
     }
 }

resources/definitions/anet3d.def.json

@@ -2,136 +2,120 @@
     "version": 2,
     "name": "anet3d",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
+        "visible": false,
         "author": "Tiger.He",
         "manufacturer": "Anet",
-        "visible": false,
         "file_formats": "text/x-gcode",
-        "first_start_actions": ["MachineSettingsAction"],
-        
-        "preferred_variant_name": "0.4mm Nozzle",
-        "preferred_quality_type": "standard",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" },
         "preferred_material": "generic_pla",
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle"
     },
-    "overrides": {
-        "machine_max_feedrate_x": { "value": 500 },
-        "machine_max_feedrate_y": { "value": 500 },
-        "machine_max_feedrate_z": { "value": 10 },
-        "machine_max_feedrate_e": { "value": 50 },
-
-        "machine_max_acceleration_x": { "value": 500 },
-        "machine_max_acceleration_y": { "value": 500 },
-        "machine_max_acceleration_z": { "value": 100 },
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_acceleration": { "value": 500 },
-
-        "machine_max_jerk_xy": { "value": 10 },
-        "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 },
-
-        "machine_heated_bed": { "default_value": true },
-
-        "material_diameter": { "default_value": 1.75 },
-
+    "overrides":
+    {
+        "acceleration_enabled": { "value": true },
         "acceleration_print": { "value": 1000 },
+        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
         "acceleration_travel": { "value": 1000 },
         "acceleration_travel_layer_0": { "value": "acceleration_travel" },
-        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
-
+        "adaptive_layer_height_variation": { "value": 0.04 },
+        "adaptive_layer_height_variation_step": { "value": 0.04 },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "value": 10 },
+        "extruder_prime_pos_x":
+        {
+            "maximum_value": "machine_width",
+            "minimum_value": "0"
+        },
+        "extruder_prime_pos_y":
+        {
+            "maximum_value": "machine_depth",
+            "minimum_value": "0"
+        },
+        "fill_outline_gaps": { "value": false },
+        "gantry_height": { "value": "0" },
+        "infill_before_walls": { "value": true },
+        "infill_overlap": { "value": 30.0 },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "infill_wipe_dist": { "value": 0 },
+        "jerk_enabled": { "value": false },
         "jerk_print": { "value": 30.0 },
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
-
-        "acceleration_enabled": { "value": true },
-        "jerk_enabled": { "value": false },
-
-        "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print * 2" },
-
-        "speed_wall_x": { "value": "speed_wall" },
-        "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_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" },
-        "speed_support_interface": { "value": "speed_print" },
-        "speed_z_hop": { "value": 5 },
-
-        "skirt_brim_speed": { "value": "speed_layer_0" },
-
-        "optimize_wall_printing_order": { "value": true },
-
-        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "machine_acceleration": { "value": 500 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 100 },
+        "machine_max_feedrate_e": { "value": 50 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 10 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": true },
+        "material_bed_temperature": { "minimum_value": "0" },
+        "material_diameter": { "default_value": 1.75 },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-
-        "z_seam_type": { "value": "'back'" },
-        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
-
-        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
-        "infill_before_walls": { "value": true },
-        "infill_overlap": { "value": 30.0 },
-        "skin_overlap": { "value": 10.0 },
-        "infill_wipe_dist": { "value": 0 },
-        "wall_0_wipe_dist": { "value": 0.2 },
-
-        "fill_outline_gaps": { "value": false },
-
-        "retraction_speed":
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_print_temperature": { "minimum_value": "0" },
+        "material_standby_temperature": { "minimum_value": "0" },
+        "meshfix_maximum_resolution": { "value": "0.25" },
+        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
+        "optimize_wall_printing_order": { "value": true },
+        "relative_extrusion":
         {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200
+            "enabled": false,
+            "value": false
+        },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
+        "retraction_combing_max_distance": { "value": 30 },
+        "retraction_count_max": { "value": 100 },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 1 },
+        "retraction_min_travel": { "value": 1.5 },
+        "retraction_prime_speed":
+        {
+            "maximum_value": 200,
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
         },
         "retraction_retract_speed":
         {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200
+            "maximum_value": 200,
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
         },
-        "retraction_prime_speed":
+        "retraction_speed":
         {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200
+            "maximum_value": 200,
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
         },
-
-        "retraction_hop": { "value": 1 },
-        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
-        "retraction_combing_max_distance": { "value": 30 },
+        "skin_overlap": { "value": 10.0 },
+        "skirt_brim_speed": { "value": "speed_layer_0" },
+        "speed_infill": { "value": "speed_print * 2" },
+        "speed_layer_0": { "value": "speed_print / 2" },
+        "speed_prime_tower": { "value": "speed_print" },
+        "speed_print": { "value": 50.0 },
+        "speed_roofing": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_print" },
+        "speed_support_interface": { "value": "speed_print" },
+        "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
+        "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_z_hop": { "value": 5 },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
         "travel_avoid_other_parts": { "value": true },
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "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_min_layer_time": { "value": 10 },
-
-        "adaptive_layer_height_variation": { "value": 0.04 },
-        "adaptive_layer_height_variation_step": { "value": 0.04 },
-
-        "meshfix_maximum_resolution": { "value": "0.25" },
-        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
-
-        "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
-        "wall_thickness": {"value": "line_width * 2" },
-        
-        "material_print_temperature": {"minimum_value": "0"},
-        "material_bed_temperature": {"minimum_value": "0"},
-        "material_standby_temperature": {"minimum_value": "0"},
-        
-        "extruder_prime_pos_y":{"minimum_value": "0","maximum_value": "machine_depth"},
-        "extruder_prime_pos_x":{"minimum_value": "0","maximum_value": "machine_width"},
-        "relative_extrusion":{"value": false, "enabled": false},
-        
-        "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"}
+        "wall_0_wipe_dist": { "value": 0.2 },
+        "wall_thickness": { "value": "line_width * 2" },
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
+        "z_seam_type": { "value": "'back'" }
     }
-}
+}

resources/definitions/anet3d_a2.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A2",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 220 },
         "machine_name": { "default_value": "Anet A2" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 220
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 220 }
     }
-}
+}

resources/definitions/anet3d_a2_plus.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A2 Plus",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 270 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 220 },
         "machine_name": { "default_value": "Anet A2 Plus" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 270
-        },
-        "machine_height": {
-            "default_value": 220
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 220 }
     }
-}
+}

resources/definitions/anet3d_a6.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A6",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 250 },
         "machine_name": { "default_value": "Anet A6" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 220 }
     }
-}
+}

resources/definitions/anet3d_a8.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A8",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 240 },
         "machine_name": { "default_value": "Anet A8" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 240
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 220 }
     }
-}
+}

resources/definitions/anet3d_a8_plus.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A8 Plus",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 350 },
         "machine_name": { "default_value": "Anet A8 Plus" },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 350
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 300 }
     }
-}
+}

resources/definitions/anet3d_e10.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet E10",
     "inherits": "anet3d",
-    "metadata": {
-        "visible": true,        
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+    "metadata":
+    {
+        "visible": true,
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 270 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 300 },
         "machine_name": { "default_value": "Anet E10" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 270
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 220 }
     }
-}
+}

resources/definitions/anet3d_e12.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet E12",
     "inherits": "anet3d",
-    "metadata": {
-        "visible": true,        
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+    "metadata":
+    {
+        "visible": true,
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 400 },
         "machine_name": { "default_value": "Anet E12" },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 300 }
     }
-}
+}

resources/definitions/anet3d_e16.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet E16",
     "inherits": "anet3d",
-    "metadata": {
-        "visible": true,        
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+    "metadata":
+    {
+        "visible": true,
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 400 },
         "machine_name": { "default_value": "Anet E16" },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 300 }
     }
-}
+}

resources/definitions/anet3d_et4.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET4",
     "inherits": "anet3d",
-    "metadata": {
-        "visible": true,        
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+    "metadata":
+    {
+        "visible": true,
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 250 },
         "machine_name": { "default_value": "Anet ET4" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 220 }
     }
-}
+}

resources/definitions/anet3d_et4_pro.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET4 Pro",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 250 },
         "machine_name": { "default_value": "Anet ET4 Pro" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 220 }
     }
-}
+}

resources/definitions/anet3d_et4_x.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET4 X",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 250 },
         "machine_name": { "default_value": "Anet ET4 X" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 220 }
     }
-}
+}

resources/definitions/anet3d_et5.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET5",
     "inherits": "anet3d",
-    "metadata": {
-        "visible": true,        
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+    "metadata":
+    {
+        "visible": true,
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 400 },
         "machine_name": { "default_value": "Anet ET5" },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 300 }
     }
-}
+}

resources/definitions/anet3d_et5_x.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET5 X",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains":
-        {
-            "0": "anet3d_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
-    "overrides": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 400 },
         "machine_name": { "default_value": "Anet ET5 X" },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
+        "machine_width": { "default_value": 300 }
     }
-}
+}

resources/definitions/ankermake_m5.def.json

@@ -17,42 +17,83 @@
     },
     "overrides":
     {
-        "acceleration_print": { "value": "2500" },
+        "acceleration_enabled": { "value": "true" },
+        "acceleration_infill": { "maximum_value_warning": "2500" },
+        "acceleration_layer_0": { "maximum_value_warning": "2500" },
+        "acceleration_prime_tower": { "maximum_value_warning": "2500" },
+        "acceleration_print":
+        {
+            "maximum_value_warning": "2500",
+            "value": "2500"
+        },
+        "acceleration_print_layer_0": { "maximum_value_warning": "2500" },
+        "acceleration_roofing": { "maximum_value_warning": "2500" },
+        "acceleration_skirt_brim": { "maximum_value_warning": "2500" },
+        "acceleration_support": { "maximum_value_warning": "2500" },
+        "acceleration_support_bottom": { "maximum_value_warning": "2500" },
+        "acceleration_support_infill": { "maximum_value_warning": "2500" },
+        "acceleration_support_interface": { "maximum_value_warning": "2500" },
+        "acceleration_support_roof": { "maximum_value_warning": "2500" },
+        "acceleration_topbottom": { "maximum_value_warning": "2500" },
+        "acceleration_travel":
+        {
+            "maximum_value_warning": "2500",
+            "value": "acceleration_print"
+        },
+        "acceleration_travel_layer_0":
+        {
+            "maximum_value_warning": "2500",
+            "value": "acceleration_travel"
+        },
+        "acceleration_wall": { "maximum_value_warning": "2500" },
+        "acceleration_wall_0": { "maximum_value_warning": "2500" },
+        "acceleration_wall_x": { "maximum_value_warning": "2500" },
         "adhesion_type": { "default_value": "skirt" },
         "cool_min_layer_time": { "value": 6 },
         "cool_min_speed": { "value": 30 },
         "gantry_height": { "value": 25 },
+        "hole_xy_offset": { "value": 0.2 },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density >= 25 else 'grid'" },
+        "infill_sparse_density": { "value": 25 },
         "machine_depth": { "default_value": 235 },
-        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" },
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 250 },
         "machine_name": { "default_value": "AnkerMake M5" },
         "machine_start_gcode": { "default_value": "M104 S{material_print_temperature_layer_0} ; set final nozzle temp\nM190 S{material_bed_temperature_layer_0} ; set and wait for nozzle temp to stabilize\nM109 S{material_print_temperature_layer_0} ; wait for nozzle temp to stabilize\nG28 ;Home\nG1 E10 F3600; push out retracted filament(fix for over retraction after prime)" },
         "machine_width": { "default_value": 235 },
         "material_bed_temperature": { "maximum_value_warning": "110" },
-        "material_bed_temperature_layer_0":
-        {
-            "maximum_value_warning": "110",
-            "value": "material_bed_temperature + 5"
-        },
+        "material_bed_temperature_layer_0": { "maximum_value_warning": "110" },
         "material_diameter": { "default_value": 1.75 },
-        "material_flow_layer_0": { "value": 120 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_flow_layer_0": { "value": 115 },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_print_temperature": { "maximum_value_warning": "260" },
         "material_print_temperature_layer_0":
         {
-            "maximum_value_warning": "260",
+            "maximum_value_warning": "270",
             "value": "material_print_temperature + 5"
         },
+        "minimum_interface_area": { "value": 10 },
+        "minimum_support_area": { "value": 2 },
         "retraction_amount": { "default_value": 1.5 },
-        "retraction_combing": { "value": "infill" },
-        "retraction_speed": { "default_value": 70 },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" },
+        "retraction_hop": { "value": 0.2 },
+        "retraction_speed": { "default_value": 60 },
+        "skin_material_flow": { "value": 97 },
         "skin_monotonic": { "default_value": true },
+        "skirt_line_count": { "value": 3 },
+        "small_hole_max_size": { "value": 10 },
         "speed_infill": { "maximum_value_warning": 255 },
         "speed_print":
         {
             "maximum_value_warning": 255,
             "value": 250.0
         },
+        "speed_support": { "maximum_value_warning": 255 },
+        "speed_support_bottom": { "maximum_value_warning": 255 },
+        "speed_support_infill": { "maximum_value_warning": 255 },
+        "speed_support_interface": { "maximum_value_warning": 255 },
+        "speed_support_roof": { "maximum_value_warning": 255 },
         "speed_topbottom": { "value": 150.0 },
         "speed_travel": { "value": 250.0 },
         "speed_wall":
@@ -64,6 +105,22 @@
         {
             "maximum_value_warning": 255,
             "value": 250.0
-        }
+        },
+        "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 /layer_height)))" },
+        "support_brim_width": { "value": 4.0 },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
+        "support_interface_density": { "value": 33.333 },
+        "support_interface_enable": { "value": true },
+        "support_interface_pattern": { "value": "'grid'" },
+        "support_interface_skip_height": { "value": 0.2 },
+        "support_roof_enable": { "value": true },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
+        "support_z_distance": { "value": "layer_height * 2" },
+        "top_bottom_thickness": { "value": "layer_height * 4" },
+        "wall_overhang_angle": { "value": 55 },
+        "wall_overhang_speed_factor": { "value": 55 },
+        "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" }
     }
 }

resources/definitions/anycubic_4max.def.json

@@ -9,48 +9,15 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_4max_platform.3mf",
-        "has_materials": true,
-        "quality_definition": "anycubic_4max",
         "has_machine_quality": true,
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_4max_extruder_0" },
         "preferred_quality_type": "normal",
-        "machine_extruder_trains":
-        {
-            "0": "anycubic_4max_extruder_0"
-        }
+        "quality_definition": "anycubic_4max"
     },
-
     "overrides":
     {
-        "machine_name": { "default_value": "Anycubic 4Max" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_width": { "default_value": 220 },
-        "machine_height": {"default_value": 300 },
-        "machine_depth": { "default_value": 220 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_max_feedrate_x": { "default_value": 300 },
-        "machine_max_feedrate_y": { "default_value": 300 },
-        "machine_max_feedrate_z": { "default_value": 10 },
-        "machine_acceleration": { "default_value": 1500 },
-        "machine_max_acceleration_x": { "default_value": 1500 },
-        "machine_max_acceleration_y": { "default_value": 1500 },
-        "machine_max_acceleration_z": { "default_value": 100 },
-        "machine_max_jerk_xy": { "default_value": 11.0 },
-        "machine_max_jerk_z": { "default_value": 0.4 }, 
-        "machine_max_jerk_e": { "default_value": 11.0 },
         "acceleration_enabled": { "value": true },
-        "jerk_enabled": { "value": "True" },
-        "jerk_layer_0": { "value": "jerk_topbottom" },
-        "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
-        "jerk_print": { "value": "11" },
-        "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
-        "jerk_support_interface": { "value": "jerk_topbottom" },
-        "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
-        "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
-        "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
-
-        "gantry_height": { "value": "25.0" },
-        "skin_overlap": { "value": "10" },
-
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "900" },
@@ -60,7 +27,41 @@
         "acceleration_travel": { "value": "acceleration_print" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
-
+        "adhesion_type": { "default_value": "skirt" },
+        "gantry_height": { "value": "25.0" },
+        "infill_before_walls": { "value": false },
+        "infill_pattern": { "value": "'zigzag'" },
+        "jerk_enabled": { "value": "True" },
+        "jerk_layer_0": { "value": "jerk_topbottom" },
+        "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_print": { "value": "11" },
+        "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_support_interface": { "value": "jerk_topbottom" },
+        "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
+        "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
+        "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
+        "machine_acceleration": { "default_value": 1500 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 300 },
+        "machine_max_acceleration_x": { "default_value": 1500 },
+        "machine_max_acceleration_y": { "default_value": 1500 },
+        "machine_max_acceleration_z": { "default_value": 100 },
+        "machine_max_feedrate_x": { "default_value": 300 },
+        "machine_max_feedrate_y": { "default_value": 300 },
+        "machine_max_feedrate_z": { "default_value": 10 },
+        "machine_max_jerk_e": { "default_value": 11.0 },
+        "machine_max_jerk_xy": { "default_value": 11.0 },
+        "machine_max_jerk_z": { "default_value": 0.4 },
+        "machine_name": { "default_value": "Anycubic 4Max" },
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5" },
+        "machine_width": { "default_value": 220 },
+        "material_bed_temperature": { "maximum_value": "150" },
+        "material_bed_temperature_layer_0": { "maximum_value": "150" },
+        "skin_overlap": { "value": "10" },
         "speed_layer_0": { "value": "20" },
         "speed_print": { "value": "40" },
         "speed_support": { "value": "speed_wall_0" },
@@ -69,17 +70,6 @@
         "speed_travel": { "value": "60" },
         "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" },
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
-        "speed_wall_x": { "value": "speed_wall" },
-
-        "infill_pattern": {"value": "'zigzag'" },
-        "infill_before_walls": {"value": false },
-
-        "adhesion_type": { "default_value": "skirt" },
-        "material_bed_temperature": { "maximum_value": "150" },
-        "material_bed_temperature_layer_0": { "maximum_value": "150" },
-
-        "machine_gcode_flavor":{"default_value": "RepRap (Marlin/Sprinter)"},
-        "machine_start_gcode":{"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5"},
-        "machine_end_gcode":{"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"}
+        "speed_wall_x": { "value": "speed_wall" }
     }
-}
+}

resources/definitions/anycubic_chiron.def.json

@@ -9,70 +9,35 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_chiron_platform.obj",
-        "platform_texture": "anycubic-chiron.png",
-        "has_materials": true,
-        "preferred_material": "generic_pla",
+        "firmware_file": "MarlinChiron.hex",
         "has_machine_quality": true,
-        "quality_definition": "anycubic_chiron",
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_chiron_extruder_0" },
+        "platform_texture": "anycubic-chiron.png",
+        "preferred_material": "generic_pla",
         "preferred_quality_type": "normal",
-        "machine_extruder_trains":
-        {
-            "0": "anycubic_chiron_extruder_0"
-        },
-        "firmware_file": "MarlinChiron.hex"
+        "quality_definition": "anycubic_chiron"
     },
-
     "overrides":
     {
-        "machine_name":
-        {
-            "default_value": "Anycubic Chiron"
-        },
-        "machine_heated_bed":
-        {
-            "default_value": true
-        },
-        "machine_width":
-        {
-            "default_value": 400
-        },
-        "machine_height":
-        {
-            "default_value": 450
-        },
-        "machine_depth":
-        {
-            "default_value": 400
-        },
-        "machine_center_is_zero":
-        {
-            "default_value": false
-        },
-        "gantry_height":
-        {
-            "value": "35"
-        },
+        "gantry_height": { "value": "35" },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 400 },
+        "machine_end_gcode": { "default_value": "G91 ;Change to relative positioning mode for filament retraction and nozzle lifting\nG1 F200 E-4;Retract the filament a bit before lifting the nozzle\nG1 F1000 Z5;Lift nozzle 5mm\nG90 ;Change to absolute positioning mode to prepare for part rermoval\nG1 X0 Y400 ;Move the print to max y pos for part rermoval\nM104 S0 ; Turn off hotend\nM106 S0 ; Turn off cooling fan\nM140 S0 ; Turn off bed\nM84 ; Disable motors\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_head_with_fans_polygon":
         {
-            "default_value":
-            [
+            "default_value": [
                 [-45, 50],
                 [-45, -45],
                 [45, 50],
                 [45, -45]
             ]
         },
-        "machine_gcode_flavor":
-        {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode":
-        {
-            "default_value": "M107 ;Start with the fan off\nG21 ;Set units to millimeters\nG91 ;Change to relative positioning mode for retract filament and nozzle lifting\nG1 F200 E-3 ;Retract 3mm filament for a clean start\nG92 E0 ;Zero the extruded length\nG1 F1000 Z5 ;Lift the nozzle 5mm before homing axes\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode too\nG28 X0 Y0 ;First move X/Y to min endstops\nG28 Z0 ;Then move Z to min endstops\nG1 F1000 Z15 ;After homing lift the nozzle 15mm before start printing\n"
-        },
-        "machine_end_gcode":
-        {
-            "default_value": "G91 ;Change to relative positioning mode for filament retraction and nozzle lifting\nG1 F200 E-4;Retract the filament a bit before lifting the nozzle\nG1 F1000 Z5;Lift nozzle 5mm\nG90 ;Change to absolute positioning mode to prepare for part rermoval\nG1 X0 Y400 ;Move the print to max y pos for part rermoval\nM104 S0 ; Turn off hotend\nM106 S0 ; Turn off cooling fan\nM140 S0 ; Turn off bed\nM84 ; Disable motors\n"
-        }
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 450 },
+        "machine_name": { "default_value": "Anycubic Chiron" },
+        "machine_start_gcode": { "default_value": "M107 ;Start with the fan off\nG21 ;Set units to millimeters\nG91 ;Change to relative positioning mode for retract filament and nozzle lifting\nG1 F200 E-3 ;Retract 3mm filament for a clean start\nG92 E0 ;Zero the extruded length\nG1 F1000 Z5 ;Lift the nozzle 5mm before homing axes\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode too\nG28 X0 Y0 ;First move X/Y to min endstops\nG28 Z0 ;Then move Z to min endstops\nG1 F1000 Z15 ;After homing lift the nozzle 15mm before start printing\n" },
+        "machine_width": { "default_value": 400 }
     }
-}
+}

resources/definitions/anycubic_i3_mega.def.json

@@ -9,56 +9,22 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_i3_mega_platform.3mf",
-        "has_materials": true,
         "has_machine_quality": true,
-        "preferred_quality_type": "normal",
-        "machine_extruder_trains":
-        {
-            "0": "anycubic_i3_mega_extruder_0"
-        }
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_i3_mega_extruder_0" },
+        "preferred_quality_type": "normal"
     },
-
     "overrides":
     {
-        "machine_name":
-        {
-            "default_value": "Anycubic i3 Mega"
-        },
-        "machine_heated_bed":
-        {
-            "default_value": true
-        },
-        "machine_width":
-        {
-            "default_value": 210
-        },
-        "machine_height":
-        {
-            "default_value": 205
-        },
-        "machine_depth":
-        {
-            "default_value": 210
-        },
-        "machine_center_is_zero":
-        {
-            "default_value": false
-        },
-        "gantry_height":
-        {
-            "value": "0"
-        },
-        "machine_gcode_flavor":
-        {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode":
-        {
-            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nG0 Y20 F{speed_travel}\nM117 Printing...\nG5"
-        },
-        "machine_end_gcode":
-        {
-            "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"
-        }
+        "gantry_height": { "value": "0" },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 210 },
+        "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 205 },
+        "machine_name": { "default_value": "Anycubic i3 Mega" },
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nG0 Y20 F{speed_travel}\nM117 Printing...\nG5" },
+        "machine_width": { "default_value": 210 }
     }
-}
+}

resources/definitions/anycubic_i3_mega_s.def.json

@@ -9,134 +9,122 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_i3_mega_s_platform.3mf",
+        "has_machine_quality": true,
         "has_materials": true,
         "has_variants": false,
-        "has_machine_quality": true,
-        "preferred_quality_type": "normal",
-        "machine_extruder_trains":
-        {
-            "0": "anycubic_i3_mega_s_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anycubic_i3_mega_s_extruder_0" },
+        "preferred_quality_type": "normal"
     },
-
     "overrides":
     {
-        "machine_name": { "default_value": "Anycubic i3 Mega S/Pro" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_width": { "default_value": 210 },
-        "machine_height": { "default_value": 205 },
-        "machine_depth": { "default_value": 210 },
-        "machine_center_is_zero": { "default_value": false },
-        "gantry_height": { "value": "0" },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21                                        ; metric values \nG90                                        ; absolute positioning \nM82                                        ; set extruder to absolute mode \nM900 K0                                    ; disable lin. adv. if not set in GCODE\nM107                                       ; start with the fan off \nM140 S{material_bed_temperature_layer_0}   ; Start heating the bed \nG4 S60                                     ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0}   ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500                            ; BEEP heating done \nG28 X0 Y10 Z0                              ; move X/Y to min endstops \nM420 S1                                    ; Enable leveling \nM420 Z2.0                                  ; Set leveling fading height to 2 mm \nG0 Z0.15                                   ; lift nozzle a bit \nG92 E0                                     ; zero the extruded length \nG1 X50 E20 F500                            ; Extrude 20mm of filament in a 5cm line. \nG92 E0                                     ; zero the extruded length again \nG1 E-2 F500                                ; Retract a little \nG1 X50 F500                                ; wipe away from the filament line\nG1 X100 F9000                              ; Quickly wipe away from the filament line" },
-        "machine_end_gcode": { "default_value": "M104 S0                                    ; Extruder off \nM140 S0                                    ; Heatbed off \nM107                                       ; Fan off \nG91                                        ; relative positioning \nG1 E-5 F300                                ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0                                  ; homing \nG1 Y180 F2000                              ; reset feedrate \nM84                                        ; disable stepper motors \nG90                                        ; absolute positioning \nM300 S440 P200                             ; Make Print Completed Tones \nM300 S660 P250                             ; beep \nM300 S880 P300                             ; beep" },
-
-        "machine_max_acceleration_x": { "value": 3000 },
-        "machine_max_acceleration_y": { "value": 2000 },
-        "machine_max_acceleration_z": { "value": 60 },
-        "machine_max_acceleration_e": { "value": 10000 },
-        "machine_acceleration": { "value": 3000 },
-
-        "machine_max_feedrate_x": { "default_value": 500 },
-        "machine_max_feedrate_y": { "default_value": 500 },
-        "machine_max_feedrate_z": { "default_value": 8 },
-
-        "machine_max_jerk_xy": { "value": 10 },
-        "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 },
-
-        "material_diameter": { "default_value": 1.75 },
-        "material_print_temperature": { "maximum_value_warning": 260 },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 260 },
-        "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_bed_temperature": { "maximum_value_warning": 110 },
-        "material_bed_temperature_layer_0": { "maximum_value_warning": 110 },
-
-        "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" },
-
-        "acceleration_print": { "value": 1500 },
         "acceleration_enabled": { "value": false },
+        "acceleration_print": { "value": 1500 },
+        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
         "acceleration_travel": { "value": 3000 },
         "acceleration_travel_layer_0": { "value": "acceleration_travel" },
-        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
-
-        "jerk_print": { "value": 8 },
-        "jerk_travel": { "value": 10 },
-        "jerk_travel_layer_0": { "value": "jerk_travel" },
-        "jerk_enabled": { "value": true },
-
-        "speed_print": { "value": 50.0 } ,
-
-        "speed_wall_x": { "value": "speed_wall" },
-        "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_travel_layer_0": { "value": "speed_travel" },
-        "speed_prime_tower": { "value": "speed_topbottom" },
-        "speed_support": { "value": "speed_wall_0" },
-        "speed_support_interface": { "value": "speed_topbottom" },
-        "speed_z_hop": { "value": 8 },
-
-        "skirt_brim_speed": { "value": "speed_layer_0" },
-
-        "optimize_wall_printing_order": { "value": "True" },
-
-        "infill_sparse_density": { "value": 25 },
-        "infill_before_walls": { "value": false },
-        "infill_overlap": { "value": 15.0 },
-
-        "retraction_speed": { "value": 30, "maximum_value_warning": 60 },
-        "retraction_retract_speed": { "maximum_value_warning": 60 },
-        "retraction_prime_speed": { "maximum_value_warning": 60 },
-
-        "retraction_hop_enabled": { "value": true },
-        "retraction_hop": { "value": 0.075 },
-        "retraction_hop_only_when_collides": { "value": true },
-        "retraction_amount": { "value": 6 },
-
-        "retraction_min_travel": { "value": 1.5 },
-        "retraction_combing": { "value": "'off'" },
-        "retraction_combing_max_distance": { "value": 30 },
-        
-        "travel_avoid_other_parts": { "value": true },
-        "travel_avoid_supports": { "value": true },
-        "travel_retract_before_outer_wall": { "value": true },
-
+        "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
+        "brim_replaces_support": { "value": false },
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
         "cool_fan_speed": { "value": 100 },
         "cool_fan_speed_0": { "value": 30 },
-
         "cool_min_layer_time": { "value": 10 },
-
-        "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
-        "brim_replaces_support": { "value": false },
+        "gantry_height": { "value": "0" },
+        "infill_before_walls": { "value": false },
+        "infill_overlap": { "value": 15.0 },
+        "infill_sparse_density": { "value": 25 },
+        "jerk_enabled": { "value": true },
+        "jerk_print": { "value": 8 },
+        "jerk_travel": { "value": 10 },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "machine_acceleration": { "value": 3000 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 210 },
+        "machine_end_gcode": { "default_value": "M104 S0                                    ; Extruder off \nM140 S0                                    ; Heatbed off \nM107                                       ; Fan off \nG91                                        ; relative positioning \nG1 E-5 F300                                ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0                                  ; homing \nG1 Y180 F2000                              ; reset feedrate \nM84                                        ; disable stepper motors \nG90                                        ; absolute positioning \nM300 S440 P200                             ; Make Print Completed Tones \nM300 S660 P250                             ; beep \nM300 S880 P300                             ; beep" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 205 },
+        "machine_max_acceleration_e": { "value": 10000 },
+        "machine_max_acceleration_x": { "value": 3000 },
+        "machine_max_acceleration_y": { "value": 2000 },
+        "machine_max_acceleration_z": { "value": 60 },
+        "machine_max_feedrate_x": { "default_value": 500 },
+        "machine_max_feedrate_y": { "default_value": 500 },
+        "machine_max_feedrate_z": { "default_value": 8 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_name": { "default_value": "Anycubic i3 Mega S/Pro" },
+        "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21                                        ; metric values \nG90                                        ; absolute positioning \nM82                                        ; set extruder to absolute mode \nM900 K0                                    ; disable lin. adv. if not set in GCODE\nM107                                       ; start with the fan off \nM140 S{material_bed_temperature_layer_0}   ; Start heating the bed \nG4 S60                                     ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0}   ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500                            ; BEEP heating done \nG28 X0 Y10 Z0                              ; move X/Y to min endstops \nM420 S1                                    ; Enable leveling \nM420 Z2.0                                  ; Set leveling fading height to 2 mm \nG0 Z0.15                                   ; lift nozzle a bit \nG92 E0                                     ; zero the extruded length \nG1 X50 E20 F500                            ; Extrude 20mm of filament in a 5cm line. \nG92 E0                                     ; zero the extruded length again \nG1 E-2 F500                                ; Retract a little \nG1 X50 F500                                ; wipe away from the filament line\nG1 X100 F9000                              ; Quickly wipe away from the filament line" },
+        "machine_width": { "default_value": 210 },
+        "material_bed_temperature": { "maximum_value_warning": 110 },
+        "material_bed_temperature_layer_0": { "maximum_value_warning": 110 },
+        "material_diameter": { "default_value": 1.75 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_print_temperature": { "maximum_value_warning": 260 },
+        "material_print_temperature_layer_0":
+        {
+            "maximum_value_warning": 260,
+            "value": "material_print_temperature + 5"
+        },
+        "meshfix_maximum_deviation": { "value": 0.05 },
+        "minimum_interface_area": { "value": 10 },
+        "minimum_support_area": { "value": 2 },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 6 },
+        "retraction_combing": { "value": "'off'" },
+        "retraction_combing_max_distance": { "value": 30 },
+        "retraction_hop": { "value": 0.075 },
+        "retraction_hop_enabled": { "value": true },
+        "retraction_hop_only_when_collides": { "value": true },
+        "retraction_min_travel": { "value": 1.5 },
+        "retraction_prime_speed": { "maximum_value_warning": 60 },
+        "retraction_retract_speed": { "maximum_value_warning": 60 },
+        "retraction_speed":
+        {
+            "maximum_value_warning": 60,
+            "value": 30
+        },
+        "skirt_brim_speed": { "value": "speed_layer_0" },
         "skirt_gap": { "value": 5.0 },
         "skirt_line_count": { "value": 2 },
-
-        "meshfix_maximum_deviation": { "value": 0.05 },
+        "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": 50.0 },
+        "speed_roofing": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_travel":
+        {
+            "maximum_value": 200.0,
+            "maximum_value_warning": 150.0,
+            "value": 100.0
+        },
+        "speed_travel_layer_0": { "value": "speed_travel" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_z_hop": { "value": 8 },
         "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_top_distance": { "value":  "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)"},
-        "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
-        "support_wall_count": { "value": 1 },
         "support_brim_enable": { "value": true },
         "support_brim_width": { "value": 4 },
-
-        "support_interface_enable": { "value": true },
-        "support_structure": { "value": "'tree'" },
-        "support_type": { "value": "'buildplate' if support_structure == 'tree' else 'everywhere'" },
-        "support_interface_height": { "value": "layer_height * 4" },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
         "support_interface_density": { "value": 33.333 },
+        "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
         "support_interface_skip_height": { "value": 0.2 },
-        "minimum_support_area": { "value": 2 },
-        "minimum_interface_area": { "value": 10 }
+        "support_pattern": { "value": "'zigzag'" },
+        "support_structure": { "value": "'tree'" },
+        "support_top_distance": { "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)" },
+        "support_type": { "value": "'buildplate' if support_structure == 'tree' else 'everywhere'" },
+        "support_use_towers": { "value": false },
+        "support_wall_count": { "value": 1 },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
+        "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" },
+        "travel_avoid_other_parts": { "value": true },
+        "travel_avoid_supports": { "value": true },
+        "travel_retract_before_outer_wall": { "value": true },
+        "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" }
     }
-}
+}

resources/definitions/anycubic_i3_mega_x.def.json

@@ -4,33 +4,36 @@
     "inherits": "anycubic_i3_mega_s",
     "metadata":
     {
-        "quality_definition": "anycubic_i3_mega_s",
-        "platform": "anycubic_i3_mega_x_platform.stl"
+        "platform": "anycubic_i3_mega_x_platform.stl",
+        "quality_definition": "anycubic_i3_mega_s"
     },
     "overrides":
     {
-        "machine_name": { "default_value": "Anycubic i3 Mega X" },
-        "machine_width": { "default_value": 300 },
-        "machine_height": { "default_value": 305 },
+        "acceleration_print": { "value": 400 },
+        "acceleration_travel": { "value": 400 },
+        "machine_acceleration": { "value": 3000 },
         "machine_depth": { "default_value": 300 },
-
+        "machine_height": { "default_value": 305 },
+        "machine_max_acceleration_e": { "value": 10000 },
         "machine_max_acceleration_x": { "value": 400 },
         "machine_max_acceleration_y": { "value": 400 },
         "machine_max_acceleration_z": { "value": 60 },
-        "machine_max_acceleration_e": { "value": 10000 },
-        "machine_acceleration": { "value": 3000 },
-
         "machine_max_feedrate_x": { "default_value": 120 },
         "machine_max_feedrate_y": { "default_value": 120 },
         "machine_max_feedrate_z": { "default_value": 20 },
-
-        "speed_travel": { "value": 100.0,  "maximum_value": 120.0 },
-
-        "acceleration_print": { "value": 400 },
-        "acceleration_travel": { "value": 400 },
-        
-        "retraction_speed": { "value": 30, "maximum_value_warning": 60 },
+        "machine_name": { "default_value": "Anycubic i3 Mega X" },
+        "machine_width": { "default_value": 300 },
+        "retraction_prime_speed": { "maximum_value_warning": 60 },
         "retraction_retract_speed": { "maximum_value_warning": 60 },
-        "retraction_prime_speed": { "maximum_value_warning": 60 }
+        "retraction_speed":
+        {
+            "maximum_value_warning": 60,
+            "value": 30
+        },
+        "speed_travel":
+        {
+            "maximum_value": 120.0,
+            "value": 100.0
+        }
     }
 }

resources/definitions/anycubic_kobra.def.json

@@ -8,47 +8,22 @@
         "author": "Jason Chen",
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
-        "has_materials": true,
-        "preferred_material": "generic_pla",
+        "firmware_file": "MarlinChiron.hex",
         "has_machine_quality": true,
-        "quality_definition": "anycubic_kobra",
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_kobra_extruder_0" },
+        "preferred_material": "generic_pla",
         "preferred_quality_type": "pla",
-        "machine_extruder_trains":
-        {
-            "0": "anycubic_kobra_extruder_0"
-        },
-        "firmware_file": "MarlinChiron.hex"
+        "quality_definition": "anycubic_kobra"
     },
-
     "overrides":
     {
-        "machine_name":
-        {
-            "default_value": "Anycubic Kobra"
-        },
-        "machine_heated_bed":
-        {
-            "default_value": true
-        },
-        "machine_width":
-        {
-            "default_value": 222
-        },
-        "machine_height":
-        {
-            "default_value": 252
-        },
-        "machine_depth":
-        {
-            "default_value": 222
-        },
-        "machine_gcode_flavor":
-        {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode":
-        {
-            "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
-        }
+        "machine_depth": { "default_value": 222 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 252 },
+        "machine_name": { "default_value": "Anycubic Kobra" },
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" },
+        "machine_width": { "default_value": 222 }
     }
-}
+}

resources/definitions/anycubic_kobra_go.def.json

@@ -0,0 +1,29 @@
+{
+    "version": 2,
+    "name": "Anycubic Kobra Go",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Kolja Lampe",
+        "manufacturer": "Anycubic",
+        "file_formats": "text/x-gcode",
+        "firmware_file": "MarlinChiron.hex",
+        "has_machine_quality": true,
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_kobra_go_extruder_0" },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "pla",
+        "quality_definition": "anycubic_kobra_go"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 222 },
+        "machine_end_gcode": { "default_value": "M400 ; Wait for current moves to finish\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F2400 E-1 ; Retract filament 3mm at 40mm/s to prevent stringing\nG0 F5000 Z20 ; Move Z Axis up 20mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG0 X0 Y220 F5000 ; Move Heat Bed to the front for easy print removal\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; Disable stepper motors\n; End of custom end GCode" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 250 },
+        "machine_name": { "default_value": "Anycubic Kobra Go" },
+        "machine_start_gcode": { "default_value": "M140 S[first_layer_bed_temperature]; Heat bed\nM104 S[first_layer_temperature\n            ]; Heat extruder\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nM420 S1 ; Enable Bed Levelling Mesh\nM190 S[first_layer_bed_temperature\n            ]; Wait for bed to get up to temperature\nM109 S[first_layer_temperature\n            ]; Wait for extruder to get up to temperature\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X2 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X2 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X2.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X2.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 F2400 E-1\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" },
+        "machine_width": { "default_value": 222 }
+    }
+}

resources/definitions/anycubic_kobra_max.def.json

@@ -8,47 +8,22 @@
         "author": "Jason Chen",
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
-        "has_materials": true,
-        "preferred_material": "generic_pla",
+        "firmware_file": "MarlinChiron.hex",
         "has_machine_quality": true,
-        "quality_definition": "anycubic_kobra_max",
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_kobra_max_extruder_0" },
+        "preferred_material": "generic_pla",
         "preferred_quality_type": "pla",
-        "machine_extruder_trains":
-        {
-            "0": "anycubic_kobra_max_extruder_0"
-        },
-        "firmware_file": "MarlinChiron.hex"
+        "quality_definition": "anycubic_kobra_max"
     },
-
     "overrides":
     {
-        "machine_name":
-        {
-            "default_value": "Anycubic Kobra Max"
-        },
-        "machine_heated_bed":
-        {
-            "default_value": true
-        },
-        "machine_width":
-        {
-            "default_value": 402
-        },
-        "machine_height":
-        {
-            "default_value": 452
-        },
-        "machine_depth":
-        {
-            "default_value": 402
-        },
-        "machine_gcode_flavor":
-        {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode":
-        {
-            "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
-        }
+        "machine_depth": { "default_value": 402 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 452 },
+        "machine_name": { "default_value": "Anycubic Kobra Max" },
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" },
+        "machine_width": { "default_value": 402 }
     }
-}
+}

resources/definitions/anycubic_kossel.def.json

@@ -1,65 +1,76 @@
 {
-    "name": "Anycubic Kossel",
     "version": 2,
+    "name": "Anycubic Kossel",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": false,
         "author": "Allester Fox",
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
-        "preferred_variant_name": "0.4mm Nozzle",
-        "preferred_quality_type": "standard",
-        "preferred_material": "generic_pla",
         "platform": "kossel_platform.3mf",
-        "machine_extruder_trains": {
-            "0": "anycubic_kossel_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle"
     },
-    "overrides": {
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "machine_width": {
-            "default_value": 180
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 180
-        },
-        "machine_center_is_zero": {
-            "default_value": true
-        },
-        "machine_nozzle_heat_up_speed": {
-            "default_value": 2
-        },
-        "machine_nozzle_cool_down_speed": {
-            "default_value": 2
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode": {
-            "default_value": "G21        ;metric values\nG90        ;absolute positioning\nM107       ;start with the fan off\nG28   ;move to endstops\nG92 E0                  ;zero the extruded length\nG1 F200 E3              ;extrude 3mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Printing..."
-        },
-        "machine_end_gcode": {
-            "default_value": "M400      ;Free buffer\nG91      ;relative positioning\nG1 E-1 F300      ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5        ;move Z up a bit and retract filament even more\nG90      ;absolute positioning\nM104 S0      ;extruder heater off\nM140 S0      ;heated bed heater off\nM107      ;fan off\nM84      ;steppers off\nG28      ;move to endstop\nM84      ;steppers off"
-        },
-        "machine_shape": {
-            "default_value": "elliptic"
-        },
-        "machine_disallowed_areas": {
+    "overrides":
+    {
+        "machine_center_is_zero": { "default_value": true },
+        "machine_depth": { "default_value": 180 },
+        "machine_disallowed_areas":
+        {
             "default_value": [
-                [[-50, -85], [-85, -85], [-90, -90]],
-                [[-85, -85], [-85, -50], [-90, -90]],
-                [[50, -85],  [85, -85],  [90, -90]],
-                [[85, -85],  [85, -50],  [90, -90]],
-                [[-50, 85],  [-85, 85],  [-90, 90]],
-                [[-85, 85],  [-85, 50],  [-90, 90]],
-                [[50, 85],   [85, 85],   [90, 90]],
-                [[85, 85],   [85, 50],   [90, 90]]
+                [
+                    [-50, -85],
+                    [-85, -85],
+                    [-90, -90]
+                ],
+                [
+                    [-85, -85],
+                    [-85, -50],
+                    [-90, -90]
+                ],
+                [
+                    [50, -85],
+                    [85, -85],
+                    [90, -90]
+                ],
+                [
+                    [85, -85],
+                    [85, -50],
+                    [90, -90]
+                ],
+                [
+                    [-50, 85],
+                    [-85, 85],
+                    [-90, 90]
+                ],
+                [
+                    [-85, 85],
+                    [-85, 50],
+                    [-90, 90]
+                ],
+                [
+                    [50, 85],
+                    [85, 85],
+                    [90, 90]
+                ],
+                [
+                    [85, 85],
+                    [85, 50],
+                    [90, 90]
+                ]
             ]
-        }
+        },
+        "machine_end_gcode": { "default_value": "M400      ;Free buffer\nG91      ;relative positioning\nG1 E-1 F300      ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5        ;move Z up a bit and retract filament even more\nG90      ;absolute positioning\nM104 S0      ;extruder heater off\nM140 S0      ;heated bed heater off\nM107      ;fan off\nM84      ;steppers off\nG28      ;move to endstop\nM84      ;steppers off" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 300 },
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+        "machine_shape": { "default_value": "elliptic" },
+        "machine_start_gcode": { "default_value": "G21        ;metric values\nG90        ;absolute positioning\nM107       ;start with the fan off\nG28   ;move to endstops\nG92 E0                  ;zero the extruded length\nG1 F200 E3              ;extrude 3mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Printing..." },
+        "machine_width": { "default_value": 180 }
     }
-}
+}

resources/definitions/anycubic_kossel_linear_plus.def.json

@@ -1,36 +1,67 @@
 {
-    "name": "Anycubic Kossel Linear Plus",
     "version": 2,
+    "name": "Anycubic Kossel Linear Plus",
     "inherits": "anycubic_kossel",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "platform": "kossel_pro_build_platform.3mf",
-        "platform_offset": [0, -0.25, 0],
-        "machine_extruder_trains": {
-            "0": "anycubic_kossel_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" },
+        "platform_offset": [
+            0,
+            -0.25,
+            0
+        ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "Anycubic Kossel Linear Plus"
-        },
-        "machine_width": {
-            "default_value": 240
-        },
-        "machine_depth": {
-            "default_value": 240
-        },
-        "machine_disallowed_areas": {
+    "overrides":
+    {
+        "machine_depth": { "default_value": 240 },
+        "machine_disallowed_areas":
+        {
             "default_value": [
-                [[-50, -115], [-115, -115], [-90, -90]],
-                [[-115, -115], [-115, -50], [-90, -90]],
-                [[50, -115], [115, -115], [90, -90]],
-                [[115, -115], [115, -50], [90, -90]],
-                [[-50, 115], [-115, 115], [-90, 90]],
-                [[-115, 115], [-115, 50], [-90, 90]],
-                [[50, 115], [115, 115], [90, 90]],
-                [[115, 115], [115, 50], [90, 90]]
+                [
+                    [-50, -115],
+                    [-115, -115],
+                    [-90, -90]
+                ],
+                [
+                    [-115, -115],
+                    [-115, -50],
+                    [-90, -90]
+                ],
+                [
+                    [50, -115],
+                    [115, -115],
+                    [90, -90]
+                ],
+                [
+                    [115, -115],
+                    [115, -50],
+                    [90, -90]
+                ],
+                [
+                    [-50, 115],
+                    [-115, 115],
+                    [-90, 90]
+                ],
+                [
+                    [-115, 115],
+                    [-115, 50],
+                    [-90, 90]
+                ],
+                [
+                    [50, 115],
+                    [115, 115],
+                    [90, 90]
+                ],
+                [
+                    [115, 115],
+                    [115, 50],
+                    [90, 90]
+                ]
             ]
-        }
+        },
+        "machine_name": { "default_value": "Anycubic Kossel Linear Plus" },
+        "machine_width": { "default_value": 240 }
     }
-}
+}

resources/definitions/anycubic_kossel_pulley.def.json

@@ -1,16 +1,14 @@
 {
-    "name": "Anycubic Kossel Pulley",
     "version": 2,
+    "name": "Anycubic Kossel Pulley",
     "inherits": "anycubic_kossel",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains": {
-            "0": "anycubic_kossel_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" }
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "Anycubic Kossel Pulley"
-        }
+    "overrides":
+    {
+        "machine_name": { "default_value": "Anycubic Kossel Pulley" }
     }
-}
+}

resources/definitions/anycubic_mega_zero.def.json

@@ -9,107 +9,65 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_mega_zero_platform.stl",
-        "has_materials": true,
         "has_machine_quality": true,
-        "preferred_quality_type": "normal",
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_mega_zero_extruder_0" },
         "preferred_material": "generic_pla",
-        "machine_extruder_trains":
-        {
-            "0": "anycubic_mega_zero_extruder_0"
-        }
+        "preferred_quality_type": "normal"
     },
-
     "overrides":
     {
-        "machine_name":
-        {
-            "default_value": "Anycubic Mega Zero"
-        },
-        "machine_heated_bed":
-        {
-            "default_value": false
-        },
-        "machine_width":
-        {
-            "default_value": 220
-        },
-        "machine_depth":
-        {
-            "default_value": 220
-        },
-        "machine_height":
-        {
-            "default_value": 250
-        },
-        "machine_center_is_zero":
-        {
-            "default_value": false
-        },
-        "gantry_height":
-        {
-            "value": 25
-        },
-        "machine_gcode_flavor":
-        {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode":
-        {
-            "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Start heating ...\nM104 S{material_print_temperature_layer_0}\nM117 Homing X/Y ...\nG28 X0 Y0 ;move X/Y to min endstops\nM117 Homing Z ...\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nM117 Heating ...\nM109 S{material_print_temperature_layer_0}\nM117 Start cleaning ...\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nM117 Intro line ...\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z{layer_height} F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z{layer_height} F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z{layer_height} F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-1 F500 ; Retract filiment by 1 mm\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F{speed_travel} ; Move over to prevent blob squish\nG1 F{speed_travel}\nG92 E0 ; Reset Extruder\nM117 Printing...\n"
-        },
-        "machine_end_gcode":
-        {
-            "default_value": "M117 Cooling down...\nM104 S0 ; turn off extruder\nM84 ; disable motors\nM107 ; Fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positioning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n"
-        },
-        "machine_max_feedrate_x": { "value": 500 },
-        "machine_max_feedrate_y": { "value": 500 },
-        "machine_max_feedrate_z": { "value": 5 },
-        "machine_max_feedrate_e": { "value": 30 },
-
-        "machine_max_acceleration_x": { "value": 500 },
-        "machine_max_acceleration_y": { "value": 500 },
-        "machine_max_acceleration_z": { "value": 100 },
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_acceleration": { "value": 500 },
+        "acceleration_enabled": { "value": false },
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
-        "acceleration_enabled": { "value": false },
-
-        "machine_max_jerk_xy": { "value": 10 },
-        "machine_max_jerk_z": { "value": 0.3 },
-        "machine_max_jerk_e": { "value": 15 },
+        "adhesion_type": { "value": "'skirt'" },
+        "cool_fan_full_at_height": { "value": "layer_height_0" },
+        "gantry_height": { "value": 25 },
+        "jerk_enabled": { "value": false },
         "jerk_print": { "value": 10 },
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
-        "jerk_enabled": { "value": false },
-
-        "speed_print": { "value": 50.0 },
-        "speed_z_hop": { "value": "machine_max_feedrate_z" },
-
-        "optimize_wall_printing_order": { "value": "True" },
-        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "machine_acceleration": { "value": 500 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M117 Cooling down...\nM104 S0 ; turn off extruder\nM84 ; disable motors\nM107 ; Fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positioning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 250 },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 100 },
+        "machine_max_feedrate_e": { "value": 30 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 15 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Anycubic Mega Zero" },
+        "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Start heating ...\nM104 S{material_print_temperature_layer_0}\nM117 Homing X/Y ...\nG28 X0 Y0 ;move X/Y to min endstops\nM117 Homing Z ...\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nM117 Heating ...\nM109 S{material_print_temperature_layer_0}\nM117 Start cleaning ...\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nM117 Intro line ...\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z{layer_height} F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z{layer_height} F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z{layer_height} F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-1 F500 ; Retract filiment by 1 mm\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F{speed_travel} ; Move over to prevent blob squish\nG1 F{speed_travel}\nG92 E0 ; Reset Extruder\nM117 Printing...\n" },
+        "machine_width": { "default_value": 220 },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-
-        "retraction_hop_enabled": { "value": "True" },
-        "retraction_hop": { "value": 0.2 },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 7 },
         "retraction_combing": { "value": "'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
-
-        "travel_avoid_other_parts": { "value": true },
-        "travel_avoid_supports": { "value": true },
-        "travel_retract_before_outer_wall": { "value": true },
-
-        "retraction_speed": { "value": 30 },
-        "retraction_amount": { "value": 7 },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "retraction_hop_enabled": { "value": "True" },
         "retraction_min_travel": { "value": 1.5 },
-
-        "cool_fan_full_at_height": { "value": "layer_height_0" },
-        "adhesion_type": { "value": "'skirt'" },
-        "skirt_line_count": {"default_value": 3},
+        "retraction_speed": { "value": 30 },
+        "skirt_line_count": { "default_value": 3 },
+        "speed_print": { "value": 50.0 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
         "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.1 else layer_height*2" }
+        "support_z_distance": { "value": "layer_height if layer_height > 0.1 else layer_height*2" },
+        "travel_avoid_other_parts": { "value": true },
+        "travel_avoid_supports": { "value": true },
+        "travel_retract_before_outer_wall": { "value": true }
     }
-}
+}

resources/definitions/anycubic_vyper.def.json

@@ -1,47 +1,27 @@
 {
-	"version": 2,
-	"name": "Anycubic Vyper",
-	"inherits": "fdmprinter",
-	"metadata": {
-		"visible": true,
-		"author": "ThatGuyZim",
-		"manufacturer": "Anycubic",
-		"file_formats": "text/x-gcode",
-		"platform": "anycubic_vyper_platform.stl",
-		"machine_extruder_trains": {
-			"0": "anycubic_vyper_extruder_0"
-		}
-	},
-	"overrides": {
-		"machine_name": {
-			"default_value": "Anycubic Vyper"
-		},
-		"machine_heated_bed": {
-			"default_value": true
-		},
-		"machine_width": {
-			"default_value": 250
-		},
-		"machine_height": {
-			"default_value": 265
-		},
-		"machine_depth": {
-			"default_value": 255
-		},
-		"machine_center_is_zero": {
-			"default_value": false
-		},
-		"gantry_height": {
-			"value": "0"
-		},
-		"machine_gcode_flavor": {
-			"default_value": "RepRap (Marlin/Sprinter)"
-		},
-		"machine_start_gcode": {
-			"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nM300 S1318 P266\nG28 Z0 ;move Z to min endstops\nG0 Z0.2\nG92 E0 ;zero the extruded length\nG1 X40 E25 F400 ; Extrude 25mm of filament in a 4cm line. Reduce speed (F) if you have a nozzle smaller than 0.4mm!\nG92 E0 ;zero the extruded length again\nG1 E-1 F500 ; Retract a little\nG1 X80 F4000 ; Quickly wipe away from the filament line\nM117 ; Printing…\nG5"
-		},
-		"machine_end_gcode": {
-			"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 S1318 P266"
-		}
-	}
+    "version": 2,
+    "name": "Anycubic Vyper",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "ThatGuyZim",
+        "manufacturer": "Anycubic",
+        "file_formats": "text/x-gcode",
+        "platform": "anycubic_vyper_platform.stl",
+        "machine_extruder_trains": { "0": "anycubic_vyper_extruder_0" }
+    },
+    "overrides":
+    {
+        "gantry_height": { "value": "0" },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 255 },
+        "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 S1318 P266" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 265 },
+        "machine_name": { "default_value": "Anycubic Vyper" },
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nM300 S1318 P266\nG28 Z0 ;move Z to min endstops\nG0 Z0.2\nG92 E0 ;zero the extruded length\nG1 X40 E25 F400 ; Extrude 25mm of filament in a 4cm line. Reduce speed (F) if you have a nozzle smaller than 0.4mm!\nG92 E0 ;zero the extruded length again\nG1 E-1 F500 ; Retract a little\nG1 X80 F4000 ; Quickly wipe away from the filament line\nM117 ; Printing\u2026\nG5" },
+        "machine_width": { "default_value": 250 }
+    }
 }

resources/definitions/arjun300.def.json

@@ -2,51 +2,59 @@
     "version": 2,
     "name": "Arjun 300",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "platform": "arjun300_platform.stl",
-        "platform_offset": [-155, -6, 190],
         "has_material": true,
         "has_variants": true,
-        "preferred_variant_name": "0.4 mm Nozzle",
         "machine_extruder_trains":
         {
             "0": "arjun_extruder_0",
             "1": "arjun_extruder_1"
-        }
+        },
+        "platform_offset": [
+            -155,
+            -6,
+            190
+        ],
+        "preferred_variant_name": "0.4 mm Nozzle",
+        "weight": 3
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Arjun 300" },
-        "machine_width": { "default_value": 317 },
-        "machine_height": { "default_value": 290 },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "ironing_enabled": { "default_value": true },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 310 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
-        "machine_show_variants": {"default_value": true},
-        "machine_acceleration": {"default_value": 2000},
+        "machine_height": { "default_value": 290 },
+        "machine_max_feedrate_e": { "value": 150 },
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
-        "line_width": {"value": "machine_nozzle_size"},
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_name": { "default_value": "Arjun 300" },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "machine_show_variants": { "default_value": true },
+        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 317 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
-        "retraction_amount": {"default_value": 6.5},
-        "retraction_speed": { "default_value": 30},
-        
-		"adhesion_type": { "default_value": "skirt" },
-        "machine_gcode_flavor": { "default_value": "Marlin"},
-	    "ironing_enabled":{"default_value": true},
-        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"},
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"},
-        "machine_extruder_count": { "default_value": 2 }
+        "retraction_amount": { "default_value": 6.5 },
+        "retraction_speed": { "default_value": 30 },
+        "speed_travel":
+        {
+            "maximum_value": "300",
+            "value": "200"
+        }
     }
-}
+}

resources/definitions/arjun_duplication.def.json

@@ -2,48 +2,49 @@
     "version": 2,
     "name": "Arjun 300 Duplication",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "has_material": true,
         "has_variants": true,
+        "machine_extruder_trains": { "0": "arjun_dm_extruder" },
         "preferred_variant_name": "0.4 mm Nozzle",
-        "machine_extruder_trains":
-        {
-            "0": "arjun_dm_extruder"
-        }
+        "weight": 3
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Arjun 300 Duplication" },
-        "machine_width": { "default_value": 158.5 },
-        "machine_height": { "default_value": 290 },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "ironing_enabled": { "default_value": true },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 310 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
-        "machine_show_variants": {"default_value": true},
-        "machine_acceleration": {"default_value": 2000},
+        "machine_height": { "default_value": 290 },
+        "machine_max_feedrate_e": { "value": 150 },
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
-        "line_width": {"value": "machine_nozzle_size"},
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_name": { "default_value": "Arjun 300 Duplication" },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "machine_show_variants": { "default_value": true },
+        "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 158.5 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
-        "retraction_amount": {"default_value": 6.5},
-        "retraction_speed": { "default_value": 30},
-        
-		"adhesion_type": { "default_value": "skirt" },
-        "machine_gcode_flavor": { "default_value": "Marlin"},
-	    "ironing_enabled":{"default_value": true},
-        "machine_start_gcode": {"default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"},
-        "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"},
-        "machine_extruder_count": { "default_value": 1 }
+        "retraction_amount": { "default_value": 6.5 },
+        "retraction_speed": { "default_value": 30 },
+        "speed_travel":
+        {
+            "maximum_value": "300",
+            "value": "200"
+        }
     }
-}
+}

resources/definitions/arjun_mirrored.def.json

@@ -2,48 +2,49 @@
     "version": 2,
     "name": "Arjun 300 Mirror",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "has_material": true,
         "has_variants": true,
+        "machine_extruder_trains": { "0": "arjun_mm_extruder" },
         "preferred_variant_name": "0.4 mm Nozzle",
-        "machine_extruder_trains":
-        {
-            "0": "arjun_mm_extruder"
-        }
+        "weight": 3
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Arjun 300 Mirror" },
-        "machine_width": { "default_value": 158.5 },
-        "machine_height": { "default_value": 290 },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "ironing_enabled": { "default_value": true },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 310 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
-        "machine_show_variants": {"default_value": true},
-        "machine_acceleration": {"default_value": 2000},
+        "machine_height": { "default_value": 290 },
+        "machine_max_feedrate_e": { "value": 150 },
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
-        "line_width": {"value": "machine_nozzle_size"},
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_name": { "default_value": "Arjun 300 Mirror" },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "machine_show_variants": { "default_value": true },
+        "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 158.5 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
-        "retraction_amount": {"default_value": 6.5},
-        "retraction_speed": { "default_value": 30},
-        
-		"adhesion_type": { "default_value": "skirt" },
-        "machine_gcode_flavor": { "default_value": "Marlin"},
-	    "ironing_enabled":{"default_value": true},
-        "machine_start_gcode": {"default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"},
-        "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"},
-        "machine_extruder_count": { "default_value": 1 }
+        "retraction_amount": { "default_value": 6.5 },
+        "retraction_speed": { "default_value": 30 },
+        "speed_travel":
+        {
+            "maximum_value": "300",
+            "value": "200"
+        }
     }
-}
+}

resources/definitions/arjunpro300.def.json

@@ -2,51 +2,59 @@
     "version": 2,
     "name": "Arjun Pro 300",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "platform": "arjunpro300_platform.STL",
-        "platform_offset": [-155, -6, 190],
         "has_material": true,
         "has_variants": true,
-        "preferred_variant_name": "0.4 mm Nozzle",
         "machine_extruder_trains":
         {
             "0": "arjunpro_extruder_0",
             "1": "arjunpro_extruder_1"
-        }
+        },
+        "platform_offset": [
+            -155,
+            -6,
+            190
+        ],
+        "preferred_variant_name": "0.4 mm Nozzle",
+        "weight": 3
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Arjun Pro 300" },
-        "machine_width": { "default_value": 300 },
-        "machine_height": { "default_value": 293 },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "ironing_enabled": { "default_value": true },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 300 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
-        "machine_show_variants": {"default_value": true},
-        "machine_acceleration": {"default_value": 2000},
+        "machine_height": { "default_value": 293 },
+        "machine_max_feedrate_e": { "value": 150 },
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
-        "line_width": {"value": "machine_nozzle_size"},
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_name": { "default_value": "Arjun Pro 300" },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "machine_show_variants": { "default_value": true },
+        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 300 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
-        "retraction_amount": {"default_value": 6.5},
-        "retraction_speed": { "default_value": 30},
-        
-		"adhesion_type": { "default_value": "skirt" },
-        "machine_gcode_flavor": { "default_value": "Marlin"},
-	    "ironing_enabled":{"default_value": true},
-        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"},
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"},
-        "machine_extruder_count": { "default_value": 2 }
+        "retraction_amount": { "default_value": 6.5 },
+        "retraction_speed": { "default_value": 30 },
+        "speed_travel":
+        {
+            "maximum_value": "300",
+            "value": "200"
+        }
     }
-}
+}

resources/definitions/arjunpro_duplication.def.json

@@ -2,48 +2,49 @@
     "version": 2,
     "name": "Arjun Pro 300 Duplication",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "has_material": true,
         "has_variants": true,
+        "machine_extruder_trains": { "0": "arjunpro_dm_extruder" },
         "preferred_variant_name": "0.4 mm Nozzle",
-        "machine_extruder_trains":
-        {
-            "0": "arjunpro_dm_extruder"
-        }
+        "weight": 3
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Arjunpro 300 Duplication" },
-        "machine_width": { "default_value": 120 },
-        "machine_height": { "default_value": 293 },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "ironing_enabled": { "default_value": true },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 300 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
-        "machine_show_variants": {"default_value": true},
-        "machine_acceleration": {"default_value": 2000},
+        "machine_height": { "default_value": 293 },
+        "machine_max_feedrate_e": { "value": 150 },
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
-        "line_width": {"value": "machine_nozzle_size"},
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_name": { "default_value": "Arjunpro 300 Duplication" },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "machine_show_variants": { "default_value": true },
+        "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 120 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
-        "retraction_amount": {"default_value": 6.5},
-        "retraction_speed": { "default_value": 30},
-        
-		"adhesion_type": { "default_value": "skirt" },
-        "machine_gcode_flavor": { "default_value": "Marlin"},
-	    "ironing_enabled":{"default_value": true},
-        "machine_start_gcode": {"default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"},
-        "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"},
-        "machine_extruder_count": { "default_value": 1 }
+        "retraction_amount": { "default_value": 6.5 },
+        "retraction_speed": { "default_value": 30 },
+        "speed_travel":
+        {
+            "maximum_value": "300",
+            "value": "200"
+        }
     }
-}
+}

resources/definitions/arjunpro_mirrored.def.json

@@ -2,48 +2,49 @@
     "version": 2,
     "name": "Arjun Pro 300 Mirror",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "has_material": true,
         "has_variants": true,
+        "machine_extruder_trains": { "0": "arjunpro_mm_extruder" },
         "preferred_variant_name": "0.4 mm Nozzle",
-        "machine_extruder_trains":
-        {
-            "0": "arjunpro_mm_extruder"
-        }
+        "weight": 3
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Arjunpro 300 Mirror" },
-        "machine_width": { "default_value": 120 },
-        "machine_height": { "default_value": 293 },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "ironing_enabled": { "default_value": true },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 300 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
-        "machine_show_variants": {"default_value": true},
-        "machine_acceleration": {"default_value": 2000},
+        "machine_height": { "default_value": 293 },
+        "machine_max_feedrate_e": { "value": 150 },
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
-        "line_width": {"value": "machine_nozzle_size"},
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_name": { "default_value": "Arjunpro 300 Mirror" },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "machine_show_variants": { "default_value": true },
+        "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 120 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
-        "retraction_amount": {"default_value": 6.5},
-        "retraction_speed": { "default_value": 30},
-        
-		"adhesion_type": { "default_value": "skirt" },
-        "machine_gcode_flavor": { "default_value": "Marlin"},
-	    "ironing_enabled":{"default_value": true},
-        "machine_start_gcode": {"default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"},
-        "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"},
-        "machine_extruder_count": { "default_value": 1 }
+        "retraction_amount": { "default_value": 6.5 },
+        "retraction_speed": { "default_value": 30 },
+        "speed_travel":
+        {
+            "maximum_value": "300",
+            "value": "200"
+        }
     }
-}
+}