Merge remote-tracking branch 'origin-wawanbreton/master' into optimized-prime-tower

.github/workflows/installers.yml

@@ -31,20 +31,23 @@ on:
         type: boolean
 
   schedule:
-    # Daily at 5:15 CET
+    # Daily at 4:15 CET (main-branch) and 5:15 CET (release-branch)
     - cron: '15 3 * * *'
+    - cron: '15 4 * * *'
 
 env:
-  CURA_CONAN_VERSION: ${{ inputs.cura_conan_version || 'cura/latest@ultimaker/testing' }}
   CONAN_ARGS: ${{ inputs.conan_args || '' }}
   ENTERPRISE: ${{ inputs.enterprise || false }}
   STAGING: ${{ inputs.staging || false }}
+  LATEST_RELEASE: '5.6'
+  LATEST_RELEASE_SCHEDULE_HOUR: 4
 
 jobs:
-  default-values:
+  default_values:
     runs-on: ubuntu-latest
     outputs:
       cura_conan_version: ${{ steps.default.outputs.cura_conan_version  }}
+      release_tag: ${{ steps.default.outputs.release_tag  }}
 
     steps:
     - name: Output default values
@@ -52,7 +55,17 @@ jobs:
       shell: python
       run: |
         import os
-        cura_conan_version = "cura/latest@ultimaker/testing" if "${{ github.event.inputs.cura_conan_version }}" == "" else "${{ github.event.inputs.cura_conan_version }}" 
+        import datetime
+        
+        if "${{ github.event_name }}" != "schedule":
+            cura_conan_version = "${{ github.event.inputs.cura_conan_version }}"
+        else:
+            now = datetime.datetime.now()
+            cura_conan_version = "cura/latest@ultimaker/stable" if now.hour == int(os.environ['LATEST_RELEASE_SCHEDULE_HOUR']) else "cura/latest@ultimaker/testing"
+        
+        release_tag = f"nightly-{os.environ['LATEST_RELEASE']}" if "/stable" in cura_conan_version else "nightly"
+
+        # Set cura_conan_version environment variable
         output_env = os.environ["GITHUB_OUTPUT"]
         content = ""
         if os.path.exists(output_env):
@@ -61,12 +74,24 @@ jobs:
         with open(output_env, "w") as f:
             f.write(content)
             f.writelines(f"cura_conan_version={cura_conan_version}\n")
+            f.writelines(f"release_tag={release_tag}\n")
+
+        summary_env = os.environ["GITHUB_STEP_SUMMARY"]
+        content = ""
+        if os.path.exists(summary_env):
+            with open(summary_env, "r") as f:
+                content = f.read()
+        
+        with open(summary_env, "w") as f:
+            f.write(content)
+            f.writelines(f"# cura_conan_version = {cura_conan_version}\n")
+            f.writelines(f"# release_tag = {release_tag}\n")
 
   windows-installer:
     uses: ./.github/workflows/windows.yml
-    needs: [ default-values ]
+    needs: [ default_values ]
     with:
-      cura_conan_version: ${{ needs.default-values.outputs.cura_conan_version }}
+      cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
       conan_args: ${{ github.event.inputs.conan_args }}
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
@@ -76,9 +101,9 @@ jobs:
 
   linux-installer:
     uses: ./.github/workflows/linux.yml
-    needs: [ default-values ]
+    needs: [ default_values ]
     with:
-      cura_conan_version: ${{ needs.default-values.outputs.cura_conan_version }}
+      cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
       conan_args: ${{ github.event.inputs.conan_args }}
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
@@ -88,33 +113,33 @@ jobs:
 
   macos-installer:
     uses: ./.github/workflows/macos.yml
-    needs: [ default-values ]
+    needs: [ default_values ]
     with:
-      cura_conan_version: ${{ needs.default-values.outputs.cura_conan_version }}
+      cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
       conan_args: ${{ github.event.inputs.conan_args }}
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
       architecture: X64
-      operating_system: macos-11.0
+      operating_system: self-hosted-X64
     secrets: inherit
 
   macos-arm-installer:
     uses: ./.github/workflows/macos.yml
-    needs: [ default-values ]
+    needs: [ default_values ]
     with:
-      cura_conan_version: ${{ needs.default-values.outputs.cura_conan_version }}
+      cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
       conan_args: ${{ github.event.inputs.conan_args }}
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
       architecture: ARM64
-      operating_system: self-hosted
+      operating_system: self-hosted-ARM64
     secrets: inherit
 
   # Run and update nightly release when the nightly input is set to true or if the schedule is triggered
   update-nightly-release:
     if: ${{ inputs.nightly || github.event_name == 'schedule' }}
     runs-on: ubuntu-latest
-    needs: [ windows-installer, linux-installer, macos-installer, macos-arm-installer ]
+    needs: [ default_values, windows-installer, linux-installer, macos-installer, macos-arm-installer ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -182,8 +207,8 @@ jobs:
 
       - name: Update nightly release for Linux
         run: |
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc  --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc  --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -206,8 +231,8 @@ jobs:
 
       - name: Update nightly release for Windows
         run: |
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -230,8 +255,8 @@ jobs:
 
       - name: Update nightly release for MacOS (X64)
         run: |
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -254,14 +279,31 @@ jobs:
 
       - name: Update nightly release for MacOS (ARM-64)
         run: |
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: create the release notes
+        run: |
+          import os
+          import datetime
+          from jinja2 import Template
+          
+          with open(".github/workflows/release-notes.md.jinja", "r") as f:
+              release_notes = Template(f.read())
+          
+          current_nightly_beta = "${{ needs.default_values.outputs.release_tag }}".split("nightly-")[-1]
+          with open("release-notes.md", "w") as f:
+              f.write(release_notes.render(
+                timestamp=${{ steps.filename.outputs.NIGHTLY_TIME }},
+                branch="" if ${{ needs.default_values.outputs.release_tag == 'nightly' }} else current_nightly_beta,
+                branch_specific="" if os.getenv("GITHUB_REF") == "refs/heads/main" else f"?branch={current_nightly_beta}",
+              ))
+
       - name: Update nightly release description (with date)
         if: always()
         run: |
-          gh release edit nightly --title "${{ steps.filename.outputs.NIGHTLY_NAME }}" --notes "Nightly release created on: ${{ steps.filename.outputs.NIGHTLY_TIME }}"
+          gh release edit ${{ needs.default_values.outputs.release_tag }} --title "${{ steps.filename.outputs.NIGHTLY_NAME }}" --notes-file release-notes.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linux.yml

@@ -106,16 +106,8 @@ jobs:
             $HOME/.conan/conan_download_cache
           key: conan-${{ runner.os }}-${{ runner.arch }}-installer-cache
 
-      - name: Hack needed specifically for ubuntu-22.04 from mid-Feb 2023 onwards
-        if: ${{ startsWith(inputs.operating_system, 'ubuntu-22.04') }}
-        run: sudo apt remove libodbc2 libodbcinst2 unixodbc-common -y
-
-      # NOTE: Due to what are probably github issues, we have to remove the cache and reconfigure before the rest.
-      #       This is maybe because grub caches the disk it uses last time, which is recreated each time.
       - name: Install Linux system requirements
         run: |
-          sudo rm /var/cache/debconf/config.dat
-          sudo dpkg --configure -a
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
           sudo apt update
           sudo apt upgrade
@@ -155,7 +147,12 @@ jobs:
         run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache"
 
       - name: Create the Packages (Bash)
-        run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json"
+        run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING -c tools.build:skip_test=True
+
+      - name: Remove internal packages before uploading
+        run: |
+          conan remove "*@internal/*" -f || true
+          conan remove "cura_private_data*" -f || true
 
       - name: Upload the Package(s)
         if: always()
@@ -199,19 +196,12 @@ jobs:
               f.write(content)
               f.writelines(f"INSTALLER_FILENAME={installer_filename}\n")
 
-      - name: Summarize the used Conan dependencies
+      - name: Summarize the used dependencies
         shell: python
         run: |
           import os
-          import json
-          from pathlib import Path
           
-          conan_install_info_path = Path("cura_inst/conan_install_info.json")
-          conan_info = {"installed": []}
-          if os.path.exists(conan_install_info_path):
-              with open(conan_install_info_path, "r") as f:
-                  conan_info = json.load(f)
-          sorted_deps = sorted([dep["recipe"]["id"].replace('#', r' rev: ') for dep in conan_info["installed"]])
+          from cura.CuraVersion import ConanInstalls, PythonInstalls
           
           summary_env = os.environ["GITHUB_STEP_SUMMARY"]
           content = ""
@@ -223,25 +213,12 @@ jobs:
               f.write(content)
               f.writelines("# ${{ steps.filename.outputs.INSTALLER_FILENAME }}\n")
               f.writelines("## Conan packages:\n")
-              for dep in sorted_deps:
-                  f.writelines(f"`{dep}`\n")
+              for dep_name, dep_info in ConanInstalls.items():
+                  f.writelines(f"`{dep_name} {dep_info['version']} {dep_info['revision']}`\n")
 
-      - name: Summarize the used Python modules
-        shell: python
-        run: |
-          import os
-          import pkg_resources
-          summary_env = os.environ["GITHUB_STEP_SUMMARY"]
-          content = ""
-          if os.path.exists(summary_env):
-              with open(summary_env, "r") as f:
-                  content = f.read()
-          
-          with open(summary_env, "w") as f:
-              f.write(content)
               f.writelines("## Python modules:\n")
-              for package in pkg_resources.working_set:
-                  f.writelines(f"`{package.key}/{package.version}`\n")
+              for dep_name, dep_info in PythonInstalls.items():
+                  f.writelines(f"`{dep_name} {dep_info['version']}`\n")
 
       - name: Create the Linux AppImage (Bash)
         run: |

.github/workflows/macos.yml

@@ -27,7 +27,7 @@ on:
       architecture:
         description: 'Architecture'
         required: true
-        default: 'X64'
+        default: 'ARM64'
         type: choice
         options:
           - X64
@@ -35,10 +35,11 @@ on:
       operating_system:
         description: 'OS'
         required: true
-        default: 'macos-11'
+        default: 'self-hosted-ARM64'
         type: choice
         options:
-          - self-hosted
+          - self-hosted-X64
+          - self-hosted-ARM64
           - macos-11
           - macos-12
   workflow_call:
@@ -66,12 +67,12 @@ on:
       architecture:
         description: 'Architecture'
         required: true
-        default: 'X64'
+        default: 'ARM64'
         type: string
       operating_system:
         description: 'OS'
         required: true
-        default: 'macos-11'
+        default: 'self-hosted-ARM64'
         type: string
 
 env:
@@ -102,7 +103,7 @@ jobs:
       - name: Setup Python and pip
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10.x'
+          python-version: '3.11.x'
           cache: 'pip'
           cache-dependency-path: .github/workflows/requirements-conan-package.txt
 
@@ -155,10 +156,14 @@ jobs:
         run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache"
 
       - name: Create the Packages (Bash)
-        run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json"
+        run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING -c tools.build:skip_test=True
+
+      - name: Remove internal packages before uploading
+        run: |
+          conan remove "*@internal/*" -f || true
+          conan remove "cura_private_data*" -f || true
 
       - name: Upload the Package(s)
-        if: ${{ inputs.operating_system != 'self-hosted' }}
         run: |
           conan upload "*" -r cura --all -c
 
@@ -203,19 +208,12 @@ jobs:
               f.write(content)
               f.writelines(f"INSTALLER_FILENAME={installer_filename}\n")
 
-      - name: Summarize the used Conan dependencies
+      - name: Summarize the used dependencies
         shell: python
         run: |
           import os
-          import json
-          from pathlib import Path
           
-          conan_install_info_path = Path("cura_inst/conan_install_info.json")
-          conan_info = {"installed": []}
-          if os.path.exists(conan_install_info_path):
-              with open(conan_install_info_path, "r") as f:
-                  conan_info = json.load(f)
-          sorted_deps = sorted([dep["recipe"]["id"].replace('#', r' rev: ') for dep in conan_info["installed"]])
+          from cura.CuraVersion import ConanInstalls, PythonInstalls
           
           summary_env = os.environ["GITHUB_STEP_SUMMARY"]
           content = ""
@@ -227,25 +225,12 @@ jobs:
               f.write(content)
               f.writelines("# ${{ steps.filename.outputs.INSTALLER_FILENAME }}\n")
               f.writelines("## Conan packages:\n")
-              for dep in sorted_deps:
-                  f.writelines(f"`{dep}`\n")
+              for dep_name, dep_info in ConanInstalls.items():
+                  f.writelines(f"`{dep_name} {dep_info['version']} {dep_info['revision']}`\n")
 
-      - name: Summarize the used Python modules
-        shell: python
-        run: |
-          import os
-          import pkg_resources
-          summary_env = os.environ["GITHUB_STEP_SUMMARY"]
-          content = ""
-          if os.path.exists(summary_env):
-              with open(summary_env, "r") as f:
-                  content = f.read()
-          
-          with open(summary_env, "w") as f:
-              f.write(content)
               f.writelines("## Python modules:\n")
-              for package in pkg_resources.working_set:
-                  f.writelines(f"`{package.key}/{package.version}`\n")
+              for dep_name, dep_info in PythonInstalls.items():
+                  f.writelines(f"`{dep_name} {dep_info['version']}`\n")
 
       - name: Create the Macos dmg (Bash)
         run: python ../cura_inst/packaging/MacOS/build_macos.py --source_path ../cura_inst --dist_path . --cura_conan_version $CURA_CONAN_VERSION --filename "${{ steps.filename.outputs.INSTALLER_FILENAME }}" --build_dmg --build_pkg --app_name "$CURA_APP_NAME"

.github/workflows/release_notes.md.jinja

@@ -0,0 +1,39 @@
+# Nightlies
+
+> :clock12: Created at: {{ timestamp }}
+
+|               |                                                                                            |
+|--------------:|--------------------------------------------------------------------------------------------|
+| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml/badge.svg{{ branch_specific }}
+?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) |
+
+# Unit Test results
+
+|                                |                                                                                                                                                                                                                               |
+|-------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|                   **Cura {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml)                                                                |
+|             **CuraEngine {{ branch }}** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml)                                                    |
+|                **Uranium {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml)                                                          |
+| **CuraEngine GradualFlow 0.1** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) |
+|  **synsepalum-dulcificum 0.1** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml)                   |
+|                 **libSavitar** | [![unit-test](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml)                                                    |
+|                  **libnest2d** | [![unit-test](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml)                                                      |
+
+# Conan packages
+
+|                                     |                                                                                                                                                                                                                                           |
+|------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|                        **Cura {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml)                                                     |
+|                  **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml)                                         |
+|                     **Uranium {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml)                                               |
+|               **fdm_materials {{ branch }}** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml)                                   |
+|            **cura-binary-data {{ branch }}** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml)                             |
+|      **CuraEngine GradualFlow 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) |
+|       **synsepalum-dulcificum 0.1** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml)                   |
+| **CuraEngine gRPC definitions 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml)       |
+|                        **libArcus** | [![conan-package](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml)                                                        |
+|                         **pyArcus** | [![conan-package](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml)                                                          |
+|                      **libSavitar** | [![conan-package](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml)                                                    |
+|                       **pySavitar** | [![conan-package](https://github.com/Ultimaker/pySavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pySavitar/actions/workflows/conan-package.yml)                                                      |
+|                       **libnest2d** | [![conan-package](https://github.com/Ultimaker/libnest2d/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libnest2d/actions/workflows/conan-package.yml)                                                      |
+|                        **pynest2d** | [![conan-package](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml)                                                        |

.github/workflows/windows.yml

@@ -122,7 +122,12 @@ jobs:
         run: conan config set storage.download_cache="C:\Users\runneradmin\.conan\conan_download_cache"
 
       - name: Create the Packages (Powershell)
-        run: conan install $Env:CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$Env:ENTERPRISE -o cura:staging=$Env:STAGING --json "cura_inst/conan_install_info.json"
+        run: conan install $Env:CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$Env:ENTERPRISE -o cura:staging=$Env:STAGING -c tools.build:skip_test=True
+
+      - name: Remove internal packages before uploading
+        run: |
+          conan remove "*@internal/*" -f || true
+          conan remove "cura_private_data*" -f || true
 
       - name: Upload the Package(s)
         if: always()
@@ -162,19 +167,12 @@ jobs:
               f.write(content)
               f.writelines(f"INSTALLER_FILENAME={installer_filename}\n")
 
-      - name: Summarize the used Conan dependencies
+      - name: Summarize the used dependencies
         shell: python
         run: |
           import os
-          import json
-          from pathlib import Path
           
-          conan_install_info_path = Path("cura_inst/conan_install_info.json")
-          conan_info = {"installed": []}
-          if os.path.exists(conan_install_info_path):
-              with open(conan_install_info_path, "r") as f:
-                  conan_info = json.load(f)
-          sorted_deps = sorted([dep["recipe"]["id"].replace('#', r' rev: ') for dep in conan_info["installed"]])
+          from cura.CuraVersion import ConanInstalls, PythonInstalls
           
           summary_env = os.environ["GITHUB_STEP_SUMMARY"]
           content = ""
@@ -186,25 +184,12 @@ jobs:
               f.write(content)
               f.writelines("# ${{ steps.filename.outputs.INSTALLER_FILENAME }}\n")
               f.writelines("## Conan packages:\n")
-              for dep in sorted_deps:
-                  f.writelines(f"`{dep}`\n")
+              for dep_name, dep_info in ConanInstalls.items():
+                  f.writelines(f"`{dep_name} {dep_info['version']} {dep_info['revision']}`\n")
 
-      - name: Summarize the used Python modules
-        shell: python
-        run: |
-          import os
-          import pkg_resources
-          summary_env = os.environ["GITHUB_STEP_SUMMARY"]
-          content = ""
-          if os.path.exists(summary_env):
-              with open(summary_env, "r") as f:
-                  content = f.read()
-          
-          with open(summary_env, "w") as f:
-              f.write(content)
               f.writelines("## Python modules:\n")
-              for package in pkg_resources.working_set:
-                  f.writelines(f"`{package.key}/{package.version}`\n")
+              for dep_name, dep_info in PythonInstalls.items():
+                  f.writelines(f"`{dep_name} {dep_info['version']}`\n")
 
       - name: Create PFX certificate from BASE64_PFX_CONTENT secret
         id: create-pfx

.gitignore

@@ -101,7 +101,6 @@ graph_info.json
 Ultimaker-Cura.spec
 .run/
 /printer-linter/src/printerlinter.egg-info/
-/resources/qml/Dialogs/AboutDialogVersionsList.qml
 /plugins/CuraEngineGradualFlow
 /resources/bundled_packages/bundled_*.json
 curaengine_plugin_gradual_flow

AboutDialogVersionsList.qml.jinja

@@ -1,61 +0,0 @@
-import QtQuick 2.2
-import QtQuick.Controls 2.9
-
-import UM 1.6 as UM
-import Cura 1.5 as Cura
-
-
-ListView
-{
-    id: projectBuildInfoList
-    visible: false
-    anchors.top: creditsNotes.bottom
-    anchors.topMargin: UM.Theme.getSize("default_margin").height
-    width: parent.width
-    height: base.height - y - (2 * UM.Theme.getSize("default_margin").height + closeButton.height)
-
-    ScrollBar.vertical: UM.ScrollBar
-    {
-        id: projectBuildInfoListScrollBar
-    }
-
-    delegate: Row
-    {
-        spacing: UM.Theme.getSize("narrow_margin").width
-        UM.Label
-        {
-            text: (model.name)
-            width: (projectBuildInfoList.width* 0.4) | 0
-            elide: Text.ElideRight
-        }
-        UM.Label
-        {
-            text: (model.version)
-            width: (projectBuildInfoList.width *0.6) | 0
-            elide: Text.ElideRight
-        }
-
-    }
-    model: ListModel
-    {
-        id: developerInfo
-    }
-    Component.onCompleted:
-    {
-        var conan_installs = {{ conan_installs }};
-        var python_installs = {{ python_installs }};
-        developerInfo.append({ name : "<H1>Conan Installs</H1>", version : '' });
-        for (var n in conan_installs)
-        {
-            developerInfo.append({ name : conan_installs[n][0], version : conan_installs[n][1] });
-        }
-        developerInfo.append({ name : '', version : '' });
-        developerInfo.append({ name : "<H1>Python Installs</H1>", version : '' });
-        for (var n in python_installs)
-        {
-            developerInfo.append({ name : python_installs[n][0], version : python_installs[n][1] });
-        }
-
-    }
-}
-

CuraVersion.py.jinja

@@ -1,6 +1,8 @@
-# Copyright (c) 2022 UltiMaker
+# Copyright (c) 2023 UltiMaker
 # Cura is released under the terms of the LGPLv3 or higher.
 
+from pkg_resources import working_set
+
 CuraAppName = "{{ cura_app_name }}"
 CuraAppDisplayName = "{{ cura_app_display_name  }}"
 CuraVersion = "{{ cura_version }}"
@@ -12,3 +14,6 @@ CuraCloudAccountAPIRoot = "{{ cura_cloud_account_api_root }}"
 CuraMarketplaceRoot = "{{ cura_marketplace_root }}"
 CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}"
 CuraLatestURL = "{{ cura_latest_url }}"
+
+ConanInstalls = {{ conan_installs }}
+PythonInstalls = {package.key: {'version': package.version} for package in working_set}

README.md

@@ -59,10 +59,10 @@
 [Contributors]: https://github.com/Ultimaker/Cura/graphs/contributors
 [PullRequests]: https://github.com/Ultimaker/Cura/pulls
 [Machines]: https://github.com/Ultimaker/Cura/wiki/Adding-new-machine-profiles-to-Cura
-[Building]: https://github.com/Ultimaker/Cura/wiki/Running-Cura-from-Source
+[Building]: https://github.com/Ultimaker/Cura/wiki/Getting-Started
 [Localize]: https://github.com/Ultimaker/Cura/wiki/Translating-Cura
-[Settings]: https://github.com/Ultimaker/Cura/wiki/Cura-Settings
-[Plugins]: https://github.com/Ultimaker/Cura/wiki/Plugin-Directory
+[Settings]: https://github.com/Ultimaker/Cura/wiki/Profiles-&-Settings
+[Plugins]: https://github.com/Ultimaker/Cura/wiki/Plugins-And-Packages
 [Closed]: https://github.com/Ultimaker/Cura/issues?q=is%3Aissue+is%3Aclosed
 [Issues]: https://github.com/Ultimaker/Cura/issues
 [Conan]: https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml
@@ -90,7 +90,7 @@
 <!---------------------------------[ Buttons ]--------------------------------->
 
 [Button Localize]: https://img.shields.io/badge/Help_Localize-e2467d?style=for-the-badge&logoColor=white&logo=GoogleTranslate
-[Button Machines]: https://img.shields.io/badge/Adding_Machines-yellow?style=for-the-badge&logoColor=white&logo=CloudFoundry
+[Button Machines]: https://img.shields.io/badge/Adding_Printers-yellow?style=for-the-badge&logoColor=white&logo=CloudFoundry
 [Button Settings]: https://img.shields.io/badge/Configuration-00979D?style=for-the-badge&logoColor=white&logo=CodeReview
 [Button Building]: https://img.shields.io/badge/Building_Cura-blue?style=for-the-badge&logoColor=white&logo=GitBook
 [Button Plugins]: https://img.shields.io/badge/Plugin_Usage-569A31?style=for-the-badge&logoColor=white&logo=ROS

conandata.yml

@@ -86,6 +86,7 @@ pyinstaller:
     hiddenimports:
         - "pySavitar"
         - "pyArcus"
+        - "pyDulcificum"
         - "pynest2d"
         - "PyQt6"
         - "PyQt6.QtNetwork"

conanfile.py

@@ -34,7 +34,8 @@ class CuraConan(ConanFile):
         "cloud_api_version": "ANY",
         "display_name": "ANY",  # TODO: should this be an option??
         "cura_debug_mode": [True, False],  # FIXME: Use profiles
-        "internal": [True, False]
+        "internal": [True, False],
+        "enable_i18n": [True, False],
     }
     default_options = {
         "enterprise": "False",
@@ -44,11 +45,12 @@ class CuraConan(ConanFile):
         "display_name": "UltiMaker Cura",
         "cura_debug_mode": False,  # Not yet implemented
         "internal": False,
+        "enable_i18n": False,
     }
 
     def set_version(self):
         if not self.version:
-            self.version = "5.5.0-beta.1"
+            self.version = "5.7.0-alpha"
 
     @property
     def _pycharm_targets(self):
@@ -65,6 +67,8 @@ class CuraConan(ConanFile):
         self._cura_env = Environment()
         self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml")))
         self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins")))
+        if not self.in_local_cache:
+            self._cura_env.define(  "CURA_DATA_ROOT", str(self._share_dir.joinpath("cura")))
 
         if self.settings.os == "Linux":
             self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts")
@@ -137,36 +141,16 @@ class CuraConan(ConanFile):
             return "'x86_64'"
         return "None"
 
-    def _generate_about_versions(self, location):
-        with open(os.path.join(self.recipe_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f:
-            cura_version_py = Template(f.read())
-
-        conan_installs = []
-        python_installs = []
-
-        # list  of conan installs
-        for _, dependency in self.dependencies.host.items():
-            conan_installs.append([dependency.ref.name,dependency.ref.version])
-
-        #list of python installs
-        outer = '"' if self.settings.os == "Windows" else "'"
-        inner = "'" if self.settings.os == "Windows" else '"'
-        python_ins_cmd = f"python -c {outer}import pkg_resources; print({inner};{inner}.join([(s.key+{inner},{inner}+ s.version) for s in pkg_resources.working_set])){outer}"
-        from six import StringIO
-        buffer = StringIO()
-        self.run(python_ins_cmd, run_environment= True, env = "conanrun",  output=buffer)
-
-        packages = str(buffer.getvalue()).split("-----------------\n")
-        package = packages[1].strip('\r\n').split(";")
-        for pack in package:
-            python_installs.append(pack.split(","))
-
-        with open(os.path.join(location, "AboutDialogVersionsList.qml"), "w") as f:
-            f.write(cura_version_py.render(
-                conan_installs = conan_installs,
-                python_installs = python_installs
-            ))
+    def _conan_installs(self):
+        conan_installs = {}
 
+        # list of conan installs
+        for dependency in self.dependencies.host.values():
+            conan_installs[dependency.ref.name] = {
+                "version": dependency.ref.version,
+                "revision": dependency.ref.revision
+            }
+        return conan_installs
 
     def _generate_cura_version(self, location):
         with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f:
@@ -192,11 +176,13 @@ class CuraConan(ConanFile):
                 cura_cloud_account_api_root = self.conan_data["urls"][self._urls]["cloud_account_api_root"],
                 cura_marketplace_root = self.conan_data["urls"][self._urls]["marketplace_root"],
                 cura_digital_factory_url = self.conan_data["urls"][self._urls]["digital_factory_url"],
-                cura_latest_url = self.conan_data["urls"][self._urls]["cura_latest_url"]))
+                cura_latest_url=self.conan_data["urls"][self._urls]["cura_latest_url"],
+                conan_installs=self._conan_installs(),
+            ))
 
     def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file):
         pyinstaller_metadata = self.conan_data["pyinstaller"]
-        datas = [(str(self._base_dir.joinpath("conan_install_info.json")), ".")]
+        datas = []
         for data in pyinstaller_metadata["datas"].values():
             if not self.options.internal and data.get("internal", False):
                 continue
@@ -289,10 +275,15 @@ class CuraConan(ConanFile):
         copy(self, "requirements-ultimaker.txt", self.recipe_folder, self.export_sources_folder)
         copy(self, "cura_app.py", self.recipe_folder, self.export_sources_folder)
 
+    def config_options(self):
+        if self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str):
+            del self.options.enable_i18n
+
     def configure(self):
         self.options["pyarcus"].shared = True
         self.options["pysavitar"].shared = True
         self.options["pynest2d"].shared = True
+        self.options["dulcificum"].shared = self.settings.os != "Windows"
         self.options["cpython"].shared = True
         self.options["boost"].header_only = True
         if self.settings.os == "Linux":
@@ -305,27 +296,27 @@ class CuraConan(ConanFile):
 
     def requirements(self):
         self.requires("boost/1.82.0")
-        self.requires("curaengine_grpc_definitions/latest@ultimaker/testing")
+        self.requires("fmt/9.0.0")
+        self.requires("curaengine_grpc_definitions/0.1.0")
         self.requires("zlib/1.2.13")
         self.requires("pyarcus/5.3.0")
+        self.requires("dulcificum/(latest)@ultimaker/stable")
         self.requires("curaengine/(latest)@ultimaker/testing")
         self.requires("pysavitar/5.3.0")
         self.requires("pynest2d/5.3.0")
-        self.requires("curaengine_plugin_gradual_flow/(latest)@ultimaker/testing")
-        self.requires("uranium/(latest)@ultimaker/testing")
-        self.requires("cura_binary_data/(latest)@ultimaker/testing")
+        self.requires("curaengine_plugin_gradual_flow/0.1.0")
+        self.requires("uranium/(latest)@ultimaker/stable")
+        self.requires("cura_binary_data/(latest)@ultimaker/stable")
         self.requires("cpython/3.10.4")
         if self.options.internal:
-            self.requires("cura_private_data/(latest)@ultimaker/testing")
+            self.requires("cura_private_data/(latest)@internal/testing")
             self.requires("fdm_materials/(latest)@internal/testing")
         else:
-            self.requires("fdm_materials/(latest)@ultimaker/testing")
+            self.requires("fdm_materials/(latest)@ultimaker/stable")
 
     def build_requirements(self):
-        if self.options.devtools:
-            if self.settings.os != "Windows" or self.conf.get("tools.microsoft.bash:path", check_type = str):
-                # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
-                self.tool_requires("gettext/0.21@ultimaker/testing", force_host_context = True)
+        if self.options.get_safe("enable_i18n", False):
+            self.tool_requires("gettext/0.21@ultimaker/testing", force_host_context = True)
 
     def layout(self):
         self.folders.source = "."
@@ -346,7 +337,6 @@ class CuraConan(ConanFile):
         vr.generate()
 
         self._generate_cura_version(os.path.join(self.source_folder, "cura"))
-        self._generate_about_versions(os.path.join(self.source_folder, "resources","qml", "Dialogs"))
 
         if not self.in_local_cache:
             # Copy CuraEngine.exe to bindirs of Virtual Python Environment
@@ -393,26 +383,24 @@ class CuraConan(ConanFile):
                                             icon_path = "'{}'".format(os.path.join(self.source_folder, "packaging", self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
                                             entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
 
+        if self.options.get_safe("enable_i18n", False):
             # Update the po and pot files
-            if self.settings.os != "Windows" or self.conf.get("tools.microsoft.bash:path", check_type=str):
-                vb = VirtualBuildEnv(self)
-                vb.generate()
+            vb = VirtualBuildEnv(self)
+            vb.generate()
 
-                # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
-                cpp_info = self.dependencies["gettext"].cpp_info
-                pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0])
-                pot.generate()
+            # # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
+            cpp_info = self.dependencies["gettext"].cpp_info
+            pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0])
+            pot.generate()
 
     def build(self):
-        if self.options.devtools:
-            if self.settings.os != "Windows" or self.conf.get("tools.microsoft.bash:path", check_type = str):
-                # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
-                for po_file in self.source_path.joinpath("resources", "i18n").glob("**/*.po"):
-                    mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_path))
-                    mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name)
-                    mkdir(self, str(unix_path(self, Path(mo_file).parent)))
-                    cpp_info = self.dependencies["gettext"].cpp_info
-                    self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True)
+        if self.options.get_safe("enable_i18n", False):
+            for po_file in self.source_path.joinpath("resources", "i18n").glob("**/*.po"):
+                mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_path))
+                mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name)
+                mkdir(self, str(unix_path(self, Path(mo_file).parent)))
+                cpp_info = self.dependencies["gettext"].cpp_info
+                self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True)
 
     def deploy(self):
         copy(self, "*", os.path.join(self.package_folder, self.cpp.package.resdirs[2]), os.path.join(self.install_folder, "packaging"), keep_path = True)
@@ -451,7 +439,6 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV
         save(self, os.path.join(self._script_dir, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env)
 
         self._generate_cura_version(os.path.join(self._site_packages, "cura"))
-        self._generate_about_versions(str(self._share_dir.joinpath("cura", "resources", "qml", "Dialogs")))
 
         entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements"))
         self._generate_pyinstaller_spec(location = self._base_dir,

cura/ApplicationMetadata.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2022 UltiMaker
+#  Copyright (c) 2023 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 
 # ---------
@@ -14,7 +14,7 @@ DEFAULT_CURA_LATEST_URL = "https://software.ultimaker.com/latest.json"
 # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for
 # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the
 # CuraVersion.py.in template.
-CuraSDKVersion = "8.4.0"
+CuraSDKVersion = "8.5.0"
 
 try:
     from cura.CuraVersion import CuraLatestURL
@@ -69,13 +69,25 @@ try:
 except ImportError:
     CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME
 
-DEPENDENCY_INFO = {}
+
 try:
-    from pathlib import Path
-    conan_install_info = Path(__file__).parent.parent.joinpath("conan_install_info.json")
-    if conan_install_info.exists():
-        import json
-        with open(conan_install_info, "r") as f:
-            DEPENDENCY_INFO = json.loads(f.read())
-except:
-    pass
+    from cura.CuraVersion import ConanInstalls
+
+    if type(ConanInstalls) == dict:
+        CONAN_INSTALLS = ConanInstalls
+    else:
+        CONAN_INSTALLS = {}
+
+except ImportError:
+    CONAN_INSTALLS = {}
+
+try:
+    from cura.CuraVersion import PythonInstalls
+
+    if type(PythonInstalls) == dict:
+        PYTHON_INSTALLS = PythonInstalls
+    else:
+        PYTHON_INSTALLS = {}
+
+except ImportError:
+    PYTHON_INSTALLS = {}

cura/Arranging/Arranger.py

@@ -5,7 +5,7 @@ if TYPE_CHECKING:
 
 
 class Arranger:
-    def createGroupOperationForArrange(self, *, add_new_nodes_in_scene: bool = False) -> Tuple["GroupedOperation", int]:
+    def createGroupOperationForArrange(self, add_new_nodes_in_scene: bool = False) -> Tuple["GroupedOperation", int]:
         """
         Find placement for a set of scene nodes, but don't actually move them just yet.
         :param add_new_nodes_in_scene: Whether to create new scene nodes before applying the transformations and rotations
@@ -16,13 +16,12 @@ class Arranger:
         """
         raise NotImplementedError
 
-    def arrange(self, *, add_new_nodes_in_scene: bool = False) -> bool:
+    def arrange(self, add_new_nodes_in_scene: bool = False) -> bool:
         """
         Find placement for a set of scene nodes, and move them by using a single grouped operation.
         :param add_new_nodes_in_scene: Whether to create new scene nodes before applying the transformations and rotations
         :return: found_solution_for_all: Whether the algorithm found a place on the buildplate for all the objects
         """
-        grouped_operation, not_fit_count = self.createGroupOperationForArrange(
-            add_new_nodes_in_scene=add_new_nodes_in_scene)
+        grouped_operation, not_fit_count = self.createGroupOperationForArrange(add_new_nodes_in_scene)
         grouped_operation.push()
         return not_fit_count == 0

cura/Arranging/GridArrange.py

@@ -80,7 +80,7 @@ class GridArrange(Arranger):
 
         self._allowed_grid_idx = self._build_plate_grid_ids.difference(self._fixed_nodes_grid_ids)
 
-    def createGroupOperationForArrange(self, *, add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]:
+    def createGroupOperationForArrange(self, add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]:
         # Find the sequence in which items are placed
         coord_build_plate_center_x = self._build_volume_bounding_box.width * 0.5 + self._build_volume_bounding_box.left
         coord_build_plate_center_y = self._build_volume_bounding_box.depth * 0.5 + self._build_volume_bounding_box.back
@@ -118,8 +118,9 @@ class GridArrange(Arranger):
 
     def _findOptimalGridOffset(self):
         if len(self._fixed_nodes) == 0:
-            self._offset_x = 0
-            self._offset_y = 0
+            edge_disallowed_size = self._build_volume.getEdgeDisallowedSize()
+            self._offset_x = edge_disallowed_size
+            self._offset_y = edge_disallowed_size
             return
 
         if len(self._fixed_nodes) == 1:

cura/Arranging/Nest2DArrange.py

@@ -6,6 +6,7 @@ from pynest2d import Point, Box, Item, NfpConfig, nest
 from typing import List, TYPE_CHECKING, Optional, Tuple
 
 from UM.Application import Application
+from UM.Decorators import deprecated
 from UM.Logger import Logger
 from UM.Math.Matrix import Matrix
 from UM.Math.Polygon import Polygon
@@ -48,8 +49,9 @@ class Nest2DArrange(Arranger):
     def findNodePlacement(self) -> Tuple[bool, List[Item]]:
         spacing = int(1.5 * self._factor)  # 1.5mm spacing.
 
-        machine_width = self._build_volume.getWidth()
-        machine_depth = self._build_volume.getDepth()
+        edge_disallowed_size = self._build_volume.getEdgeDisallowedSize()
+        machine_width = self._build_volume.getWidth() - (edge_disallowed_size * 2)
+        machine_depth = self._build_volume.getDepth() - (edge_disallowed_size * 2)
         build_plate_bounding_box = Box(int(machine_width * self._factor), int(machine_depth * self._factor))
 
         if self._fixed_nodes is None:
@@ -79,7 +81,6 @@ class Nest2DArrange(Arranger):
         ], numpy.float32))
 
         disallowed_areas = self._build_volume.getDisallowedAreas()
-        num_disallowed_areas_added = 0
         for area in disallowed_areas:
             converted_points = []
 
@@ -94,7 +95,6 @@ class Nest2DArrange(Arranger):
                 disallowed_area = Item(converted_points)
                 disallowed_area.markAsDisallowedAreaInBin(0)
                 node_items.append(disallowed_area)
-                num_disallowed_areas_added += 1
 
         for node in self._fixed_nodes:
             converted_points = []
@@ -107,24 +107,29 @@ class Nest2DArrange(Arranger):
                 item = Item(converted_points)
                 item.markAsFixedInBin(0)
                 node_items.append(item)
-                num_disallowed_areas_added += 1
 
-        config = NfpConfig()
-        config.accuracy = 1.0
-        config.alignment = NfpConfig.Alignment.DONT_ALIGN
-        if self._lock_rotation:
-            config.rotations = [0.0]
+        strategies = [NfpConfig.Alignment.CENTER] * 3 + [NfpConfig.Alignment.BOTTOM_LEFT] * 3
+        found_solution_for_all = False
+        while not found_solution_for_all and len(strategies) > 0:
+            config = NfpConfig()
+            config.accuracy = 1.0
+            config.alignment = NfpConfig.Alignment.CENTER
+            config.starting_point = strategies[0]
+            strategies = strategies[1:]
 
-        num_bins = nest(node_items, build_plate_bounding_box, spacing, config)
+            if self._lock_rotation:
+                config.rotations = [0.0]
 
-        # Strip the fixed items (previously placed) and the disallowed areas from the results again.
-        node_items = list(filter(lambda item: not item.isFixed(), node_items))
+            num_bins = nest(node_items, build_plate_bounding_box, spacing, config)
 
-        found_solution_for_all = num_bins == 1
+            # Strip the fixed items (previously placed) and the disallowed areas from the results again.
+            node_items = list(filter(lambda item: not item.isFixed(), node_items))
+
+            found_solution_for_all = num_bins == 1
 
         return found_solution_for_all, node_items
 
-    def createGroupOperationForArrange(self, *, add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]:
+    def createGroupOperationForArrange(self, add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]:
         scene_root = Application.getInstance().getController().getScene().getRoot()
         found_solution_for_all, node_items = self.findNodePlacement()
 
@@ -149,3 +154,30 @@ class Nest2DArrange(Arranger):
                 not_fit_count += 1
 
         return grouped_operation, not_fit_count
+
+
+@deprecated("Use the Nest2DArrange class instead")
+def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildVolume",
+                      fixed_nodes: Optional[List["SceneNode"]] = None, factor=10000) -> Tuple[bool, List[Item]]:
+    arranger = Nest2DArrange(nodes_to_arrange, build_volume, fixed_nodes, factor=factor)
+    return arranger.findNodePlacement()
+
+
+@deprecated("Use the Nest2DArrange class instead")
+def createGroupOperationForArrange(nodes_to_arrange: List["SceneNode"],
+                                   build_volume: "BuildVolume",
+                                   fixed_nodes: Optional[List["SceneNode"]] = None,
+                                   factor=10000,
+                                   add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]:
+    arranger = Nest2DArrange(nodes_to_arrange, build_volume, fixed_nodes, factor=factor)
+    return arranger.createGroupOperationForArrange(add_new_nodes_in_scene=add_new_nodes_in_scene)
+
+
+@deprecated("Use the Nest2DArrange class instead")
+def arrange(nodes_to_arrange: List["SceneNode"],
+            build_volume: "BuildVolume",
+            fixed_nodes: Optional[List["SceneNode"]] = None,
+            factor=10000,
+            add_new_nodes_in_scene: bool = False) -> bool:
+    arranger = Nest2DArrange(nodes_to_arrange, build_volume, fixed_nodes, factor=factor)
+    return arranger.arrange(add_new_nodes_in_scene=add_new_nodes_in_scene)

cura/BackendPlugin.py

@@ -7,7 +7,7 @@ from typing import Optional, List
 
 from UM.Logger import Logger
 from UM.Message import Message
-from UM.Settings.AdditionalSettingDefinitionAppender import AdditionalSettingDefinitionsAppender
+from UM.Settings.AdditionalSettingDefinitionsAppender import AdditionalSettingDefinitionsAppender
 from UM.PluginObject import PluginObject
 from UM.i18n import i18nCatalog
 from UM.Platform import Platform
@@ -16,9 +16,10 @@ from UM.Resources import Resources
 
 class BackendPlugin(AdditionalSettingDefinitionsAppender, PluginObject):
     catalog = i18nCatalog("cura")
+    settings_catalog = i18nCatalog("fdmprinter.def.json")
 
     def __init__(self) -> None:
-        super().__init__()
+        super().__init__(self.settings_catalog)
         self.__port: int = 0
         self._plugin_address: str = "127.0.0.1"
         self._plugin_command: Optional[List[str]] = None

cura/BuildVolume.py

@@ -813,7 +813,7 @@ class BuildVolume(SceneNode):
             prime_tower_areas = self._computeDisallowedAreasPrinted(used_extruders)
             for extruder_id in prime_tower_areas:
                 for area_index, prime_tower_area in enumerate(prime_tower_areas[extruder_id]):
-                    for area in result_areas[extruder_id]:
+                    for area in result_areas_no_brim[extruder_id]:
                         if prime_tower_area.intersectsPolygon(area) is not None:
                             prime_tower_collision = True
                             break
@@ -860,13 +860,24 @@ class BuildVolume(SceneNode):
             machine_depth = self._global_container_stack.getProperty("machine_depth", "value")
             prime_tower_x = self._global_container_stack.getProperty("prime_tower_position_x", "value")
             prime_tower_y = - self._global_container_stack.getProperty("prime_tower_position_y", "value")
+            prime_tower_brim_enable = self._global_container_stack.getProperty("prime_tower_brim_enable", "value")
+            prime_tower_base_size = self._global_container_stack.getProperty("prime_tower_base_size", "value")
+            prime_tower_base_height = self._global_container_stack.getProperty("prime_tower_base_height", "value")
+            adhesion_type = self._global_container_stack.getProperty("adhesion_type", "value")
+
             if not self._global_container_stack.getProperty("machine_center_is_zero", "value"):
                 prime_tower_x = prime_tower_x - machine_width / 2 #Offset by half machine_width and _depth to put the origin in the front-left.
                 prime_tower_y = prime_tower_y + machine_depth / 2
 
             radius = prime_tower_size / 2
-            prime_tower_area = Polygon.approximatedCircle(radius, num_segments = 24)
-            prime_tower_area = prime_tower_area.translate(prime_tower_x - radius, prime_tower_y - radius)
+            delta_x = -radius
+            delta_y = -radius
+
+            if prime_tower_base_size > 0 and ((prime_tower_brim_enable and prime_tower_base_height > 0) or adhesion_type == "raft"):
+                radius += prime_tower_base_size
+
+            prime_tower_area = Polygon.approximatedCircle(radius, num_segments = 32)
+            prime_tower_area = prime_tower_area.translate(prime_tower_x + delta_x, prime_tower_y + delta_y)
 
             prime_tower_area = prime_tower_area.getMinkowskiHull(Polygon.approximatedCircle(0))
             for extruder in used_extruders:
@@ -1171,7 +1182,7 @@ class BuildVolume(SceneNode):
     _raft_settings = ["adhesion_type", "raft_base_thickness", "raft_interface_layers", "raft_interface_thickness", "raft_surface_layers", "raft_surface_thickness", "raft_airgap", "layer_0_z_overlap"]
     _extra_z_settings = ["retraction_hop_enabled", "retraction_hop"]
     _prime_settings = ["extruder_prime_pos_x", "extruder_prime_pos_y", "prime_blob_enable"]
-    _tower_settings = ["prime_tower_enable", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y", "prime_tower_brim_enable"]
+    _tower_settings = ["prime_tower_enable", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y", "prime_tower_brim_enable", "prime_tower_base_size", "prime_tower_base_height"]
     _ooze_shield_settings = ["ooze_shield_enabled", "ooze_shield_dist"]
     _distance_settings = ["infill_wipe_dist", "travel_avoid_distance", "support_offset", "support_enable", "travel_avoid_other_parts", "travel_avoid_supports", "wall_line_count", "wall_line_width_0", "wall_line_width_x"]
     _extruder_settings = ["support_enable", "support_bottom_enable", "support_roof_enable", "support_infill_extruder_nr", "support_extruder_nr_layer_0", "support_bottom_extruder_nr", "support_roof_extruder_nr", "brim_line_count", "skirt_brim_extruder_nr", "raft_base_extruder_nr", "raft_interface_extruder_nr", "raft_surface_extruder_nr", "adhesion_type"] #Settings that can affect which extruders are used.

cura/CuraApplication.py

@@ -6,6 +6,7 @@ import sys
 import tempfile
 import time
 import platform
+from pathlib import Path
 from typing import cast, TYPE_CHECKING, Optional, Callable, List, Any, Dict
 
 import numpy
@@ -269,6 +270,9 @@ class CuraApplication(QtApplication):
         CentralFileStorage.setIsEnterprise(ApplicationMetadata.IsEnterpriseVersion)
         Resources.setIsEnterprise(ApplicationMetadata.IsEnterpriseVersion)
 
+        self._conan_installs = ApplicationMetadata.CONAN_INSTALLS
+        self._python_installs = ApplicationMetadata.PYTHON_INSTALLS
+
     @pyqtProperty(str, constant=True)
     def ultimakerCloudApiRootUrl(self) -> str:
         return UltimakerCloudConstants.CuraCloudAPIRoot
@@ -363,6 +367,10 @@ class CuraApplication(QtApplication):
 
         Resources.addSecureSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources"))
         if not hasattr(sys, "frozen"):
+            cura_data_root = os.environ.get('CURA_DATA_ROOT', None)
+            if cura_data_root:
+                Resources.addSearchPath(str(Path(cura_data_root).joinpath("resources")))
+
             Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources"))
 
             # local Conan cache
@@ -851,11 +859,8 @@ class CuraApplication(QtApplication):
 
         self._log_hardware_info()
 
-        if len(ApplicationMetadata.DEPENDENCY_INFO) > 0:
-            Logger.debug("Using Conan managed dependencies: " + ", ".join(
-                [dep["recipe"]["id"] for dep in ApplicationMetadata.DEPENDENCY_INFO["installed"] if dep["recipe"]["version"] != "latest"]))
-        else:
-            Logger.warning("Could not find conan_install_info.json")
+        Logger.debug("Using conan dependencies: {}", str(self.conanInstalls))
+        Logger.debug("Using python dependencies: {}", str(self.pythonInstalls))
 
         Logger.log("i", "Initializing machine error checker")
         self._machine_error_checker = MachineErrorChecker(self)
@@ -1550,15 +1555,14 @@ class CuraApplication(QtApplication):
                     Logger.log("w", "Unable to reload data because we don't have a filename.")
 
         for file_name, nodes in objects_in_filename.items():
-            for node in nodes:
-                file_path = os.path.normpath(os.path.dirname(file_name))
-                job = ReadMeshJob(file_name, add_to_recent_files = file_path != tempfile.gettempdir())  # Don't add temp files to the recent files list
-                job._node = node  # type: ignore
-                job.finished.connect(self._reloadMeshFinished)
-                if has_merged_nodes:
-                    job.finished.connect(self.updateOriginOfMergedMeshes)
-
-                job.start()
+            file_path = os.path.normpath(os.path.dirname(file_name))
+            job = ReadMeshJob(file_name,
+                              add_to_recent_files=file_path != tempfile.gettempdir())  # Don't add temp files to the recent files list
+            job._nodes = nodes  # type: ignore
+            job.finished.connect(self._reloadMeshFinished)
+            if has_merged_nodes:
+                job.finished.connect(self.updateOriginOfMergedMeshes)
+            job.start()
 
     @pyqtSlot("QStringList")
     def setExpandedCategories(self, categories: List[str]) -> None:
@@ -1730,9 +1734,10 @@ class CuraApplication(QtApplication):
 
     def _reloadMeshFinished(self, job) -> None:
         """
-        Function called whenever a ReadMeshJob finishes in the background. It reloads a specific node object in the
+        Function called when ReadMeshJob finishes reloading a file in the background, then update node objects in the
         scene from its source file. The function gets all the nodes that exist in the file through the job result, and
-        then finds the scene node that it wants to refresh by its object id. Each job refreshes only one node.
+        then finds the scene nodes that need to be refreshed by their name. Each job refreshes all nodes of a file.
+        Nodes that are not present in the updated file are kept in the scene.
 
         :param job: The :py:class:`Uranium.UM.ReadMeshJob.ReadMeshJob` running in the background that reads all the
         meshes in a file
@@ -1742,21 +1747,37 @@ class CuraApplication(QtApplication):
         if len(job_result) == 0:
             Logger.log("e", "Reloading the mesh failed.")
             return
-        object_found = False
-        mesh_data = None
+        renamed_nodes = {} # type: Dict[str, int]
         # Find the node to be refreshed based on its id
         for job_result_node in job_result:
-            if job_result_node.getId() == job._node.getId():
-                mesh_data = job_result_node.getMeshData()
-                object_found = True
-                break
-        if not object_found:
-            Logger.warning("The object with id {} no longer exists! Keeping the old version in the scene.".format(job_result_node.getId()))
-            return
-        if not mesh_data:
-            Logger.log("w", "Could not find a mesh in reloaded node.")
-            return
-        job._node.setMeshData(mesh_data)
+            mesh_data = job_result_node.getMeshData()
+            if not mesh_data:
+                Logger.log("w", "Could not find a mesh in reloaded node.")
+                continue
+
+            # Solves issues with object naming
+            result_node_name = job_result_node.getName()
+            if not result_node_name:
+                result_node_name = os.path.basename(mesh_data.getFileName())
+            if result_node_name in renamed_nodes:  # objects may get renamed by ObjectsModel._renameNodes() when loaded
+                renamed_nodes[result_node_name] += 1
+                result_node_name = "{0}({1})".format(result_node_name, renamed_nodes[result_node_name])
+            else:
+                renamed_nodes[job_result_node.getName()] = 0
+
+            # Find the matching scene node to replace
+            scene_node = None
+            for replaced_node in job._nodes:
+                if replaced_node.getName() == result_node_name:
+                    scene_node = replaced_node
+                    break
+
+            if scene_node:
+                scene_node.setMeshData(mesh_data)
+            else:
+                # Current node is a new one in the file, or it's name has changed
+                # TODO: Load this mesh into the scene. Also alter the "_reloadJobFinished" action in UM.Scene
+                Logger.log("w", "Could not find matching node for object '{0}' in the scene.".format(result_node_name))
 
     def _openFile(self, filename):
         self.readLocalFile(QUrl.fromLocalFile(filename))
@@ -1943,7 +1964,8 @@ class CuraApplication(QtApplication):
                     node.scale(original_node.getScale())
 
             node.setSelectable(True)
-            node.setName(os.path.basename(file_name))
+            if not node.getName():
+                node.setName(os.path.basename(file_name))
             self.getBuildVolume().checkBoundsAndUpdate(node)
 
             is_non_sliceable = "." + file_extension in self._non_sliceable_extensions
@@ -2130,3 +2152,11 @@ class CuraApplication(QtApplication):
     @pyqtProperty(bool, constant=True)
     def isEnterprise(self) -> bool:
         return ApplicationMetadata.IsEnterpriseVersion
+
+    @pyqtProperty("QVariant", constant=True)
+    def conanInstalls(self) -> Dict[str, Dict[str, str]]:
+        return self._conan_installs
+
+    @pyqtProperty("QVariant", constant=True)
+    def pythonInstalls(self) -> Dict[str, Dict[str, str]]:
+        return self._python_installs

cura/Machines/Models/CompatibleMachineModel.py

@@ -51,6 +51,9 @@ class CompatibleMachineModel(ListModel):
         for output_device in machine_manager.printerOutputDevices:
             for printer in output_device.printers:
                 extruder_configs = dict()
+                # If the printer name already exist in the queue skip it
+                if printer.name in [item["name"] for item in self.items]:
+                    continue
 
                 # initialize & add current active material:
                 for extruder in printer.extruders:

cura/Machines/Models/IntentCategoryModel.py

@@ -39,7 +39,9 @@ class IntentCategoryModel(ListModel):
         """
         if len(cls._translations) == 0:
             cls._translations["default"] = {
-                "name": catalog.i18nc("@label", "Default")
+                "name": catalog.i18nc("@label", "Balanced"),
+                "description": catalog.i18nc("@text",
+                                             "The balanced profile is designed to strike a balance between productivity, surface quality, mechanical properties and dimensional accuracy.")
             }
             cls._translations["visual"] = {
                 "name": catalog.i18nc("@label", "Visual"),

cura/Machines/Models/IntentTranslations.py

@@ -8,7 +8,9 @@ catalog = i18nCatalog("cura")
 
 intent_translations = collections.OrderedDict()  # type: collections.OrderedDict[str, Dict[str, Optional[str]]]
 intent_translations["default"] = {
-    "name": catalog.i18nc("@label", "Default")
+    "name": catalog.i18nc("@label", "Balanced"),
+    "description": catalog.i18nc("@text",
+                                 "The balanced profile is designed to strike a balance between productivity, surface quality, mechanical properties and dimensional accuracy.")
 }
 intent_translations["visual"] = {
     "name": catalog.i18nc("@label", "Visual"),

cura/Machines/Models/QualityManagementModel.py

@@ -344,7 +344,7 @@ class QualityManagementModel(ListModel):
                     "quality_type": quality_group.quality_type,
                     "quality_changes_group": None,
                     "intent_category": "default",
-                    "section_name": catalog.i18nc("@label", "Default"),
+                    "section_name": catalog.i18nc("@label", "Balanced"),
                     "layer_height": layer_height,  # layer_height is only used for sorting
                     }
             item_list.append(item)

cura/PrinterOutput/Models/ExtruderConfigurationModel.py

@@ -40,9 +40,22 @@ class ExtruderConfigurationModel(QObject):
 
     def setHotendID(self, hotend_id: Optional[str]) -> None:
         if self._hotend_id != hotend_id:
-            self._hotend_id = hotend_id
+            self._hotend_id = ExtruderConfigurationModel.applyNameMappingHotend(hotend_id)
             self.extruderConfigurationChanged.emit()
 
+    @staticmethod
+    def applyNameMappingHotend(hotendId) -> str:
+        _EXTRUDER_NAME_MAP = {
+            "mk14_hot":"1XA",
+            "mk14_hot_s":"2XA",
+            "mk14_c":"1C",
+            "mk14":"1A",
+            "mk14_s":"2A"
+        }
+        if hotendId in _EXTRUDER_NAME_MAP:
+            return _EXTRUDER_NAME_MAP[hotendId]
+        return hotendId
+
     @pyqtProperty(str, fset = setHotendID, notify = extruderConfigurationChanged)
     def hotendID(self) -> Optional[str]:
         return self._hotend_id

cura/PrinterOutput/Models/MaterialOutputModel.py

@@ -9,7 +9,9 @@ from PyQt6.QtCore import pyqtProperty, QObject
 class MaterialOutputModel(QObject):
     def __init__(self, guid: Optional[str], type: str, color: str, brand: str, name: str, parent = None) -> None:
         super().__init__(parent)
-        self._guid = guid
+
+        name, guid = MaterialOutputModel.getMaterialFromDefinition(guid,type, brand, name)
+        self._guid =guid
         self._type = type
         self._color = color
         self._brand = brand
@@ -19,6 +21,34 @@ class MaterialOutputModel(QObject):
     def guid(self) -> str:
         return self._guid if self._guid else ""
 
+    @staticmethod
+    def getMaterialFromDefinition(guid, type, brand, name):
+
+        _MATERIAL_MAP = {	"abs" 		:{"name" :"abs_175"       ,"guid": "2780b345-577b-4a24-a2c5-12e6aad3e690"},
+                            "abs-wss1"	:{"name" :"absr_175"      ,"guid": "88c8919c-6a09-471a-b7b6-e801263d862d"},
+                            "asa" 		:{"name" :"asa_175"       ,"guid": "416eead4-0d8e-4f0b-8bfc-a91a519befa5"},
+                            "nylon-cf" 	:{"name" :"cffpa_175"     ,"guid": "85bbae0e-938d-46fb-989f-c9b3689dc4f0"},
+                            "nylon"		:{"name" :"nylon_175"     ,"guid": "283d439a-3490-4481-920c-c51d8cdecf9c"},
+                            "pc"		:{"name" :"pc_175"        ,"guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"},
+                            "petg"		:{"name" :"petg_175"      ,"guid": "69386c85-5b6c-421a-bec5-aeb1fb33f060"},
+                            "pla" 		:{"name" :"pla_175"       ,"guid": "0ff92885-617b-4144-a03c-9989872454bc"},
+                            "pva"		:{"name" :"pva_175"       ,"guid": "a4255da2-cb2a-4042-be49-4a83957a2f9a"},
+                            "wss1"		:{"name" :"rapidrinse_175","guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"},
+                            "sr30"		:{"name" :"sr30_175"      ,"guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"},
+                            "im-pla"    :{"name" :"tough_pla_175" ,"guid": "96fca5d9-0371-4516-9e96-8e8182677f3c"},
+                            "bvoh"		:{"name" :"bvoh_175"      ,"guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"},
+                            "cpe"		:{"name" :"cpe_175"       ,"guid": "da1872c1-b991-4795-80ad-bdac0f131726"},
+                            "hips"		:{"name" :"hips_175"      ,"guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"},
+                            "tpu"		:{"name" :"tpu_175"       ,"guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}
+                        }
+
+
+        if guid is None and brand is not "empty" and type in _MATERIAL_MAP:
+            name = _MATERIAL_MAP[type]["name"]
+            guid = _MATERIAL_MAP[type]["guid"]
+        return name, guid
+
+
     @pyqtProperty(str, constant = True)
     def type(self) -> str:
         return self._type

cura/PrinterOutput/NetworkMJPGImage.py

@@ -1,6 +1,8 @@
 # Copyright (c) 2018 Aldo Hoeben / fieldOfView
 # NetworkMJPGImage is released under the terms of the LGPLv3 or higher.
 
+from typing import Optional
+
 from PyQt6.QtCore import QUrl, pyqtProperty, pyqtSignal, pyqtSlot, QRect, QByteArray
 from PyQt6.QtGui import QImage, QPainter
 from PyQt6.QtQuick import QQuickPaintedItem
@@ -19,9 +21,9 @@ class NetworkMJPGImage(QQuickPaintedItem):
 
         self._stream_buffer = QByteArray()
         self._stream_buffer_start_index = -1
-        self._network_manager = None  # type: QNetworkAccessManager
-        self._image_request = None  # type: QNetworkRequest
-        self._image_reply = None  # type: QNetworkReply
+        self._network_manager: Optional[QNetworkAccessManager] = None
+        self._image_request: Optional[QNetworkRequest] = None
+        self._image_reply: Optional[QNetworkReply] = None
         self._image = QImage()
         self._image_rect = QRect()
 

cura/PrinterOutput/NetworkedPrinterOutputDevice.py

@@ -415,7 +415,18 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
 
     @pyqtProperty(str, constant = True)
     def printerType(self) -> str:
-        return self._properties.get(b"printer_type", b"Unknown").decode("utf-8")
+        return NetworkedPrinterOutputDevice.applyPrinterTypeMapping(self._properties.get(b"printer_type", b"Unknown").decode("utf-8"))
+
+    @staticmethod
+    def applyPrinterTypeMapping(printer_type):
+        _PRINTER_TYPE_NAME = {
+            "fire_e": "ultimaker_method",
+            "lava_f": "ultimaker_methodx",
+            "magma_10": "ultimaker_methodxl"
+        }
+        if printer_type in _PRINTER_TYPE_NAME:
+            return _PRINTER_TYPE_NAME[printer_type]
+        return printer_type
 
     @pyqtProperty(str, constant = True)
     def ipAddress(self) -> str:

cura/Settings/CuraFormulaFunctions.py

@@ -56,6 +56,9 @@ class CuraFormulaFunctions:
         if isinstance(value, SettingFunction):
             value = value(extruder_stack, context = context)
 
+        if isinstance(value, str):
+            value = value.lower()
+
         return value
 
     def _getActiveExtruders(self, context: Optional["PropertyEvaluationContext"] = None) -> List[str]:

cura/Settings/CuraStackBuilder.py

@@ -284,16 +284,20 @@ class CuraStackBuilder:
         abstract_machines = registry.findContainerStacks(id = abstract_machine_id)
         if abstract_machines:
             return cast(GlobalStack, abstract_machines[0])
+
         definitions = registry.findDefinitionContainers(id=definition_id)
 
         name = ""
-
         if definitions:
             name = definitions[0].getName()
+
         stack = cls.createMachine(abstract_machine_id, definition_id, show_warning_message=False)
         if not stack:
             return None
 
+        if not stack.getMetaDataEntry("visible", True):
+            return None
+
         stack.setName(name)
 
         stack.setMetaDataEntry("is_abstract_machine", True)

cura/Settings/MachineManager.py

@@ -1700,6 +1700,16 @@ class MachineManager(QObject):
             else:  # No intent had the correct category.
                 extruder.intent = empty_intent_container
 
+    @pyqtSlot()
+    def resetIntents(self) -> None:
+        """Reset the intent category of the current printer.
+        """
+        global_stack = self._application.getGlobalContainerStack()
+        if global_stack is None:
+            return
+        for extruder in global_stack.extruderList:
+            extruder.intent = empty_intent_container
+
     def activeQualityGroup(self) -> Optional["QualityGroup"]:
         """Get the currently activated quality group.
 

cura/Snapshot.py

@@ -1,7 +1,9 @@
-# Copyright (c) 2021 Ultimaker B.V.
+# Copyright (c) 2023 UltiMaker
 # Cura is released under the terms of the LGPLv3 or higher.
 import numpy
 
+from typing import Optional
+
 from PyQt6 import QtCore
 from PyQt6.QtCore import QCoreApplication
 from PyQt6.QtGui import QImage
@@ -10,11 +12,13 @@ from UM.Logger import Logger
 from cura.PreviewPass import PreviewPass
 
 from UM.Application import Application
+from UM.Math.AxisAlignedBox import AxisAlignedBox
 from UM.Math.Matrix import Matrix
 from UM.Math.Vector import Vector
 from UM.Scene.Camera import Camera
 from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
-
+from UM.Scene.SceneNode import SceneNode
+from UM.Qt.QtRenderer import QtRenderer
 
 class Snapshot:
     @staticmethod
@@ -32,6 +36,87 @@ class Snapshot:
 
         return min_x, max_x, min_y, max_y
 
+    @staticmethod
+    def isometricSnapshot(width: int = 300, height: int = 300) -> Optional[QImage]:
+        """Create an isometric snapshot of the scene."""
+
+        root = Application.getInstance().getController().getScene().getRoot()
+
+        # the direction the camera is looking at to create the isometric view
+        iso_view_dir = Vector(-1, -1, -1).normalized()
+
+        bounds = Snapshot.nodeBounds(root)
+        if bounds is None:
+            Logger.log("w", "There appears to be nothing to render")
+            return None
+
+        camera = Camera("snapshot")
+
+        # find local x and y directional vectors of the camera
+        tangent_space_x_direction = iso_view_dir.cross(Vector.Unit_Y).normalized()
+        tangent_space_y_direction = tangent_space_x_direction.cross(iso_view_dir).normalized()
+
+        # find extreme screen space coords of the scene
+        x_points = [p.dot(tangent_space_x_direction) for p in bounds.points]
+        y_points = [p.dot(tangent_space_y_direction) for p in bounds.points]
+        min_x = min(x_points)
+        max_x = max(x_points)
+        min_y = min(y_points)
+        max_y = max(y_points)
+        camera_width = max_x - min_x
+        camera_height = max_y - min_y
+
+        if camera_width == 0 or camera_height == 0:
+            Logger.log("w", "There appears to be nothing to render")
+            return None
+
+        # increase either width or height to match the aspect ratio of the image
+        if camera_width / camera_height > width / height:
+            camera_height = camera_width * height / width
+        else:
+            camera_width = camera_height * width / height
+
+        # Configure camera for isometric view
+        ortho_matrix = Matrix()
+        ortho_matrix.setOrtho(
+            -camera_width / 2,
+            camera_width / 2,
+            -camera_height / 2,
+            camera_height / 2,
+            -10000,
+            10000
+        )
+        camera.setPerspective(False)
+        camera.setProjectionMatrix(ortho_matrix)
+        camera.setPosition(bounds.center)
+        camera.lookAt(bounds.center + iso_view_dir)
+
+        # Render the scene
+        renderer = QtRenderer()
+        render_pass = PreviewPass(width, height)
+        renderer.setViewportSize(width, height)
+        renderer.setWindowSize(width, height)
+        render_pass.setCamera(camera)
+        renderer.addRenderPass(render_pass)
+        renderer.beginRendering()
+        renderer.render()
+
+        return render_pass.getOutput()
+
+    @staticmethod
+    def nodeBounds(root_node: SceneNode) -> Optional[AxisAlignedBox]:
+        axis_aligned_box = None
+        for node in DepthFirstIterator(root_node):
+            if not getattr(node, "_outside_buildarea", False):
+                if node.callDecoration(
+                        "isSliceable") and node.getMeshData() and node.isVisible() and not node.callDecoration(
+                        "isNonThumbnailVisibleMesh"):
+                    if axis_aligned_box is None:
+                        axis_aligned_box = node.getBoundingBox()
+                    else:
+                        axis_aligned_box = axis_aligned_box + node.getBoundingBox()
+        return axis_aligned_box
+
     @staticmethod
     def snapshot(width = 300, height = 300):
         """Return a QImage of the scene
@@ -55,14 +140,7 @@ class Snapshot:
         camera = Camera("snapshot", root)
 
         # determine zoom and look at
-        bbox = None
-        for node in DepthFirstIterator(root):
-            if not getattr(node, "_outside_buildarea", False):
-                if node.callDecoration("isSliceable") and node.getMeshData() and node.isVisible() and not node.callDecoration("isNonThumbnailVisibleMesh"):
-                    if bbox is None:
-                        bbox = node.getBoundingBox()
-                    else:
-                        bbox = bbox + node.getBoundingBox()
+        bbox = Snapshot.nodeBounds(root)
         # If there is no bounding box, it means that there is no model in the buildplate
         if bbox is None:
             Logger.log("w", "Unable to create snapshot as we seem to have an empty buildplate")

cura/UI/ObjectsModel.py

@@ -69,7 +69,7 @@ class ObjectsModel(ListModel):
         self._group_name_template = catalog.i18nc("@label", "Group #{group_nr}")
         self._group_name_prefix = self._group_name_template.split("#")[0]
 
-        self._naming_regex = re.compile("^(.+)\(([0-9]+)\)$")
+        self._naming_regex = re.compile(r"^(.+)\(([0-9]+)\)$")
 
     def setActiveBuildPlate(self, nr: int) -> None:
         if self._build_plate_number != nr:

docs/How_to_use_the_flame_graph_profiler.md

@@ -1,37 +0,0 @@
-
-How to Profile Cura and See What It is Doing
-============================================
-Cura has a simple flame graph profiler available as a plugin which can be used to see what Cura is doing as it runs and how much time it takes. A flame graph profile shows its output as a timeline and stacks of "blocks" which represent parts of the code and are stacked up to show call depth. These often form little peaks which look like flames. It is a simple yet powerful way to visualise the activity of a program.
-
-
-Setting up and installing the profiler
---------------------------------------
-
-The profiler plugin is kept outside of the Cura source code here: https://github.com/sedwards2009/cura-big-flame-graph
-
-To install it do:
-
-* Use `git clone https://github.com/sedwards2009/cura-big-flame-graph.git` to grab a copy of the code.
-* Copy the `BigFlameGraph` directory into the `plugins` directory in your local Cura.
-* Set the `URANIUM_FLAME_PROFILER` environment variable to something before starting Cura. This flags to the profiler code in Cura to activate and insert the needed hooks into the code.
-
-
-Using the profiler
-------------------
-To open the profiler go to the Extensions menu and select "Start BFG" from the "Big Flame Graph" menu. A page will open up in your default browser. This is the profiler UI. Click on "Record" to start recording, go to Cura and perform an action and then back in the profiler click on "Stop". The results should now load in.
-
-The time scale is at the top of the window. The blocks should be read as meaning the blocks at the bottom call the blocks which are stacked on top of them. Hover the mouse to get more detailed information about a block such as the name of the code involved and its duration. Use the zoom buttons or mouse wheel to zoom in. The display can be panned by dragging with the left mouse button.
-
-Note: The profiler front-end itself is quite "heavy" (ok, not optimised). It runs much better in Google Chrome or Chromium than Firefox. It is also a good idea to keep recording sessions short for the same reason.
-
-
-What the Profiler Sees
-----------------------
-The profiler doesn't capture every function call in Cura. It hooks into a number of important systems which give a good picture of activity without too much run time overhead. The most important system is Uranium's signal mechanism and PyQt5 slots. Functions which are called via the signal mechanism are recorded and their names appear in the results. PyQt5 slots appear in the results with the prefix `[SLOT]`.
-
-Note that not all slots are captured. Only those slots which belong to classes which use the `pyqtSlot` decorator from the `UM.FlameProfiler` module.
-
-
-Manually adding profiling code to more detail
----------------------------------------------
-It is also possible to manually add decorators to methods to make them appear in the profiler results. The `UM.FlameProfiler` module contains the `profile` decorator which can be applied to methods. There is also a `profileCall` context manager which can be used with Python's `with` statement to measure a block of code. `profileCall` takes one argument, a label to use in the results.

docs/Profile Structure.drawio

@@ -1 +0,0 @@
-<mxfile host="www.draw.io" modified="2019-12-20T12:34:56.339Z" agent="Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:66.0) Gecko/20100101 Firefox/66.0" etag="1NLsmsxIqXUmOJee4m9D" version="12.4.3" type="device" pages="1"><diagram id="K0t5C8WxT4tyKudoHXNk" name="Page-1">7VzbcqM4EP0aP+4WSFzsx8SZmd2tpCqTbO1kn1KKkW3VYOQBObHn61cyF0MLM9jhkmyo8gMSLXQ5R+rTDckIT1fbLyFZL2+4R/0RMrztCF+NEDIthEbqZ3i7uMZ13LhiETIvMTpU3LOfNKk0ktoN82hUMBSc+4Kti5UzHgR0Jgp1JAz5S9Fszv1ir2uyoFrF/Yz4eu035ollXDtG7qH+D8oWy7Rn05nEd1YkNU5mEi2Jx19yVfjTCE9DzkV8tdpOqa8WL12XuN3nI3ezgYU0EHUa/OXdPfz4exV+fRLWl92tG9388/m35CnPxN8kE/4zEOqB8ZDFLl2H6IWtfBLI0uWcB+I+uWPI8mzJfO+a7PhGjSMSZPY9LV0uech+Snviy1umrJC3Q5HAjFXrOfP9Kfd5KCsCvu/g0OhePSzpJqSRbHabztcEVTdkWzC8JpFIB8h9n6wj9rQfsmq4IuGCBZdcCL5KjJKFoKGg26MrbGa4ScJTvqIi3EmTtIGTQJ1w3URWXH45MMecJDbLPGvShiRh6yJ7dtbdnWQ3CRZyCll/2SZJ+7MMrT+npDvkFHsjvqBhQAS95JvAi/Iskhe5mR6q9tw6gWdY4xnb8+xxJrtdcDVTOSi8vciQyHFPIiL21An5dwq4UkIf4rNFIIs+natmClImN/RFUi34Wj1sTWYsWFzvba6sQ81dsk6qisu2c3+/aZfM82ig2MUFEeQpY/+ay5nsF9K+lD+53FPjd3tky4FPZdk8lOVPmYdiygM5F8L2rKKSpy9UcbUeBY9vY52XCS+wTotSGkJe5FlYIMSp6Fsa+vJ0pCGTp8KAdbNY207PWE80rD06ZwETjAcD2g2jPUY9o516oBzcz0RubKUghgO9LdhNY9w37rpw/LGROIndo9it6YB404jjmlKyNcRtDfCvMeCdhApyWv+vUMEtSndslmg0qyxUwBWhwqsAdgaR1txutit3MyoRaWVgt7aZ3eH07hJvu0SmdYr3eFBp3aPuloi0TlE39SM9H4sNyLeFvGmUqLVuoddPeA1lGngXKkMuSzOfRBGbKUElVqn+olsmHpJFV9f/qmu5snHpapu7dbVLC4Ec/UO+kGuliodm+1LaLh4c9bRkPBBUcgJ8E85o1dTT1wRSuNEqDN1yDHOY2SWQpXUh9Ylgz8XxVuRvbxVtcwJwXBSAaAIeEc8zaZVP64MHZe8XMl8DHhSvg/YgCT3Z5cySbXV8wBgM2DUrxwXtsWsDVscjaDTNbOqO7qiIHcKUX4cpFgDRrKtkshOw+ZNNTzA+kYg+ylUfhOsZaYdxpSfrPVJBeoJxyCe3h3fvkQrSE4tZqDKA3SzYvQcoqSh9lUo9U3Gm6jZVunXUbYMq1aopUmN315dKxSBNmanWU1WqBT5VQJZbS6U2JQyR/gr62LEy6MLTdSEa1wx40yOn+aNEfz8RkNWgCE93GvFWecOKsDqrNeDdLN79K0I9pv8oImFcUySgI+nIbkSCbYAMlHumSLBtmMoCD2oolQXFiGUYleOC9hhhwOoWUln4pMB3EC2/Fi0OyJRip+bRlh6BjR9tWA92pf3gwk51YdgoB/6tSBasRx+nu7AzXNFbeBvj1PRh+Mjm7caHWeDTffvcQNcGvsKG3+s05cMs4MOSv0g56sOgvVF4fdOSD9ODso/Ce/Q+eI9AIO+cy3voXG2rHd7bE+DErUn1fpz0wXs9RO2W92Z/vDfeBe8d+HYahhp1ee+CDKkFN1BDvHcBj5FZfd5D+2543+BXJ++N93W/Ouk3VncMSItzz3sQq2O7Hd7DASMLV4/LgBu7i1hd/ybhdN6fyeFzvtJqkPeTd3Hcm4AVDlTldWlvwhRVS8e9Cd+XmdUyB9pbdnVKS3MPp9p34U4sPT3SrTvpMWyuK6P6dSdaZnRy5r6C8TduKXzQ30Pb1ePqI/VroQ/L+7pRc7+fRcDX35ror0178BWw1VK2CI/h9qp2J9DenLzquJfFw/85ic0P/y0Gf/oP</diagram></mxfile>

docs/Report.md

@@ -1,81 +0,0 @@
-
-# Reporting Issues
-
-Please attach the following information in case <br>
-you want to report crashing or similar issues.
-
-<br>
-
-## DxDiag
-
-### ![Badge Windows]
-
-The log as produced by **dxdiag**.
-
-<kbd>  start  </kbd>  »  <kbd>  run  </kbd>  »  <kbd>  dxdiag  </kbd>  »  <kbd>  save output  </kbd>
-
-<br>
-<br>
-
-## Cura GUI Log
-
-If the Cura user interface still starts, you can also <br>
-reach these directories from the application menu:
-
-<kbd>  Help  </kbd>  »  <kbd>  Show settings folder  </kbd>
-
-<br>
-
-### ![Badge Windows]
-
-```
-%APPDATA%\cura\<Ｃｕｒａ Ｖｅｒｓｉｏｎ>\cura.log
-```
-
-or
-
-```
-C:\Users\<your username>\AppData\Roaming\cura\<Ｃｕｒａ Ｖｅｒｓｉｏｎ>\cura.log
-```
-
-<br>
-
-### ![Badge Linux]
-
-```
-~/.local/share/cura/<Ｃｕｒａ Ｖｅｒｓｉｏｎ>/cura.log
-```
-
-<br>
-
-### ![Badge MacOS]
-
-```
-~/Library/Application Support/cura/<Ｃｕｒａ Ｖｅｒｓｉｏｎ>/cura.log
-```
-
-<br>
-<br>
-
-## Alternative
-
-An alternative is to install the **[ExtensiveSupportLogging]** <br>
-plugin this creates a zip folder of the relevant log files.
-
-If you're experiencing performance issues, we might ask <br>
-you to connect the CPU profiler in this plugin and attach <br>
-the collected data to your support ticket. 
-
-<br>
-
-
-<!----------------------------------------------------------------------------->
-
-[ExtensiveSupportLogging]: https://marketplace.ultimaker.com/app/cura/plugins/UltimakerPackages/ExtensiveSupportLogging
-
-
-<!---------------------------------[ Badges ]---------------------------------->
-
-[Badge Windows]: https://img.shields.io/badge/Windows-0078D6?style=for-the-badge&logoColor=white&logo=Windows
-[Badge Linux]: https://img.shields.io/badge/Linux-00A95C?style=for-the-badge&logoColor=white&logo=Linux
-[Badge MacOS]: https://img.shields.io/badge/MacOS-403C3D?style=for-the-badge&logoColor=white&logo=MacOS

docs/index.md

@@ -1,22 +0,0 @@
-Cura Documentation
-====
-Welcome to the Cura documentation pages.
-
-Objective
-----
-The goal of this documentation is to give an overview of the architecture of Cura's source code. The purpose of this overview is to make programmers familiar with Cura's source code so that they may contribute more easily, write plug-ins more easily or get started within the Cura team more quickly.
-
-There are some caveats though. These are *not* within the scope of this documentation:
-* There is no documentation on individual functions or classes of the code here. For that, refer to the Doxygen documentation and Python Docstrings in the source code itself, or generate the documentation locally using Doxygen.
-* It's virtually impossible and indeed not worth the effort or money to keep this 100% up to date.
-* There are no example plug-ins here. There are a number of example plug-ins in the Ultimaker organisation on Github.com to draw from.
-* The slicing process is not documented here. Refer to CuraEngine for that.
-
-This documentation will touch on the inner workings of Uranium as well though, due to the nature of the architecture.
-
-Index
-----
-The following chapters are available in this documentation:
-* [Repositories](repositories.md): An overview of the repositories that together make up the Cura application.
-* [Profiles](profiles/profiles.md): About the setting and profile system of Cura.
-* [Scene](scene/scene.md): How Cura's 3D scene looks.

docs/profiles/container_stacks.md

@@ -1,33 +0,0 @@
-Container Stacks
-====
-When the user selects the profiles and settings to print with, he can swap out a number of profiles. The profiles that are currently in use are stored in several container stacks. These container stacks always have a definition container at the bottom, which defines all available settings and all available properties for each setting. The profiles on top of that definition can then override the `value` property of some of those settings.
-
-When deriving a setting value, a container stack starts looking at the top-most profile to see if it contains an override for that setting. If it does, it returns that override. Otherwise, it looks into the second profile. If that also doesn't have an override for this setting, it looks into the third profile, and so on. The last profile is always a definition container which always contains an value for all settings. This way, the profiles at the top will always win over the profiles at the bottom. There is a clear precedence order for which profile wins over which other profile.
-
-A Machine Instance
-----
-A machine instance is a printer that the user has added to his configuration. It consists of multiple container stacks: One for global settings and one for each of the available extruders. This way, different extruders can contain different materials and quality profiles, for instance. The global stack contains a different set of profiles than the extruder stacks.
-
-While Uranium defines no specific roles for the entries in a container stack, Cura defines rigid roles for each slot in a container stack. These are the layouts for the container stacks of an example printer with 2 extruders.
-
-![Three container stacks](../resources/machine_instance.svg)
-
-To expand on this a bit further, each extruder stack contains the following profiles:
-* A user profile, where extruder-specific setting changes are stored that are not (yet) saved to a custom profile. If the user changes a setting that can be adjusted per extruder (such as infill density) then it gets stored here. If the user adjusts a setting that is global it will immediately be stored in the user profile of the global stack.
-* A custom profile. If the user saves his setting changes to a custom profile, it gets moved from the user profile to here. Actually a "custom profile" as the user sees it consists of multiple profiles: one for each extruder and one for the global settings.
-* An intent profile. The user can select between several intents for his print, such as precision, strength, visual quality, etc. This may be empty as well, which indicates the "default" intent.
-* A quality profile. The user can select between several quality levels.
-* A material profile, where the user selects which material is loaded in this extruder.
-* A nozzle profile, where the user selects which nozzle is installed in this extruder.
-* Definition changes, which stores the changes that the user made for this extruder in the Printer Settings dialogue.
-* Extruder. The user is not able to swap this out. This is a definition that lists the extruder number for this extruder and optionally things that are fixed in the printer, such as the nozzle offset.
-
-The global container stack contains the following profiles:
-* A user profile, where global setting changes are stored that are not (yet) saved to a custom profile. If the user changes for instance the layer height, the new value for the layer height gets stored here.
-* A custom profile. If the user saves his setting changes to a custom profile, the global settings that were in the global user profile get moved here.
-* An intent profile. Currently this must ALWAYS be empty. There are no global intent profiles. This is there for historical reasons.
-* A quality profile. This contains global settings that match with the quality level that the user selected. This global quality profile cannot be specific to a material or nozzle.
-* A material profile. Currently this must ALWAYS be empty. There are no global material profiles. This is there for historical reasons.
-* A variant profile. Currently this must ALWAYS be empty. There are no global variant profiles. This is there for historical reasons.
-* Definition changes, which stores the changes that the user made to the printer in the Printer Settings dialogue.
-* Printer. This specifies the currently used printer model, such as Ultimaker 3, Ultimaker S5, etc.

docs/profiles/getting_a_setting_value.md

@@ -1,70 +0,0 @@
-Getting a Setting Value
-====
-How Cura gets a setting's value is a complex endeavour that requires some explanation. The `value` property gets special treatment for this because there are a few other properties that influence the value. In this page we explain the algorithm to getting a setting value.
-
-This page explains all possible cases for a setting, but not all of them may apply. For instance, a global setting will not evaluate the per-object settings to get its value. Exceptions to the rules for other types of settings will be written down.
-
-Per Object Settings
-----
-Per-object settings, which are added to an object using the per-object settings tool, will always prevail over other setting values. They are not evaluated with the rest of the settings system because Cura's front-end doesn't need to send all setting values for all objects to CuraEngine separately. It only sends over the per-object settings that get overridden. CuraEngine then evaluates settings that can be changed per-object using the list of settings for that object but if the object doesn't have the setting attached falls back on the settings in the object's extruder. Refer to the [CuraEngine](#CuraEngine) chapter to see how this works.
-
-Settings where the `settable_per_mesh` property is false will not be shown in Cura's interface in the list of available settings in the per-object settings panel. They cannot be adjusted per object then. CuraEngine will also not evaluate those settings for each object separately. There is (or should always be) a good reason why each of these settings are not evaluated per object: Simply because CuraEngine is not processing one particular mesh at that moment. For instance, when writing the move to change to the next layer, CuraEngine hasn't processed any of the meshes on that layer yet and so the layer change movement speed, or indeed the layer height, can't change for each object.
-
-The per-object settings are stored in a separate container stack that is particular to the object. The container stack is added to the object via a scene decorator. It has just a single container in it, which contains all of the settings that the user changed.
-
-Resolve
-----
-If the setting is not listed in the per-object settings, it needs to be evaluated from the main settings list. However before evaluating it from a particular extruder, Cura will check if the setting has the `resolve` property. If it does, it returns the output of the `resolve` property and that's everything.
-
-The `resolve` property is intended for settings which are global in nature, but still need to be influenced by extruder-specific settings. A good example is the Build Plate Temperature, which is very dependent on the material(s) used by the printer, but there can only be a single bed temperature at a time.
-
-Cura will simply evaluate the `resolve` setting if present, which is an arbitrary Python expression, and return its result as the setting's value. However typically the `resolve` property is a function that takes the values of this setting for all extruders in use and then computes a result based on those. There is a built-in function for that called `extruderValues()`, which returns a list of setting values, one for each extruder. The function can then for instance take the average of those. In the case of the build plate temperature it will take the highest of those. In the case of the adhesion type it will choose "raft" if any extruder uses a raft, or "brim" as second choice, "skirt" as third choice and "none" only if all extruders use "none". Each setting with a `resolve` property has its own way of resolving the setting. The `extruderValues()` function continues with the algorithm as written below, but repeats it for each extruder.
-
-Limit To Extruder
-----
-If a setting is evaluated from a particular extruder stack, it normally gets evaluated from the extruder that the object is assigned to. However there are some exceptions. Some groups of settings belong to a particular "extruder setting", like the Infill Extruder setting, or the Support Extruder setting. Which extruder a setting belongs to is stored in the `limit_to_extruder` property. Settings which have their `limit_to_extruder` property set to `adhesion_extruder_nr`, for instance, belong to the build plate adhesion settings.
-
-If the `limit_to_extruder` property evaluates to a positive number, instead of getting the setting from the object's extruder it will be obtained from the extruder written in the `limit_to_extruder` property. So even if an object is set to be printed with extruder 0, if the infill extruder is set to extruder 1 any infill setting will be obtained from extruder 1. If `limit_to_extruder` is negative (in particular -1, which is the default), then the setting will be obtained from the object's own extruder.
-
-This property is communicated to CuraEngine separately. CuraEngine makes sure that the setting is evaluated from the correct extruder. Refer to the [CuraEngine](#CuraEngine) chapter to see how this works.
-
-Evaluating a Stack
-----
-After the resolve and limit to extruder properties have been checked, the setting value needs to be evaluated from an extruder stack.
-
-This is explained in more detail in the [Container Stacks](container_stacks.md) documentation. In brief, Cura will check the highest container in the extruder stack first to see whether that container overrides the setting. If it does, it returns that as the setting value. Otherwise, it checks the second container on the stack to see if that one overrides it. If it does it returns that value, and otherwise it checks the third container, and so on. If a setting is not overridden by any container in the extruder stack, it continues downward in the global stack. If it is also not overridden there, it eventually arrives at the definition in the bottom of the global stack.
-
-Evaluating a Definition
-----
-If the evaluation for a setting reaches the last entry of the global stack, its definition, a few more things can happen.
-
-Definition containers have an inheritance structure. For instance, the `ultimaker3` definition container specifies in its metadata that it inherits from `ultimaker`, which in turn inherits from `fdmprinter`. So again here, when evaluating a property from the `ultimaker3` definition it will first look to see if the property is overridden by the `ultimaker3` definition itself, and otherwise refer on to the `ultimaker` definition or otherwise finally to the `fdmprinter` definition. `fdmprinter` is the last line of defence, and it contains *all* properties for *all* settings.
-
-But even in `fdmprinter`, not all settings have a `value` property. It is not a required property. If the setting doesn't have a `value` property, the `default_value` property is returned, which is a required property. The distinction between `value` and `default_value` is made in order to allow CuraEngine to load a definition file as well when running from the command line (a debugging technique for CuraEngine). It then won't have all of the correct setting values but it at least doesn't need to evaluate all of the Python expressions and you'll be able to make some debugging slices.
-
-Evaluating a Value Property
-----
-The `value` property may contain a formula, which is an arbitrary Python expression that will be executed by Cura to arrive at a setting value. All containers may set the `value` property. Instance containers can only set the `value`, while definitions can set all properties.
-
-While the value could be any sort of formula, some functions of Python are restricted for security reasons. Since Cura 4.6, profiles are no longer a "trusted" resource and are therefore subject to heavy restrictions. It can use Python's built in mathematical functions and list functions as well as a few basic other ones, but things like writing to a file are prohibited.
-
-There are also a few extra things that can be used in these expressions:
-* Any setting key can be used as a variable that contains the setting's value.
-* As explained before, `extruderValues(key)` is a function that returns a list of setting values for a particular setting for all used extruders.
-* The function `extruderValue(extruder, key)` will evaluate a particular setting for a particular extruder.
-* The function `resolveOrValue(key)` will perform the full setting evaluation as described in this document for the current context (so if this setting is being evaluated for the second extruder it would perform it as if coming from the second extruder).
-* The function `defaultExtruderPosition()` will get the first extruder that is not disabled. For instance, if a printer has three extruders but the first is disabled, this would return `1` to indicate the second extruder (0-indexed).
-* The function `anyExtruderNrWithOrDefault(key)` will filter the list of extruders on the key, and then give the first
-  index for which it is true, or if none of them are, the default one as specified by the 'default extruder position'
-  function above.
-* The function `anyExtruderWithMaterial(key)` will filter the list of extruders on the key of material quality, and then give the first index for which it is true, or if none of them are, the default one as specified by the 'default extruder position' function above. 
-* The function `valueFromContainer(key, index)` will get a setting value from the global stack, but skip the first few containers in that stack. It will skip until it reaches a particular index in the container stack.
-* The function `extruderValueFromContainer(key, index)` will get a setting value from the current extruder stack, but skip the first few containers in that stack. It will skip until it reaches a particular index in the container stack.
-
-CuraEngine
-----
-When starting a slice, Cura will send the scene to CuraEngine and with each model send over the per-object settings that belong to it. It also sends all setting values over, as evaluated from each extruder and from the global stack, and sends the `limit_to_extruder` property along as well. CuraEngine stores this and then starts its slicing process. CuraEngine also has a hierarchical structure for its settings with fallbacks. This is explained in detail in [the documentation of CuraEngine](https://github.com/Ultimaker/CuraEngine/blob/master/docs/settings.md) and shortly again here.
-
-Each model gets a setting container assigned. The per-object settings are stored in those. The fallback for this container is set to be the extruder with which the object is printed. The extruder uses the current *mesh group* as fallback (which is a concept that Cura's front-end doesn't have). Each mesh group uses the global settings container as fallback.
-
-During the slicing process CuraEngine will evaluate the settings from its current context as it goes. For instance, when processing the walls for a particular mesh, it will request the Outer Wall Line Width setting from the settings container of that mesh. When it's not processing a particular mesh but for instance the travel moves between two meshes, it uses the currently applicable extruder. So this business logic defines actually how a setting can be configured per mesh, per extruder or only globally. The `settable_per_extruder`, and related properties of settings are only used in the front-end to determine how the settings are shown to the user.

docs/profiles/profiles.md

@@ -1,30 +0,0 @@
-Profiles
-====
-Cura's profile system is very advanced and has gotten pretty complex. This chapter is an attempt to document how it is structured.
-
-Index
-----
-The following pages describe the profile and setting system of Cura:
-* [Container Stacks](container_stacks.md): Which profiles can be swapped out and how they are ordered when evaluating a setting.
-* [Setting Properties](setting_properties.md): What properties can each setting have?
-* [Getting a Setting Value](getting_a_setting_value.md): How Cura arrives at a value for a certain setting.
-
-Glossary
-----
-The terminology for these profiles is not always obvious. Here is a glossary of the terms that we'll use in this chapter.
-* **Profile:** Either an *instance container* or a *definition container*.
-* **Definition container:** Profile that's stored as .def.json file, defining new settings and all of their properties. In Cura these represent printer models and extruder trains.
-* **Instance container:** Profile that's stored as .inst.cfg file or .xml.fdm_material file, which override some setting values. In Cura these represent the other profiles.
-* **[Container] stack:** A list of profiles, with one definition container at the bottom and instance containers for the rest. All settings are defined in the definition container. The rest of the profiles each specify a set of value overrides. The profiles at the top always override the profiles at the bottom.
-* **Machine instance:** An instance of a printer that the user has added. The list of all machine instances is shown in a drop-down in Cura's interface.
-* **Material:** A type of filament that's being sold by a vendor as a product.
-* **Filament spool:** A single spool of material.
-* **Quality profile:** A profile that is one of the options when the user selects which quality level they want to print with.
-* **Intent profile:** A profile that is one of the options when the user selects what his intent is.
-* **Custom profile:** A user-made profile that is stored when the user selects to "create a profile from the current settings/overrides".
-* **Quality-changes profile:** Alternative name for *custom profile*. This name is used in the code more often, but it's a bit misleading so this documentation prefers the term "custom profile".
-* **User profile:** A profile containing the settings that the user has changed, but not yet saved to a profile.
-* **Variant profile:** A profile containing some overrides that allow the user to select variants of the definition. As of this writing this is only used for the nozzles.
-* **Quality level:** A measure of quality where the user can select from, for instance "normal", "fast", "high". When selecting a quality level, Cura will select a matching quality profile for each extruder.
-* **Quality type:** Alternative name for *quality level*. This name is used in the code more often, but this documentation prefers the term "quality level".
-* **Inheritance function:** A function through which the `value` of a setting is calculated. This may depend on other settings.

docs/profiles/setting_properties.md

@@ -1,78 +0,0 @@
-Setting Properties
-====
-Each setting in Cura has a number of properties. It's not just a key and a value. This page lists the properties that a setting can define.
-
-* `key` (string): __The identifier by which the setting is referenced.__  
-   * This is not a human-readable name, but just a reference string, such as `layer_height_0`. 
-   * This is not actually a real property but just an identifier; it can't be changed. 
-   * Typically these are named with the most significant category first, in order to sort them better, such as `material_print_temperature`.  
-* `value` (optional): __The current value of the setting.__  
-  * This can be a function (an arbitrary Python expression) that depends on the values of other settings.  
-  * If it's not present, the `default_value` is used.
-* `default_value`: __A default value for the setting if `value` is undefined.__  
-  * This property is required.  
-  * It can't be a Python expression, but it can be any JSON type.  
-  * This is made separate so that CuraEngine can read it out for its debugging mode via the command line, without needing a complete Python interpreter.
-* `label` (string): __The human-readable name for the setting.__  
-  * This label is translated.
-* `description` (string): __A longer description of what the setting does when you change it.__  
-  * This description is translated.
-* `type` (string): __The type of value that this setting contains.__  
-  * Allowed types are: `bool`, `str`, `float`, `int`, `enum`, `category`, `[int]`, `vec3`, `polygon` and `polygons`.
-* `unit` (optional string): __A unit that is displayed at the right-hand side of the text field where the user enters the setting value.__
-* `resolve` (optional string): __A Python expression that resolves disagreements for global settings if multiple per-extruder profiles define different values for a setting.__  
-  * Typically this takes the values for the setting from all stacks and computes one final value for it that will be used for the global setting. For instance, the `resolve` function for the build plate temperature is `max(extruderValues('material_bed_temperature')`, meaning that it will use the hottest bed temperature of all materials of the extruders in use.
-* `limit_to_extruder` (optional): __A Python expression that indicates which extruder a setting will be obtained from.__  
-  * This is used for settings that may be extruder-specific but the extruder is not necessarily the current extruder. For instance, support settings need to be evaluated for the support extruder. Infill settings need to be evaluated for the infill extruder if the infill extruder is changed.
-* `enabled` (optional string or boolean): __Whether the setting can currently be made visible for the user.__  
-  * This can be a simple true/false, or a Python expression that depends on other settings.  
-  * Typically used for settings that don't apply when another setting is disabled, such as to hide the support settings if support is disabled.
-* `minimum_value` (optional): __The lowest acceptable value for this setting.__  
-  * If it's any lower, Cura will not allow the user to slice.  
-  * This property only applies to numerical settings.
-  * By convention this is used to prevent setting values that are technically or physically impossible, such as a layer height of 0mm.  
-* `maximum_value` (optional): __The highest acceptable value for this setting.__  
-  * If it's any higher, Cura will not allow the user to slice.  
-  * This property only applies to numerical settings.
-  * By convention this is used to prevent setting values that are technically or physically impossible, such as a support overhang angle of more than 90 degrees.   
-* `minimum_value_warning` (optional): __The threshold under which a warning is displayed to the user.__  
-  * This property only applies to numerical settings.
-  * By convention this is used to indicate that it will probably not print very nicely with such a low setting value.   
-* `maximum_value_warning` (optional): __The threshold above which a warning is displayed to the user.__
-  * This property only applies to numerical settings.  
-  * By convention this is used to indicate that it will probably not print very nicely with such a high setting value.   
-* `settable_globally` (optional boolean): __Whether the setting can be changed globally.__  
-  * For some mesh-type settings such as `support_mesh` this doesn't make sense, so those can't be changed globally. They are not displayed in the main settings list then.
-* `settable_per_meshgroup` (optional boolean): __Whether a setting can be changed per group of meshes.__  
-  * *This is currently unused by Cura.*
-* `settable_per_extruder` (optional boolean): __Whether a setting can be changed per extruder.__  
-  * Some settings, like the build plate temperature, can't be adjusted separately for each extruder. An icon is shown in the interface to indicate this.  
-  * If the user changes these settings they are stored in the global stack.
-* `settable_per_mesh` (optional boolean): __Whether a setting can be changed per mesh.__  
-  * The settings that can be changed per mesh are shown in the list of available settings in the per-object settings tool.
-* `children` (optional list): __A list of child settings.__  
-  * These are displayed with an indentation. If all child settings are overridden by the user, the parent setting gets greyed out to indicate that the parent setting has no effect any more. This is not strictly always the case though, because that would depend on the inheritance functions in the `value`.
-* `icon` (optional string): __A path to an icon to be displayed.__  
-  * Only applies to setting categories.
-* `allow_empty` (optional bool): __Whether the setting is allowed to be empty.__ 
-   * If it's not, this will be treated as a setting error and Cura will not allow the user to slice.  
-   * Only applies to string-type settings.
-* `warning_description` (optional string): __A warning message to display when the setting has a warning value.__  
-  * *This is currently unused by Cura.*
-* `error_description` (optional string): __An error message to display when the setting has an error value.__  
-  * *This is currently unused by Cura.*
-* `options` (dictionary): __A list of values that the user can choose from.__  
-  * The keys of this dictionary are keys that CuraEngine identifies the option with.  
-  * The values are human-readable strings and will be translated.  
-  * Only applies to (and only required for) enum-type settings.
-* `comments` (optional string): __Comments to other programmers about the setting.__  
-  * *This is currently unused by Cura.*
-* `is_uuid` (optional boolean): __Whether or not this setting indicates a UUID-4.__  
-  * If it is, the setting will indicate an error if it's not in the correct format.  
-  * Only applies to string-type settings.
-* `regex_blacklist_pattern` (optional string): __A regular expression, where if the setting value matches with this regular expression, it gets an error state.__  
-  * Only applies to string-type settings.
-* `error_value` (optional): __If the setting value is equal to this value, it will show a setting error.__  
-  * This is used to display errors for non-numerical settings such as checkboxes.
-* `warning_value` (optional): __If the setting value is equal to this value, it will show a setting warning.__  
-  * This is used to display warnings for non-numerical settings such as checkboxes.

docs/repositories.md

@@ -1,33 +0,0 @@
-Repositories
-====
-Cura uses a number of repositories where parts of our source code are separated, in order to get a cleaner architecture. Those repositories are:
-* [Cura](https://github.com/Ultimaker/Cura) is the main repository for the front-end of Cura. This contains:
-    - all of the business logic for the front-end, including the specific types of profiles that are available
-    -  the concept of 3D printers and materials
-    -  specific tools for handling 3D printed models
-    -  pretty much all of the GUI
-    -  Ultimaker services such as the Marketplace and accounts.
-* [Uranium](https://github.com/Ultimaker/Uranium) is the underlying framework the Cura repository is built on. [Uranium](https://github.com/Ultimaker/Uranium) is a framework for desktop applications that handle 3D models. It has a separate back-end. This provides Cura with:
-    - a basic GUI framework ([Qt](https://www.qt.io/))
-    - a 3D scene, a rendering system
-    - a plug-in system
-    - a system for stacked profiles that change settings.
-* [CuraEngine](https://github.com/Ultimaker/CuraEngine) is the slicer used by Cura in the background. This does the actual process that converts 3D models into a toolpath for the printer.
-* [libArcus](https://github.com/Ultimaker/libArcus) handles the communication to CuraEngine. [libArcus](https://github.com/Ultimaker/libArcus) is a small library that wraps around [Protobuf](https://developers.google.com/protocol-buffers/) in order to make it run over a local socket.
-* [cura-build](https://github.com/Ultimaker/cura-build): Cura's build scripts.  
-* [cura-build-environment](https://github.com/Ultimaker/cura-build-environment) build scripts for building dependencies.
-
-There are also a number of repositories under our control that are not integral parts of Cura's architecture, but more like separated side-gigs:
-* [libSavitar](https://github.com/Ultimaker/libSavitar) is used for loading and writing 3MF files.
-* [libCharon](https://github.com/Ultimaker/libCharon) is used for loading and writing UFP files.
-* [cura-binary-data](https://github.com/Ultimaker/cura-binary-data) pre-compiled parts to make the build system a bit simpler. This holds things which would require considerable tooling to build automatically like:
-    - the machine-readable translation files
-    - the Marlin builds for firmware updates
-* [Cura-squish-tests](https://github.com/Ultimaker/Cura-squish-tests): automated GUI tests.
-* [fdm_materials](https://github.com/Ultimaker/fdm_materials) stores Material profiles. This is separated out and combined in our build process, so that the firmware for Ultimaker's printers can use the same set of profiles too.
-
-Interplay
-----
-At a very high level, Cura's repositories interconnect as follows:
-
-![Overview of interplay between repositories](resources/repositories.svg)

docs/resources/deps.dot

@@ -1,54 +0,0 @@
-digraph {
-        "cpython/3.10.4@ultimaker/testing" -> "zlib/1.2.12"
-        "cpython/3.10.4@ultimaker/testing" -> "openssl/1.1.1l"
-        "cpython/3.10.4@ultimaker/testing" -> "expat/2.4.1"
-        "cpython/3.10.4@ultimaker/testing" -> "libffi/3.2.1"
-        "cpython/3.10.4@ultimaker/testing" -> "mpdecimal/2.5.0@ultimaker/testing"
-        "cpython/3.10.4@ultimaker/testing" -> "libuuid/1.0.3"
-        "cpython/3.10.4@ultimaker/testing" -> "libxcrypt/4.4.25"
-        "cpython/3.10.4@ultimaker/testing" -> "bzip2/1.0.8"
-        "cpython/3.10.4@ultimaker/testing" -> "gdbm/1.19"
-        "cpython/3.10.4@ultimaker/testing" -> "sqlite3/3.36.0"
-        "cpython/3.10.4@ultimaker/testing" -> "tk/8.6.10"
-        "cpython/3.10.4@ultimaker/testing" -> "ncurses/6.2"
-        "cpython/3.10.4@ultimaker/testing" -> "xz_utils/5.2.5"
-        "pynest2d/5.1.0-beta+3@ultimaker/stable" -> "libnest2d/5.1.0-beta+3@ultimaker/stable"
-        "pynest2d/5.1.0-beta+3@ultimaker/stable" -> "cpython/3.10.4@ultimaker/testing"
-        "freetype/2.12.1" -> "libpng/1.6.37"
-        "freetype/2.12.1" -> "zlib/1.2.12"
-        "freetype/2.12.1" -> "bzip2/1.0.8"
-        "freetype/2.12.1" -> "brotli/1.0.9"
-        "savitar/5.1.0-beta+3@ultimaker/stable" -> "pugixml/1.12.1"
-        "savitar/5.1.0-beta+3@ultimaker/stable" -> "cpython/3.10.4@ultimaker/testing"
-        "arcus/5.1.0-beta+3@ultimaker/stable" -> "protobuf/3.17.1"
-        "arcus/5.1.0-beta+3@ultimaker/stable" -> "cpython/3.10.4@ultimaker/testing"
-        "arcus/5.1.0-beta+3@ultimaker/stable" -> "zlib/1.2.12"
-        "libpng/1.6.37" -> "zlib/1.2.12"
-        "curaengine/5.1.0-beta+3@ultimaker/stable" -> "clipper/6.4.2"
-        "curaengine/5.1.0-beta+3@ultimaker/stable" -> "boost/1.78.0"
-        "curaengine/5.1.0-beta+3@ultimaker/stable" -> "rapidjson/1.1.0"
-        "curaengine/5.1.0-beta+3@ultimaker/stable" -> "stb/20200203"
-        "curaengine/5.1.0-beta+3@ultimaker/stable" -> "protobuf/3.17.1"
-        "curaengine/5.1.0-beta+3@ultimaker/stable" -> "arcus/5.1.0-beta+3@ultimaker/stable"
-        "tcl/8.6.10" -> "zlib/1.2.12"
-        "uranium/5.1.0-beta+3@ultimaker/stable" -> "arcus/5.1.0-beta+3@ultimaker/stable"
-        "uranium/5.1.0-beta+3@ultimaker/stable" -> "cpython/3.10.4@ultimaker/testing"
-        "libnest2d/5.1.0-beta+3@ultimaker/stable" -> "boost/1.78.0"
-        "libnest2d/5.1.0-beta+3@ultimaker/stable" -> "clipper/6.4.2"
-        "libnest2d/5.1.0-beta+3@ultimaker/stable" -> "nlopt/2.7.0"
-        "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "arcus/5.1.0-beta+3@ultimaker/stable"
-        "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "curaengine/5.1.0-beta+3@ultimaker/stable"
-        "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "savitar/5.1.0-beta+3@ultimaker/stable"
-        "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "pynest2d/5.1.0-beta+3@ultimaker/stable"
-        "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "uranium/5.1.0-beta+3@ultimaker/stable"
-        "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "fdm_materials/5.1.0-beta+3@ultimaker/stable"
-        "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "cura_binary_data/5.1.0-beta+3@ultimaker/stable"
-        "conanfile.py (cura/5.1.0-beta+3@ultimaker/testing)" -> "cpython/3.10.4@ultimaker/testing"
-        "fontconfig/2.13.93" -> "freetype/2.12.1"
-        "fontconfig/2.13.93" -> "expat/2.4.1"
-        "fontconfig/2.13.93" -> "libuuid/1.0.3"
-        "tk/8.6.10" -> "tcl/8.6.10"
-        "tk/8.6.10" -> "fontconfig/2.13.93"
-        "tk/8.6.10" -> "xorg/system"
-        "protobuf/3.17.1" -> "zlib/1.2.12"
-}

docs/resources/machine_instance.svg

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<svg xmlns="http://www.w3.org/2000/svg" width="700" height="1010">
-    <defs>
-        <path id="stack-header" d="m0,50 v-30 a20,20 0 0 1 20,-20 h260 a20,20 0 0 1 20,20 v30 z" />
-        <marker id="arrow" refX="2" refY="1.5" markerWidth="3" markerHeight="3" orient="auto-start-reverse">
-            <polygon points="0,0 3,1.5 0,3" />
-        </marker>
-    </defs>
-
-    <g stroke="black" stroke-width="5" fill="silver"> <!-- Stack headers. -->
-        <use href="#stack-header" x="200" y="555" />
-        <use href="#stack-header" x="5" y="5" />
-        <use href="#stack-header" x="395" y="5" />
-    </g>
-    <g stroke="black" stroke-width="10" fill="none"> <!-- Stack outlines. -->
-        <rect x="200" y="555" width="300" height="450" rx="20" /> <!-- Global stack. -->
-        <rect x="5" y="5" width="300" height="450" rx="20" /> <!-- Left extruder. -->
-        <rect x="395" y="5" width="300" height="450" rx="20" /> <!-- Right extruder. -->
-    </g>
-    <g font-family="sans-serif" font-size="25" dominant-baseline="middle" text-anchor="middle">
-        <text x="350" y="582.5">Global stack</text> <!-- Slightly lowered since the top line is thicker than the bottom. -->
-        <text x="350" y="630">User</text>
-        <text x="350" y="680">Custom</text>
-        <text x="350" y="730">Intent</text>
-        <text x="350" y="780">Quality</text>
-        <text x="350" y="830">Material</text>
-        <text x="350" y="880">Variant</text>
-        <text x="350" y="930">Definition changes</text>
-        <text x="350" y="980">Printer</text>
-
-        <text x="155" y="32.5">Left extruder</text> <!-- Slightly lowered again. -->
-        <text x="155" y="80">User</text>
-        <text x="155" y="130">Custom</text>
-        <text x="155" y="180">Intent</text>
-        <text x="155" y="230">Quality</text>
-        <text x="155" y="280">Material</text>
-        <text x="155" y="330">Nozzle</text>
-        <text x="155" y="380">Definition changes</text>
-        <text x="155" y="430">Extruder</text>
-
-        <text x="545" y="32.5">Right extruder</text> <!-- Slightly lowered again. -->
-        <text x="545" y="80">User</text>
-        <text x="545" y="130">Custom</text>
-        <text x="545" y="180">Intent</text>
-        <text x="545" y="230">Quality</text>
-        <text x="545" y="280">Material</text>
-        <text x="545" y="330">Nozzle</text>
-        <text x="545" y="380">Definition changes</text>
-        <text x="545" y="430">Extruder</text>
-    </g>
-    <g stroke="black" stroke-width="5" marker-end="url(#arrow)"> <!-- Arrows. -->
-        <line x1="155" y1="455" x2="345" y2="545" />
-        <line x1="545" y1="455" x2="355" y2="545" />
-    </g>
-</svg>

docs/resources/repositories.svg

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000">
-    <defs>
-        <marker id="arrow" refX="2" refY="1.5" markerWidth="3" markerHeight="3" orient="auto-start-reverse">
-            <polygon points="0,0 3,1.5 0,3" />
-        </marker>
-    </defs>
-
-    <g marker-end="url(#arrow)" stroke="black" stroke-width="5"> <!-- Arrows. -->
-        <!-- Towards CuraEngine and back. -->
-        <line x1="475" y1="400" x2="475" y2="307.5" />
-        <line x1="475" y1="250" x2="475" y2="210" />
-        <line x1="525" y1="200" x2="525" y2="242.5" />
-        <line x1="525" y1="300" x2="525" y2="390" />
-
-        <!-- From libSavitar. -->
-        <line x1="100" y1="425" x2="142.5" y2="425" />
-        <line x1="300" y1="425" x2="390" y2="425" />
-
-        <!-- From fdm_materials. -->
-        <line x1="350" y1="575" x2="390" y2="575" />
-
-        <!-- To libCharon. -->
-        <line x1="600" y1="500" x2="692.5" y2="500" />
-        <line x1="900" y1="500" x2="945" y2="500" />
-
-        <!-- To Uranium. -->
-        <line x1="500" y1="600" x2="500" y2="690" />
-    </g>
-
-    <g stroke="black" fill="none"> <!-- Boxes representing repositories. -->
-        <g stroke-width="10"> <!-- Major repositories. -->
-            <rect x="400" y="400" width="200" height="200" rx="20" /> <!-- Cura. -->
-            <rect x="350" y="700" width="300" height="200" rx="20" /> <!-- Uranium. -->
-            <rect x="300" y="5" width="400" height="195" rx="20" /> <!-- CuraEngine. -->
-        </g>
-        <g stroke-width="5"> <!-- Minor repositories. -->
-            <rect x="150" y="350" width="150" height="100" rx="20" /> <!-- libSavitar. -->
-            <rect x="100" y="550" width="250" height="100" rx="20" /> <!-- fdm_materials. -->
-            <rect x="430" y="250" width="140" height="50" rx="20" /> <!-- libArcus. -->
-            <rect x="700" y="450" width="200" height="100" rx="20" /> <!-- libCharon. -->
-        </g>
-    </g>
-
-    <g font-family="sans-serif" text-anchor="middle" dominant-baseline="middle"> <!-- Labels. -->
-        <g font-size="50"> <!-- Major repositories. -->
-            <text x="500" y="500">Cura</text>
-            <text x="500" y="800">Uranium</text>
-            <text x="500" y="102.5">CuraEngine</text>
-        </g>
-        <g font-size="25"> <!-- Minor repositories and arrows. -->
-            <text x="225" y="400">libSavitar</text>
-            <text x="225" y="600">fdm_materials</text>
-            <text x="500" y="275">libArcus</text>
-            <text x="800" y="500">libCharon</text>
-
-            <g text-anchor="start">
-                <text x="645" y="490" transform="rotate(-90, 645, 490)">G-code</text>
-                <text x="950" y="500">UFP</text>
-                <text x="535" y="345">G-code</text>
-                <text x="345" y="415" transform="rotate(-90, 345, 415)">Model</text>
-                <text x="510" y="645">Built upon</text>
-            </g>
-            <g text-anchor="end">
-                <text x="465" y="345">Scene</text>
-                <text x="90" y="425">3MF</text>
-            </g>
-        </g>
-    </g>
-</svg>

docs/scene/build_volume.md

@@ -1,27 +0,0 @@
-Build Volume
-====
-The build volume is a scene node. This node gets placed somewhere in the scene. This is a specialised scene node that draws the build volume and all of its bits and pieces.
-
-Volume bounds
-----
-The build volume draws a cube (for rectangular build plates) that represents the printable build volume. This outline is drawn with a blue line. To render this, the Build Volume scene node generates a cube and instructs OpenGL to draw a wireframe of this cube. This way the wireframe is always a single pixel wide regardless of view distance. This cube is automatically resized when the relevant settings change, like the width, height and depth of the printer, the shape of the build plate, the Print Sequence or the gantry height.
-
-The build volume also draws a grid underneath the build volume. The grid features 1cm lines which allows the user to roughly estimate how big its print is or the distance between prints. It also features a finer 1mm line pattern within that grid. The grid is drawn as a single quad. This quad is then sent to the graphical card with a specialised shader which draws the grid pattern.
-
-For elliptical build plates, the volume bounds are drawn as two circles, one at the top and one at the bottom of the available height. The build plate grid is drawn as a tessellated circle, but with the same shader.
-
-Disallowed areas
-----
-The build volume also calculates and draws the disallowed areas. These are drawn as a grey shadow. The point of these disallowed areas is to denote the areas where the user is not allowed to place any objects. The reason to forbid placing an object can be a lot of things.
-
-One disallowed area that is always present is the border around the build volume. This border is there to prevent the nozzle from going outside of the bounds of the build volume. For instance, if you were to print an object with a brim of 8mm, you won't be able to place that object closer than 8mm to the edge of the build volume. Doing so would draw part of the brim outside of the build volume. The width of these disallowed areas depends on a bunch of things. Most commonly the build plate adhesion setting or the Avoid Distance setting is the culprit. However this border is also affected by the draft shield, ooze shield and Support Horizontal Expansion, among others.
-
-Another disallowed area stems from the distance between the nozzles for some multi-extrusion printers. The total build volume in Cura is normally the volume that can be reached by either nozzle. However for every extruder that your print uses, the build volume will be shrunk to the intersecting area that all used nozzles can reach. This is done by adding disallowed areas near the border. For instance, if you have two extruders with 18mm X distance between them, and your print uses only the left extruder, there will be an extra border of 18mm on the right hand side of the printer, because the left nozzle can't reach that far to the right. If you then use both extruders, there will be an 18mm border on both sides.
-
-There are also disallowed areas for features that are printed. There are as of this writing two such disallowed areas: The prime tower and the prime blob. You can't print an object on those locations since they would intersect with the printed feature.
-
-Then there are disallowed areas imposed by the current printer. Some printers have things in the way of your print, such as clips that hold the build plate down, or cameras, switching bays or wiping brushes. These are encoded in the `machine_disallowed_areas` and `nozzle_disallowed_areas` settings, as polygons. The difference between these two settings is that one is intended to describe where the print head is not allowed to move. The other is intended to describe where the currently active nozzle is not allowed to move. This distinction is meant to allow inactive nozzles to move over things like build plate clips or stickers, which can slide underneath an inactive nozzle.
-
-Finally, there are disallowed areas imposed by other objects that you want to print. Each object and group has an associated Convex Hull Node, which denotes the volume that the object is going to be taking up while printing. This convex hull is projected down to the build plate and determines there the volume that the object is going to occupy.
-
-Each type of disallowed area is affected by certain settings. The border around the build volume, for instance, is affected by the brim, but the disallowed areas for printed objects are not. This is because the brim could go outside of the build volume but the brim can't hit any other objects. If the brim comes too close to other objects, it merges with the brim of those objects. As such, generating each type of disallowed area requires specialised business logic to determine how the setting affects the disallowed area. It needs to take the highest of two settings sometimes, or it needs to sum them together, multiplying a certain line width by an accompanying line count setting, and so on. All this logic is implemented in the BuildVolume class.

docs/scene/operations.md

@@ -1,113 +0,0 @@
-# Operations and the OperationStack
-
-Cura supports an operation stack. The `OperationStack` class maintains a history of the operations performed in Cura, which allows for undo and redo actions. Every operation registers itself in the stack. The OperationStuck supports the following functions:
-
-  * `push(operation)`: Pushes an operation in the stack and applies the operation. This function is called when an operation pushes itself in the stack.
-  * `undo()`: Reverses the actions performed by the last operation and reduces the current index of the stack.
-  * `redo()`: Applies the actions performed by the next operation in the stack and increments the current index of the stack.
-  * `getOperations()`: Returns a list of all the operations that are currently inside the OperationStack
-  * `canUndo()`: Indicates whether the index of the operation stack has reached the bottom of the stack, which means that there are no more operations to be undone.
-  * `canRedo()`: Indicates whether the index of the operation stack has reached the top of the stack, which means that there are no more operations to be redone.
-
-**Note 1:** When consecutive operations are performed very quickly after each other, they are merged together at the top of the stack. This action ensures that these minor operation will be undone with one Undo keystroke (e.g. when moving the object around and you press and release the left mouse button really fast, it is considered as one move operation).
-
-**Note 2:** When an operation is pushed in the middle of the stack, all operations above it are removed from the stack. This ensures that there won't be any "history branches" created. 
-
-### Operations
-
-Every action that happens in the scene and affects one or multiple models is associated with a subclass of the `Operation` class and is it added to the `OperationStack`. The subclassed operations that can be found in Cura (excluding the ones from downloadable plugins) are the following:
-
-  * [GroupedOperation](#groupedoperation)
-  * [AddSceneNodeOperation](#addscenenodeoperation)
-  * [RemoveSceneNodeOperation](#removescenenodeoperation)
-  * [SetParentOperation](#setparentoperation)
-  * [SetTransformOperation](#settransformoperation)
-  * [SetObjectExtruderOperation](#setobjectextruderoperation)
-  * [GravityOperation](#gravityoperation)
-  * [PlatformPhysicsOperation](#platformphysicsoperation)
-  * [TranslateOperation](#translateoperation)
-  * [ScaleOperation](#scaleoperation)
-  * [RotateOperation](#rotateoperation)
-  * [MirrorOperation](#mirroroperation)
-  * [LayFlatOperation](#layflatoperation)
-  * [SetBuildPlateNumberOperation]()
-
-### GroupedOperation
-
-The `GroupedOperation` is an operation that groups several other operations together. The intent of this operation is to hide an underlying chain of operations from the user if they correspond to only one interaction with the user, such as an operation applied to multiple scene nodes or a re-arrangement of multiple items in the scene.
-
-Once a `GroupedOperation` is pushed into the stack, it applies all of its children operations in one go. Similarly, when it is undone, it reverses all its children operations at once.
-
-
-### AddSceneNodeOperation
-
-The `AddSceneNodeOperation` is added to the stack whenever a mesh is loaded inside the `Scene`, either by a `FileReader` or by inserting a [Support Blocker](tools.md#supporteraser-tool) in an object.
-
-### RemoveSceneNodeOperation
-
-The `RemoveSceneNodeOperation` is added to the stack whenever a mesh is removed from the Scene by the user or when the user requests to clear the build plate (_Ctrl+D_).
-
-### SetParentOperation
-
-The `SetParentOperation` changes the parent of a node. It is primarily used when grouping (the group node is set as the nodes' parent) and ungrouping (the group's children's parent is set to the group's parent before the group node is deleted), or when a SupportEraser node is added to the scene (to set the selected object as the Eraser's parent).
-
-### SetTransformOperation
-
-The `SetTransformOperation` translates, rotates, and scales a node all at once. This operation accepts a transformation matrix, an orientation matrix, and a scale matrix, and it is used by the _"Reset All Model Positions"_ and _"Reset All Model Transformations"_ options in the right-click (context) menu.
-
-### SetObjectExtruderOperation
-
-This operation is used to set the extruder with which a certain object should be printed with. It adds a [SettingOverrideDecorator](scene.md#settingoverridedecorator) to the object (if it doesn't have any) and then sets the extruder number via the decoration function `node.callDecoration("setActiveExtruder", extruder_id)`.
-
-### GravityOperation
-
-The `GravityOperation` moves a scene node down to 0 on the y-axis. It is currently used by the _"Lay flat"_ and _"Select face to align to the build plate"_ actions of the `RotationTool` to ensure that the object will end up touching the build plate after the corresponding rotation operations have be done.
-
-### PlatformPhysicsOperation
-
-The `PlatformPhysicsOperation` is generated by the `PlatformPhysics` class and it is associated with the preferences _"Ensure models are kept apart"_ and _"Automatically drop models to the build plate"_. If any of these preferences is set to true, the `PlatformPhysics` class periodically checks to make sure that the two conditions are met and if not, it calculates the move vector for each of the nodes that will satisfy the conditions. 
-
-Once the move vectors have been computed, they are applied to the nodes through consecutive `PlatformPhysicsOperations`, whose job is to use the `translate` function on the nodes. 
-
-**Note:** When there are multiple nodes, multiple `PlatformPhysicsOperations` may be generated (all models may be moved to ensure they are kept apart). These operations eventually get merged together by the `OperationStack` due to the fact that the individual operations are applied very fast one after the other.
-
-### TranslateOperation
-
-The `TranslateOperation` applies a linear transformation on a node, moving the node in the scene. This operation is primarily linked to the [TranslateTool](tools.md#translatetool) but it is also used in other places around Cura, such as arranging objects on the build plate (Ctrl+R) and centering an object to the build plate (via the right-click context menu's _"Center Selected Model"_ option).
-
-When an object is moved using the move tool handles, multiple translate operations are generated to make sure that the object is rendered properly while it is moved. These translate operations are merged together once the user releases the tool handle.
-
-**Note:** Some functionalities may move (translate) nodes without generating a TranslateOperation (such as when a model with is imported from a 3mf into a certain position). This ensures that the moving of the object cannot be accidentally undone by the user.
-
-### ScaleOperation
-
-The `ScaleOperation` scales the selected scene node uniformly or non-uniformly. This operation is primarily generated by the [ScaleTool](tools.md#scaletool).
-
-When an object is scaled using the scale tool handles, multiple scale operations are generated to make sure that the object is rendered properly while it is being resized. These scale operations are merged together once the user releases the tool handle.
-
-**Note:** When the _"Scale extremely small models"_ or the _"Scale large models"_ preferences are enabled the model is scaled when it is inserted into the build plate but it **DOES NOT** generate a `ScaleOperation`. This ensures that Cura doesn't register the scaling as an action that can be undone and the user doesn't accidentally end up with a very big or very small model.
-
-
-### RotateOperation
-
-The `RotateOperation` rotates the selected scene node(s) according to a given rotation quaternion and, optionally, around a given point. This operation is primarily generated by the [RotationTool](tools.md#rotatetool). It is also used by the arrange algorithm, which may rotate some models to fit them in the build plate.
-
-When an object is rotated using the rotate tool handles, multiple rotate operations are generated to make sure that the object is rendered properly while it is being rotated. These operations are merged together once the user releases the tool handle.
-
-### MirrorOperation
-
-The `MirrorOperation` mirrors the selected object. It is primarily associated with the [MirrorTool](tools.md#mirrortool) and allows for mirroring the object in a certain direction, using the `MirrorToolHandles`. 
-
-The `MirrorOperation` accepts a transformation matrix that should only define values on the diagonal of the matrix, and only the values 1 or -1. It allows for mirroring around the center of the object or around the axis origin. The latter isn't used that often.
-
-### LayFlatOperation
-
-The `LayFlatOperation` computes some orientation to hopefully lay the object flat on the build plate. It is generated by the `layFlat()` function of the [RotateTool](tools.md#rotatetool). Contrary to the other operations, the `LayFlatOperation` is computed in a separate thread through the `LayFlatJob` since it can be quite computationally expensive.
-
-
-### SetBuildPlateNumberOperation
-
-The `SetBuildPlateNumberOperation` is linked to a legacy feature which allowed the user to have multiple build plates open in Cura at the same time. With this operation it was possible to transfer a node to another build plate through the node's [BuildPlateDecorator](scene.md#buildplatedecorator) by calling the decoration `node.callDecoration("setBuildPlateNumber", new_build_plate_nr)`.
-
-**Note:** Changing the active build plate is a disabled feature in Cura and it is intended to be completely removed (internal ticket: CURA-4975), along with the `SetBuildPlateNumberOperation`.
-

docs/scene/scene.md

@@ -1,216 +0,0 @@
-Scene
-====
-The 3D scene in Cura is designed as a [Scene Graph](https://en.wikipedia.org/wiki/Scene_graph), which is common in many 3D graphics applications. The scene graph of Cura is usually very flat, but has the possibility to have nested objects which inherit transformations from each other.
-
-Scene Graph
-----
-Cura's scene graph is a mere tree data structure. This tree contains all scene nodes, which represent the objects in the 3D scene.
-
-The main idea behind the scene tree is that each scene node has a transformation applied to it. The scene nodes can be nested beneath other scene nodes. The transformation of the parents is then also applied to the children. This way you can have scene nodes grouped together and transform the group as a whole. Since the transformations are all linear, this ensures that the elements of this group stay in the same relative position and orientation. It will look as if the whole group is a single object. This idea is very common for games where objects are often composed of multiple 3D models but need to move together as a whole. For Cura it is used to group objects together and to transform the collision area correctly.
-
-Class Diagram
-----
-
-The following class diagram depicts the classes that interact with the Scene
-
-![alt text](images/components_interacting_with_scene.jpg)
-
-The scene lives in the Controller of the Application, and it is primarily interacting with SceneNode objects, which are the components of the Scene Graph. 
-
-
-A Typical Scene
-----
-Cura's scene has a few nodes that are always present, and a few nodes that are repeated for every object that the user loads onto their build plate. The root of the scene graph is a SceneNode that lives inside the Scene and contains all the other children SceneNodes of the scene. Typically, inside the root you can find the SceneNodes that are always loaded (the Cameras, the [BuildVolume](build_volume.md), and the Platform), the objects that are loaded on the platform, and finally a ConvexHullNode for each object and each group of objects in the Scene. 
-
-Let's take the following example Scene:
-
-![scene_example.png](images/scene_example.jpg)
-
-The scene graph in this case is the following:
-
-
-![scene_example_scene_graph.png](images/scene_example_scene_graph.jpg)
-
-**Note 1:** The Platform is actually a child of the BuildVolume.
-
-**Note 2:** The ConvexHullNodes are not actually named after the object they decorate. Their names are used in the image to convey how the ConvexHullNodes are related to the objects in the scene.
-
-**Note 3:** The CuraSceneNode that holds the layer data (inside the BuildVolume) is created and destroyed according to the availability of sliced layer data provided by the CuraEngine. See the [LayerDataDecorator](#layerdatadecorator) for more information.
-
-Accessing SceneNodes in the Scene
-----
-
-SceneNodes can be accessed using a `BreadthFirstIterator` or a `DepthFirstIterator`. Each iterator traverses the scene graph and returns a Python iterator, which yields all the SceneNodes and their children. 
-
-``` python
-for node in BreadthFirstIterator(scene.getRoot()):
-    # do stuff with the node
-```
-
-Example result when iterating the above scene graph:
-
-```python
-[i for i in BreadthFirstIterator(CuraApplication.getInstance().getController().getScene().getRoot()]
-```
-  * 00 = {SceneNode} <SceneNode object: 'Root'>
-  * 01 = {BuildVolume} <BuildVolume object '0x2e35dbce108'>
-  * 02 = {Camera} <Camera object: '3d'>
-  * 03 = {CuraSceneNode} <CuraSceneNode object: 'Torus.stl'>
-  * 04 = {CuraSceneNode} <CuraSceneNode object: 'Group #1'>
-  * 05 = {Camera} <Camera object: 'snapshot'>
-  * 06 = {CuraSceneNode} <CuraSceneNode object: 'Star.stl'>
-  * 07 = {ConvexHullNode} <ConvexHullNode object: '0x2e3000def08'>
-  * 08 = {ConvexHullNode} <ConvexHullNode object: '0x2e36861bd88'>
-  * 09 = {ConvexHullNode} <ConvexHullNode object: '0x2e3000bd4c8'>
-  * 10 = {ConvexHullNode} <ConvexHullNode object: '0x2e35fbb62c8'>
-  * 11 = {ConvexHullNode} <ConvexHullNode object: '0x2e3000a0648'>
-  * 12 = {ConvexHullNode} <ConvexHullNode object: '0x2e30019d0c8'>
-  * 13 = {ConvexHullNode} <ConvexHullNode object: '0x2e3001a2dc8'>
-  * 14 = {Platform} <Platform object '0x2e35a001948'>
-  * 15 = {CuraSceneNode} <CuraSceneNode object: 'Group #2'>
-  * 16 = {CuraSceneNode} <CuraSceneNode object: 'Sphere.stl'>
-  * 17 = {CuraSceneNode} <CuraSceneNode object: 'Cylinder.stl'>
-  * 18 = {CuraSceneNode} <CuraSceneNode object: 'Cube.stl'>
-
-SceneNodeDecorators
-----
-
-SceneNodeDecorators are decorators that can be added to the nodes of the scene to provide them with additional functions. 
-
-Cura provides the following classes derived from the SceneNodeDecorator class:
-  1. [GroupDecorator](#groupdecorator)
-  2. [ConvexHullDecorator](#convexhulldecorator)
-  3. [SettingOverrideDecorator](#settingoverridedecorator)
-  4. [SliceableObjectDecorator](#sliceableobjectdecorator)
-  5. [LayerDataDecorator](#layerdatadecorator)
-  6. [ZOffsetDecorator](#zoffsetdecorator)
-  7. [BlockSlicingDecorator](#blockslicingdecorator)
-  8. [GCodeListDecorator](#gcodelistdecorator)
-  9. [BuildPlateDecorator](#buildplatedecorator)
-
-GroupDecorator
-----
-
-Whenever objects on the build plate are grouped together, a new node is added in the scene as the parent of the grouped objects. Group nodes can be identified when traversing the SceneGraph by running the following:
-
-```python
-node.callDecoration("isGroup") == True
-```
-
-Group nodes decorated by GroupDecorators are added in the scene either by reading project files which contain grouped objects, or when the user selects multiple objects and groups them together (Ctrl + G).
-
-Group nodes that are left with only one child are removed from the scene, making their only child a child of the group's parent. In addition, group nodes without any remaining children are removed from the scene.
-
-ConvexHullDecorator
-----
-
-As seen in the scene graph of the scene example, each CuraSceneNode that represents an object on the build plate is linked to a ConvexHullNode which is rendered as the object's shadow on the build plate. The ConvexHullDecorator is the link between these two nodes. 
-
-In essence, the CuraSceneNode has a ConvexHullDecorator which points to the ConvexHullNode of the object. The data of the object's convex hull can be accessed via
-
-```python
-convex_hull_polygon = object_node.callDecoration("getConvexHull")
-```
-
-The ConvexHullDecorator also provides convex hulls that include the head, the fans, and the adhesion of the object. These are primarily used and rendered when One-at-a-time mode is activated. 
-
-For more information on the functions added to the node by this decorator, visit the [ConvexHullDecorator.py](https://github.com/Ultimaker/Cura/blob/master/cura/Scene/ConvexHullDecorator.py).
-
-SettingOverrideDecorator
-----
-
-SettingOverrideDecorators are primarily used for modifier meshes such as support meshes, cutting meshes, infill meshes, and anti-overhang meshes. When a user converts an object to a modifier mesh, the object's node is decorated by a SettingOverrideDecorator. This decorator adds a PerObjectContainerStack to the CuraSceneNode, which allows the user to modify the settings of the specific model. 
-
-For more information on the functions added to the node by this decorator, visit the [SettingOverrideDecorator.py](https://github.com/Ultimaker/Cura/blob/master/cura/Settings/SettingOverrideDecorator.py).
-
-
-SliceableObjectDecorator
-----
-
-This is a convenience decorator that allows us to easily identify the nodes which can be sliced. All **individual** objects (meshes) added to the build plate receive this decorator, apart from the nodes loaded from GCode files (.gcode, .g, .gz, .ufp).
-
-The SceneNodes that do not receive this decorator are:
-
-  - Cameras
-  - BuildVolume
-  - Platform
-  - ConvexHullNodes
-  - CuraSceneNodes that serve as group nodes (these have a GroupDecorator instead)
-  - The CuraSceneNode that serves as the layer data node
-  - ToolHandles
-  - NozzleNode
-  - Nodes that contain GCode data. See the [BlockSlicingDecorator](#blockslicingdecorator) for more information on that. 
-
-This decorator provides the following function to the node:
-
-```python
-node.callDecoration("isSliceable")
-```
-
-LayerDataDecorator
-----
-
-Once the Slicing has completed and the CuraEngine has returned the slicing data, Cura creates a CuraSceneNode inside the BuildVolume which is decorated by a LayerDataDecorator. This decorator holds the layer data of the scene. 
-
-![Layer Data Scene Node](images/layer_data_scene_node.jpg)
-
-The layer data can be accessed through the function given to the aforementioned CuraSceneNode by the LayerDataDecorator:
-
-```python
-node.callDecoration("getLayerData")
-```
-
-This CuraSceneNode is created once Cura has completed processing the Layer data (after the user clicks on the Preview tab after slicing). The CuraSceneNode then is destroyed once any action that changes the Scene occurs (e.g. if the user moves/rotates/scales an object or changes a setting value), indicating that the layer data is no longer available. When that happens, the "Slice" button becomes available again.
-
-ZOffsetDecorator
-----
-
-The ZOffsetDecorator is added to an object in the scene when that object is moved below the build plate. It is primarily used when the "Automatically drop models to the build plate" preference is enabled, in order to make sure that the GravityOperation, which drops the mode on the build plate, is not applied when the object is moved under the build plate.
-
-The amount the object is moved under the build plate can be retrieved by calling the "getZOffset" decoration on the node:
-
-```python
-z_offset = node.callDecoration("getZOffset")
-```
-
-The ZOffsetDecorator is removed from the node when the node is move above the build plate.
-
-BlockSlicingDecorator
-----
-
-The BlockSlicingDecorator is the opposite of the SliceableObjectDecorator. It is added on objects loaded on the scene which should not be sliced. This decorator is primarily added on objects loaded from ".gcode", ".ufp", ".g", and ".gz" files. Such an object already contains all the slice information and therefore should not allow Cura to slice it. 
-
-If an object with a BlockSlicingDecorator appears in the scene, the backend (CuraEngine) and the print setup (changing print settings) become disabled, considering that G-code files cannot be modified.
-
-The BlockSlicingDecorator adds the following decoration function to the node:
-
-```python
-node.callDecoration("isBlockSlicing")
-```
-
-GCodeListDecorator
-----
-
-The GCodeListDecorator is also added only when a file containing GCode is loaded in the scene. It's purpose is to hold a list of all the GCode data of the loaded object.
-The GCode list data is stored in the scene's gcode_dict attribute which then is used in other places in the Cura code, e.g. to provide the GCode to the GCodeWriter or to the PostProcessingPlugin.
-
-The GCode data becomes available by calling the "getGCodeList" decoration of the node:
-
-```python
-gcode_list = node.callDecoration("getGCodeList")
-```
-
-The CuraSceneNode with the GCodeListDecorator is destroyed when another object or project file is loaded in the Scene.
-
-BuildPlateDecorator
-----
-
-The BuildPlateDecorator is added to all the CuraSceneNodes. This decorator is linked to a legacy feature which allowed the user to have multiple build plates open in Cura at the same time. With this decorator it was possible to determine which nodes are present on each build plate, and therefore, which objects should be visible in the currently active build plate. It indicates the number of the build plate this scene node belongs to, which currently is always the build plate -1. 
-
-This decorator provides a function to the node that returns the number of the build plate it belongs to:
-
-```python
-node.callDecoration("getBuildPlateNumber")
-```
-
-**Note:** Changing the active build plate is a disabled feature in Cura and it is intended to be completely removed (internal ticket: CURA-4975).

docs/scene/tools.md

@@ -1,86 +0,0 @@
-# Tools
-
-Tools are plugin objects which are used to manipulate or interact with the scene and the objects (node) in the scene. 
-
-![Class diagram of tools in the scene](images/tools_tool-handles_class_diagram.jpg)
-
-Tools live inside the Controller of the Application and may be associated with ToolHandles. Some of them interact with the scene as a whole (such as the Camera), while others interact with the objects (nodes) in the Scene (selection tool, rotate tool, scale tool etc.). The tools that are available in Cura (excluding the ones provided by downloadable plugins) are the following:
-
-  * [CameraTool](#cameratool)
-  * [SelectionTool](#selectiontool)
-  * [TranslateTool](#translatetool)
-  * [ScaleTool](#scaletool)
-  * [RotateTool](#rotatetool)
-  * [MirrorTool](#mirrortool)
-  * [PerObjectSettingsTool](#perobjectsettingstool)
-  * [SupportEraserTool](#supporteraser)
-
-*****
-
-### CameraTool
-
-The CameraTool is the tool that allows the user to manipulate the Camera. It provides the functions of moving, zooming, and rotating the Camera. This tool does not contain a handle.
-
-### SelectionTool
-This tool allows the user to select objects and groups of objects in the scene. The selected objects gain a blue outline and become available in the code through the Selection class. 
-
-![Selection Tool](images/selection_tool.jpg)
-
-This tool does not contain a handle.
-
-### TranslateTool
-
-This tool allows the user to move the object around the build plate. The TranslateTool is activated once the user presses the Move icon in the tool sidebar or hits the shortcut (T) while an object is selected. 
-
-![Translate Tool](images/translate_tool.jpg)
-
-The TranslateTool contains the TranslateToolHandle, which draws the arrow handles on the selected object(s). The TranslateTool generates TranslateOperations whenever the object is moved around the build plate.
-
-
-### ScaleTool
-
-This tool allows the user to scale the selected object(s). The ScaleTool is activated once the user presses the Scale icon in the tool sidebar or hits the shortcut (S) while an object is selected. 
-
-![Scale Tool](images/scale_tool.jpg)
-
-The ScaleTool contains the ScaleToolHandle, which draws the box handles on the selected object(s). The ScaleTool generates ScaleOperations whenever the object is scaled.
-
-### RotateTool
-
-This tool allows the user to rotate the selected object(s). The RotateTool is activated once the user presses the Rotate icon in the tool sidebar or hits the shortcut (R) while an object is selected. 
-
-![Rotate Tool](images/rotate_tool.jpg)
-
-The RotateTool contains the RotateToolHandle, which draws the donuts (tori) and arrow handles on the selected object(s). The RotateTool generates RotateOperations whenever the object is rotated or if a face is selected to be laid flat on the build plate. It also contains the `layFlat()` action, which generates the [LayFlatOperation](operations.md#layflatoperation).
-
-
-### MirrorTool
-
-This tool allows the user to mirror the selected object(s) in the required direction. The MirrorTool is activated once the user presses the Mirror icon in the tool sidebar or hits the shortcut (M) while an object is selected. 
-
-![Mirror Tool](images/mirror_tool.jpg)
-
-The MirrorTool contains the MirrorToolHandle, which draws pyramid handles on the selected object(s). The MirrorTool generates MirrorOperations whenever the object is mirrored against an axis.
-
-### PerObjectSettingsTool
-
-This tool allows the user to change the mesh type of the object into one of the following:
-
-  * Normal Model
-  * Print as support
-  * Modify settings for overlaps
-     - Infill mesh only
-     - Cutting mesh
-  * Don't support overlaps
-
-![Per object settings tool](images/per_objectsettings_tool.jpg)
-
-Contrary to other tools, this tool doesn't have any handles and it does not generate any operations. This means that once an object's type is changed it cannot be undone/redone using the OperationStack. This tool adds a [SettingOverrideDecorator](scene.md#settingoverridedecorator) on the object's node instead, which allows the user to change certain settings only for this mesh.
-
-### SupportEraser tool
-
-This tool allows the user to add support blockers on the selected model. The SupportEraserTool is activated once the user pressed the Support Blocker icon in the tool sidebar or hits the shortcut (E) while an object is selected. With this tool active, the user can add support blockers (cubes) on the object by clicking on various places on the selected mesh.
-
-![Support Eraser Tool](images/support_blocker_tool.jpg)
-
-The SupportEraser uses a GroupOperation to add a new CuraSceneNode (the eraser) in the scene and set the selected model as the parent of the eraser. This means that the addition of Erasers in the scene can be undone/redone. The SupportEraser does not have any tool handles.

packaging/AppImage-builder/AppImageBuilder.yml.jinja

@@ -14,106 +14,42 @@ AppDir:
     - amd64
     allow_unauthenticated: true
     sources:
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy main restricted
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy-updates main restricted
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy universe
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy-updates universe
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy multiverse
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy-updates multiverse
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy-backports main restricted
-        universe multiverse
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security main restricted
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security universe
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security multiverse
-    - sourceline: deb https://releases.jfrog.io/artifactory/jfrog-debs xenial contrib
-    - sourceline: deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
-    - sourceline: deb https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu/
-        jammy main
-    - sourceline: deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu/ jammy
-        main
-    - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/ms-teams stable
-        main
-    - sourceline: deb https://ppa.launchpadcontent.net/ppa-verse/cling/ubuntu/ jammy
-        main
-    - sourceline: deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable
-        main
-    - sourceline: deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_14.x
-        jammy main
-    - sourceline: deb [arch=amd64 signed-by=/usr/share/keyrings/transip-stack.gpg]
-        https://mirror.transip.net/stack/software/deb/Ubuntu_22.04/ ./
-    - sourceline: deb http://repository.spotify.com stable non-free
-    - sourceline: deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code
-        stable main
-    - sourceline: deb https://packagecloud.io/slacktechnologies/slack/debian/ jessie
-        main
+      - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
+      - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
+      - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security main restricted universe multiverse
     include:
-      - libc6:amd64
-      - xdg-desktop-portal-kde:amd64
-      - libcap2:amd64
-      - libcom-err2:amd64
-      - libdbus-1-3:amd64
-      - libgpg-error0:amd64
-      - libgtk-3-common
-      - libkeyutils1:amd64
-      - libllvm13
-      - liblzma5:amd64
-      - libpcre3:amd64
-      - libqt6gui6
-      - libqt6qml6
-      - libqt6qmlworkerscript6
-      - libqt6quick6
-      - libselinux1:amd64
-      - libtinfo6:amd64
-      - qml6-module-qtqml-workerscript:amd64
-      - qml6-module-qtquick:amd64
-      - qt6-gtk-platformtheme:amd64
-      - qt6-qpa-plugins:amd64
-        # x11
-      - libx11-6
-      - libx11-xcb1
-      - libxcb1
-      - libxcb-render0
-      - libxcb-xfixes0
-      - libxcb-shape0
-      - libxcb-dri2-0
-      - libxcb-shm0
-      - libxcb-glx0
-      - libxcb-present0
-      - libxcb-dri3-0
-        # graphic libraries interface (safe graphics bundle including drivers, acceleration may not work in some systems)
-      - libglvnd0
-      - libglx0
-      - libglapi-mesa
-      - libgl1
-      - libegl1
-      - libgbm1
-      - libdrm2
-      - libglx-mesa0
-      - libgl1-amber-dri
-      - libgl1-mesa-dri
-      - mesa-utils
-      - libgl1-mesa-glx
-      - libdrm-amdgpu1
-      - libdrm-nouveau2
-    exclude:
+      - xdg-desktop-portal-kde
+      - libgtk-3-0
+      - librsvg2-2
+      - librsvg2-common
+      - libgdk-pixbuf2.0-0
+      - libgdk-pixbuf2.0-bin
+      - libgdk-pixbuf2.0-common
+      - imagemagick
+      - shared-mime-info
+      - gnome-icon-theme-symbolic
       - hicolor-icon-theme
-      - adwaita-icon-theme
-      - humanity-icon-theme
+    exclude: []
   files:
     include: []
     exclude:
-    - usr/share/man
-    - usr/share/doc/*/README.*
-    - usr/share/doc/*/changelog.*
-    - usr/share/doc/*/NEWS.*
-    - usr/share/doc/*/TODO.*
+      - usr/share/man
+      - usr/share/doc/*/README.*
+      - usr/share/doc/*/changelog.*
+      - usr/share/doc/*/NEWS.*
+      - usr/share/doc/*/TODO.*
   runtime:
     env:
-      APPDIR_LIBRARY_PATH: "$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders"
+      APPDIR_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders"
+      LD_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders"
       PYTHONPATH: "$APPDIR"
       QT_PLUGIN_PATH: "$APPDIR/qt/plugins"
       QML2_IMPORT_PATH: "$APPDIR/qt/qml"
       QT_QPA_PLATFORMTHEME: xdgdesktopportal
+      GDK_PIXBUF_MODULEDIR: $APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
+      GDK_PIXBUF_MODULE_FILE: $APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+    path_mappings:
+      - /usr/share:$APPDIR/usr/share
   test:
     fedora-30:
       image: appimagecrafters/tests-env:fedora-30

packaging/MacOS/build_macos.py

@@ -87,15 +87,16 @@ 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_team = os.environ.get("MACOS_CERT_USER")
+    notary_executable = os.environ.get("NOTARY_TOOL_EXECUTABLE", "notarytool")
 
     notarize_arguments = [
-        "xcrun", altool_executable,
-        "--notarize-app",
-        "--primary-bundle-id", ULTIMAKER_CURA_DOMAIN,
-        "--username", notarize_user,
+        "xcrun", notary_executable,
+        "submit",
+        "--apple-id", notarize_user,
         "--password", notarize_password,
-        "--file", Path(dist_path, filename)
+        "--team-id", notarize_team,
+        Path(dist_path, filename)
     ]
 
     subprocess.run(notarize_arguments)

plugins/3MFReader/ThreeMFReader.py

@@ -186,6 +186,13 @@ class ThreeMFReader(MeshReader):
             if len(um_node.getAllChildren()) == 1:
                 # We don't want groups of one, so move the node up one "level"
                 child_node = um_node.getChildren()[0]
+                # Move all the meshes of children so that toolhandles are shown in the correct place.
+                if child_node.getMeshData():
+                    extents = child_node.getMeshData().getExtents()
+                    move_matrix = Matrix()
+                    move_matrix.translate(-extents.center)
+                    child_node.setMeshData(child_node.getMeshData().getTransformed(move_matrix))
+                    child_node.translate(extents.center)
                 parent_transformation = um_node.getLocalTransformation()
                 child_transformation = child_node.getLocalTransformation()
                 child_node.setTransformation(parent_transformation.multiply(child_transformation))
@@ -226,7 +233,8 @@ class ThreeMFReader(MeshReader):
                 if mesh_data is not None:
                     extents = mesh_data.getExtents()
                     if extents is not None:
-                        center_vector = Vector(extents.center.x, extents.center.y, extents.center.z)
+                        # We use a different coordinate space, so flip Z and Y
+                        center_vector = Vector(extents.center.x, extents.center.z, extents.center.y)
                         transform_matrix.setByTranslation(center_vector)
                 transform_matrix.multiply(um_node.getLocalTransformation())
                 um_node.setTransformation(transform_matrix)

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -1259,7 +1259,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                 available_intent_category_list = IntentManager.getInstance().currentAvailableIntentCategories()
                 if self._intent_category_to_apply is not None and self._intent_category_to_apply in available_intent_category_list:
                     machine_manager.setIntentByCategory(self._intent_category_to_apply)
-
+                else:
+                    # if no intent is provided, reset to the default (balanced) intent
+                    machine_manager.resetIntents()
         # Notify everything/one that is to notify about changes.
         global_stack.containersChanged.emit(global_stack.getTop())
 

plugins/3MFReader/WorkspaceDialog.py

@@ -35,10 +35,12 @@ class WorkspaceDialog(QObject):
         self._qml_url = "WorkspaceDialog.qml"
         self._lock = threading.Lock()
         self._default_strategy = None
-        self._result = {"machine": self._default_strategy,
-                        "quality_changes": self._default_strategy,
-                        "definition_changes": self._default_strategy,
-                        "material": self._default_strategy}
+        self._result = {
+            "machine": self._default_strategy,
+            "quality_changes": self._default_strategy,
+            "definition_changes": self._default_strategy,
+            "material": self._default_strategy,
+        }
         self._override_machine = None
         self._visible = False
         self.showDialogSignal.connect(self.__show)
@@ -347,10 +349,12 @@ class WorkspaceDialog(QObject):
         if threading.current_thread() != threading.main_thread():
             self._lock.acquire()
         # Reset the result
-        self._result = {"machine": self._default_strategy,
-                        "quality_changes": self._default_strategy,
-                        "definition_changes": self._default_strategy,
-                        "material": self._default_strategy}
+        self._result = {
+            "machine": self._default_strategy,
+            "quality_changes": self._default_strategy,
+            "definition_changes": self._default_strategy,
+            "material": self._default_strategy,
+        }
         self._visible = True
         self.showDialogSignal.emit()
 

plugins/CuraEngineBackend/StartSliceJob.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2021-2022 Ultimaker B.V.
+#  Copyright (c) 2023 UltiMaker
 #  Cura is released under the terms of the LGPLv3 or higher.
 import os
 
@@ -24,6 +24,7 @@ from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
 from UM.Scene.Scene import Scene #For typing.
 from UM.Settings.Validator import ValidatorState
 from UM.Settings.SettingRelation import RelationType
+from UM.Settings.SettingFunction import SettingFunction
 
 from cura.CuraApplication import CuraApplication
 from cura.Scene.CuraSceneNode import CuraSceneNode
@@ -46,44 +47,60 @@ class StartJobResult(IntEnum):
 
 
 class GcodeStartEndFormatter(Formatter):
-    """Formatter class that handles token expansion in start/end gcode"""
+    # Formatter class that handles token expansion in start/end gcode
+    # Example of a start/end gcode string:
+    # ```
+    # M104 S{material_print_temperature_layer_0, 0} ;pre-heat
+    # M140 S{material_bed_temperature_layer_0} ;heat bed
+    # M204 P{acceleration_print, 0} T{acceleration_travel, 0}
+    # M205 X{jerk_print, 0}
+    # ```
+    # Any expression between curly braces will be evaluated and replaced with the result, using the
+    # context of the provided default extruder. If no default extruder is provided, the global stack
+    # will be used. Alternatively, if the expression is formatted as "{[expression], [extruder_nr]}",
+    # then the expression will be evaluated with the extruder stack of the specified extruder_nr.
 
-    def __init__(self, default_extruder_nr: int = -1) -> None:
+    _extruder_regex = re.compile(r"^\s*(?P<expression>.*)\s*,\s*(?P<extruder_nr>\d+)\s*$")
+
+    def __init__(self, default_extruder_nr: int = -1, *,
+                 additional_per_extruder_settings: Optional[Dict[str, Dict[str, any]]] = None) -> None:
         super().__init__()
-        self._default_extruder_nr = default_extruder_nr
-
-    def get_value(self, key: str, args: str, kwargs: dict) -> str: #type: ignore # [CodeStyle: get_value is an overridden function from the Formatter class]
-        # The kwargs dictionary contains a dictionary for each stack (with a string of the extruder_nr as their key),
-        # and a default_extruder_nr to use when no extruder_nr is specified
+        self._default_extruder_nr: int = default_extruder_nr
+        self._additional_per_extruder_settings: Optional[Dict[str, Dict[str, any]]] = additional_per_extruder_settings
 
+    def get_value(self, expression: str, args: [str], kwargs: dict) -> str:
         extruder_nr = self._default_extruder_nr
 
-        key_fragments = [fragment.strip() for fragment in key.split(",")]
-        if len(key_fragments) == 2:
-            try:
-                extruder_nr = int(key_fragments[1])
-            except ValueError:
-                try:
-                    extruder_nr = int(kwargs["-1"][key_fragments[1]]) # get extruder_nr values from the global stack #TODO: How can you ever provide the '-1' kwarg?
-                except (KeyError, ValueError):
-                    # either the key does not exist, or the value is not an int
-                    Logger.log("w", "Unable to determine stack nr '%s' for key '%s' in start/end g-code, using global stack", key_fragments[1], key_fragments[0])
-        elif len(key_fragments) != 1:
-            Logger.log("w", "Incorrectly formatted placeholder '%s' in start/end g-code", key)
-            return "{" + key + "}"
+        # The settings may specify a specific extruder to use. This is done by
+        # formatting the expression as "{expression}, {extruder_nr}". If the
+        # expression is formatted like this, we extract the extruder_nr and use
+        # it to get the value from the correct extruder stack.
+        match = self._extruder_regex.match(expression)
+        if match:
+            expression = match.group("expression")
+            extruder_nr = int(match.group("extruder_nr"))
 
-        key = key_fragments[0]
+        if self._additional_per_extruder_settings is not None and str(
+                extruder_nr) in self._additional_per_extruder_settings:
+            additional_variables = self._additional_per_extruder_settings[str(extruder_nr)]
+        else:
+            additional_variables = dict()
 
-        default_value_str = "{" + key + "}"
-        value = default_value_str
-        # "-1" is global stack, and if the setting value exists in the global stack, use it as the fallback value.
-        if key in kwargs["-1"]:
-            value = kwargs["-1"][key]
-        if str(extruder_nr) in kwargs and key in kwargs[str(extruder_nr)]:
-            value = kwargs[str(extruder_nr)][key]
+        # Add the arguments and keyword arguments to the additional settings. These
+        # are currently _not_ used, but they are added for consistency with the
+        # base Formatter class.
+        for key, value in enumerate(args):
+            additional_variables[key] = value
+        for key, value in kwargs.items():
+            additional_variables[key] = value
 
-        if value == default_value_str:
-            Logger.log("w", "Unable to replace '%s' placeholder in start/end g-code", key)
+        if extruder_nr == -1:
+            container_stack = CuraApplication.getInstance().getGlobalContainerStack()
+        else:
+            container_stack = ExtruderManager.getInstance().getExtruderStack(extruder_nr)
+
+        setting_function = SettingFunction(expression)
+        value = setting_function(container_stack, additional_variables=additional_variables)
 
         return value
 
@@ -426,13 +443,14 @@ class StartSliceJob(Job):
             self._cacheAllExtruderSettings()
 
         try:
-            # any setting can be used as a token
-            fmt = GcodeStartEndFormatter(default_extruder_nr = default_extruder_nr)
-            if self._all_extruders_settings is None:
-                return ""
-            settings = self._all_extruders_settings.copy()
-            settings["default_extruder_nr"] = default_extruder_nr
-            return str(fmt.format(value, **settings))
+            # Get "replacement-keys" for the extruders. In the formatter the settings stack is used to get the
+            # replacement values for the setting-keys. However, the values for `material_id`, `material_type`,
+            # etc are not in the settings stack.
+            additional_per_extruder_settings = self._all_extruders_settings.copy()
+            additional_per_extruder_settings["default_extruder_nr"] = default_extruder_nr
+            fmt = GcodeStartEndFormatter(default_extruder_nr=default_extruder_nr,
+                                         additional_per_extruder_settings=additional_per_extruder_settings)
+            return str(fmt.format(value))
         except:
             Logger.logException("w", "Unable to do token replacement on start/end g-code")
             return str(value)

plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml

@@ -208,12 +208,14 @@ Item
         anchors.rightMargin: UM.Theme.getSize("thin_margin").height
 
         enabled: UM.Backend.state == UM.Backend.Done
-        currentIndex: UM.Backend.state == UM.Backend.Done ? 0 : 1
+        currentIndex: UM.Backend.state == UM.Backend.Done ? dfFilenameTextfield.text.startsWith("MM")? 1 : 0 : 2
+
         textRole: "text"
         valueRole: "value"
 
         model: [
-            { text: catalog.i18nc("@option", "Save Cura project and print file"), key: "3mf_ufp", value: ["3mf", "ufp"] },
+            { text: catalog.i18nc("@option", "Save Cura project and .ufp print file"), key: "3mf_ufp", value: ["3mf", "ufp"] },
+            { text: catalog.i18nc("@option", "Save Cura project and .makerbot print file"), key: "3mf_makerbot", value: ["3mf", "makerbot"] },
             { text: catalog.i18nc("@option", "Save Cura project"), key: "3mf", value: ["3mf"] },
         ]
     }

plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py

@@ -27,7 +27,7 @@ from .ExportFileJob import ExportFileJob
 class DFFileExportAndUploadManager:
     """
     Class responsible for exporting the scene and uploading the exported data to the Digital Factory Library. Since 3mf
-    and UFP files may need to be uploaded at the same time, this class keeps a single progress and success message for
+    and (UFP or makerbot) files may need to be uploaded at the same time, this class keeps a single progress and success message for
     both files and updates those messages according to the progress of both the file job uploads.
     """
     def __init__(self, file_handlers: Dict[str, FileHandler],
@@ -118,7 +118,7 @@ class DFFileExportAndUploadManager:
                 library_project_id = self._library_project_id,
                 source_file_id = self._source_file_id
         )
-        self._api.requestUploadUFP(request, on_finished = self._uploadFileData, on_error = self._onRequestUploadPrintFileFailed)
+        self._api.requestUploadMeshFile(request, on_finished = self._uploadFileData, on_error = self._onRequestUploadPrintFileFailed)
 
     def _uploadFileData(self, file_upload_response: Union[DFLibraryFileUploadResponse, DFPrintJobUploadResponse]) -> None:
         """Uploads the exported file data after the file or print job upload has been registered at the Digital Factory
@@ -279,22 +279,25 @@ class DFFileExportAndUploadManager:
         This means that something went wrong with the initial request to create a "file" entry in the digital library.
         """
         reply_string = bytes(reply.readAll()).decode()
-        filename_ufp = self._file_name + ".ufp"
-        Logger.log("d", "An error occurred while uploading the print job file '{}' to the Digital Library project '{}': {}".format(filename_ufp, self._library_project_id, reply_string))
+        if "ufp" in self._formats:
+            filename_meshfile = self._file_name + ".ufp"
+        elif "makerbot" in self._formats:
+            filename_meshfile = self._file_name + ".makerbot"
+        Logger.log("d", "An error occurred while uploading the print job file '{}' to the Digital Library project '{}': {}".format(filename_meshfile, self._library_project_id, reply_string))
         with self._message_lock:
             # Set the progress to 100% when the upload job fails, to avoid having the progress message stuck
-            self._file_upload_job_metadata[filename_ufp]["upload_status"] = "failed"
-            self._file_upload_job_metadata[filename_ufp]["upload_progress"] = 100
+            self._file_upload_job_metadata[filename_meshfile]["upload_status"] = "failed"
+            self._file_upload_job_metadata[filename_meshfile]["upload_progress"] = 100
 
             human_readable_error = self.extractErrorTitle(reply_string)
-            self._file_upload_job_metadata[filename_ufp]["file_upload_failed_message"] = getBackwardsCompatibleMessage(
+            self._file_upload_job_metadata[filename_meshfile]["file_upload_failed_message"] = getBackwardsCompatibleMessage(
                     title = "File upload error",
-                    text = "Failed to upload the file '{}' to '{}'. {}".format(filename_ufp, self._library_project_name, human_readable_error),
+                    text = "Failed to upload the file '{}' to '{}'. {}".format(filename_meshfile, self._library_project_name, human_readable_error),
                     message_type_str = "ERROR",
                     lifetime = 30
             )
         self._on_upload_error()
-        self._onFileUploadFinished(filename_ufp)
+        self._onFileUploadFinished(filename_meshfile)
 
     @staticmethod
     def extractErrorTitle(reply_body: Optional[str]) -> str:
@@ -407,4 +410,28 @@ class DFFileExportAndUploadManager:
             job_ufp = ExportFileJob(self._file_handlers["ufp"], self._nodes, self._file_name, "ufp")
             job_ufp.finished.connect(self._onPrintFileExported)
             self._upload_jobs.append(job_ufp)
+
+        if "makerbot" in self._formats and "makerbot" in self._file_handlers and self._file_handlers["makerbot"]:
+            filename_makerbot = self._file_name + ".makerbot"
+            metadata[filename_makerbot] = {
+                "export_job_output"   : None,
+                "upload_progress"     : -1,
+                "upload_status"       : "",
+                "file_upload_response": None,
+                "file_upload_success_message": getBackwardsCompatibleMessage(
+                    text = "'{}' was uploaded to '{}'.".format(filename_makerbot, self._library_project_name),
+                    title = "Upload successful",
+                    message_type_str = "POSITIVE",
+                    lifetime = 30,
+                ),
+                "file_upload_failed_message": getBackwardsCompatibleMessage(
+                    text = "Failed to upload the file '{}' to '{}'.".format(filename_makerbot, self._library_project_name),
+                    title = "File upload error",
+                    message_type_str = "ERROR",
+                    lifetime = 30
+                )
+            }
+            job_makerbot = ExportFileJob(self._file_handlers["makerbot"], self._nodes, self._file_name, "makerbot")
+            job_makerbot.finished.connect(self._onPrintFileExported)
+            self._upload_jobs.append(job_makerbot)
         return metadata

plugins/DigitalLibrary/src/DigitalFactoryApiClient.py

@@ -313,7 +313,7 @@ class DigitalFactoryApiClient:
                        error_callback = on_error,
                        timeout = self.DEFAULT_REQUEST_TIMEOUT)
 
-    def requestUploadUFP(self, request: DFPrintJobUploadRequest,
+    def requestUploadMeshFile(self, request: DFPrintJobUploadRequest,
                          on_finished: Callable[[DFPrintJobUploadResponse], Any],
                          on_error: Optional[Callable[["QNetworkReply", "QNetworkReply.NetworkError"], None]] = None) -> None:
         """Requests the Digital Factory to register the upload of a file in a library project.

plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py

@@ -92,7 +92,8 @@ class DigitalFactoryOutputDevice(ProjectOutputDevice):
         if not self._controller.file_handlers:
             self._controller.file_handlers = {
                 "3mf": CuraApplication.getInstance().getWorkspaceFileHandler(),
-                "ufp": CuraApplication.getInstance().getMeshFileHandler()
+                "ufp": CuraApplication.getInstance().getMeshFileHandler(),
+                "makerbot": CuraApplication.getInstance().getMeshFileHandler()
             }
 
         self._dialog = CuraApplication.getInstance().createQmlComponent(self._dialog_path, {"manager": self._controller})

plugins/MakerbotWriter/MakerbotWriter.py

@@ -0,0 +1,306 @@
+# Copyright (c) 2023 UltiMaker
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from io import StringIO, BufferedIOBase
+import json
+from typing import cast, List, Optional, Dict
+from zipfile import BadZipFile, ZipFile, ZIP_DEFLATED
+import pyDulcificum as du
+
+from PyQt6.QtCore import QBuffer
+
+from UM.Logger import Logger
+from UM.Math.AxisAlignedBox import AxisAlignedBox
+from UM.Mesh.MeshWriter import MeshWriter
+from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType
+from UM.PluginRegistry import PluginRegistry
+from UM.Scene.SceneNode import SceneNode
+from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
+from UM.i18n import i18nCatalog
+
+from cura.CuraApplication import CuraApplication
+from cura.Snapshot import Snapshot
+from cura.Utils.Threading import call_on_qt_thread
+from cura.CuraVersion import ConanInstalls
+
+catalog = i18nCatalog("cura")
+
+
+class MakerbotWriter(MeshWriter):
+    """A file writer that writes '.makerbot' files."""
+
+    def __init__(self) -> None:
+        super().__init__(add_to_recent_files=False)
+        Logger.info(f"Using PyDulcificum: {du.__version__}")
+        MimeTypeDatabase.addMimeType(
+            MimeType(
+                name="application/x-makerbot",
+                comment="Makerbot Toolpath Package",
+                suffixes=["makerbot"]
+            )
+        )
+
+    _PNG_FORMATS = [
+        {"prefix": "isometric_thumbnail", "width": 120, "height": 120},
+        {"prefix": "isometric_thumbnail", "width": 320, "height": 320},
+        {"prefix": "isometric_thumbnail", "width": 640, "height": 640},
+        {"prefix": "thumbnail", "width": 140, "height": 106},
+        {"prefix": "thumbnail", "width": 212, "height": 300},
+        {"prefix": "thumbnail", "width": 960, "height": 1460},
+        {"prefix": "thumbnail", "width": 90, "height": 90},
+    ]
+    _META_VERSION = "3.0.0"
+    _PRINT_NAME_MAP = {
+        "Makerbot Method": "fire_e",
+        "Makerbot Method X": "lava_f",
+        "Makerbot Method XL": "magma_10",
+    }
+    _EXTRUDER_NAME_MAP = {
+        "1XA": "mk14_hot",
+        "2XA": "mk14_hot_s",
+        "1C": "mk14_c",
+        "1A": "mk14",
+        "2A": "mk14_s",
+    }
+    _MATERIAL_MAP = {"2780b345-577b-4a24-a2c5-12e6aad3e690": "abs",
+                     "88c8919c-6a09-471a-b7b6-e801263d862d": "abs-wss1",
+                     "416eead4-0d8e-4f0b-8bfc-a91a519befa5": "asa",
+                     "85bbae0e-938d-46fb-989f-c9b3689dc4f0": "nylon-cf",
+                     "283d439a-3490-4481-920c-c51d8cdecf9c": "nylon",
+                     "62414577-94d1-490d-b1e4-7ef3ec40db02": "pc",
+                     "69386c85-5b6c-421a-bec5-aeb1fb33f060": "petg",
+                     "0ff92885-617b-4144-a03c-9989872454bc": "pla",
+                     "a4255da2-cb2a-4042-be49-4a83957a2f9a": "pva",
+                     "a140ef8f-4f26-4e73-abe0-cfc29d6d1024": "wss1",
+                     "77873465-83a9-4283-bc44-4e542b8eb3eb": "sr30",
+                     "96fca5d9-0371-4516-9e96-8e8182677f3c": "im-pla",
+                     "9f52c514-bb53-46a6-8c0c-d507cd6ee742": "abs",
+                     "0f9a2a91-f9d6-4b6b-bd9b-a120a29391be": "abs",
+                     "d3e972f2-68c0-4d2f-8cfd-91028dfc3381": "abs",
+                     "495a0ce5-9daf-4a16-b7b2-06856d82394d": "abs-cf10",
+                     "cb76bd6e-91fd-480c-a191-12301712ec77": "abs-wss1",
+                     "a017777e-3f37-4d89-a96c-dc71219aac77": "abs-wss1",
+                     "4d96000d-66de-4d54-a580-91827dcfd28f": "abs-wss1",
+                     "0ecb0e1a-6a66-49fb-b9ea-61a8924e0cf5": "asa",
+                     "efebc2ea-2381-4937-926f-e824524524a5": "asa",
+                     "b0199512-5714-4951-af85-be19693430f8": "asa",
+                     "b9f55a0a-a2b6-4b8d-8d48-07802c575bd1": "pla",
+                     "c439d884-9cdc-4296-a12c-1bacae01003f": "pla",
+                     "16a723e3-44df-49f4-82ec-2a1173c1e7d9": "pla",
+                     "74d0f5c2-fdfd-4c56-baf1-ff5fa92d177e": "pla",
+                     "64dcb783-470d-4400-91b1-7001652f20da": "pla",
+                     "3a1b479b-899c-46eb-a2ea-67050d1a4937": "pla",
+                     "4708ac49-5dde-4cc2-8c0a-87425a92c2b3": "pla",
+                     "4b560eda-1719-407f-b085-1c2c1fc8ffc1": "pla",
+                     "e10a287d-0067-4a58-9083-b7054f479991": "im-pla",
+                     "01a6b5b0-fab1-420c-a5d9-31713cbeb404": "im-pla",
+                     "f65df4ad-a027-4a48-a51d-975cc8b87041": "im-pla",
+                     "f48739f8-6d96-4a3d-9a2e-8505a47e2e35": "im-pla",
+                     "5c7d7672-e885-4452-9a78-8ba90ec79937": "petg",
+                     "91e05a6e-2f5b-4964-b973-d83b5afe6db4": "petg",
+                     "bdc7dd03-bf38-48ee-aeca-c3e11cee799e": "petg",
+                     "54f66c89-998d-4070-aa60-1cb0fd887518": "nylon",
+                     "002c84b3-84ac-4b5a-b57d-fe1f555a6351": "pva",
+                     "e4da5fcb-f62d-48a2-aaef-0b645aa6973b": "wss1",
+                     "77f06146-6569-437d-8380-9edb0d635a32": "sr30"}
+
+    # must be called from the main thread because of OpenGL
+    @staticmethod
+    @call_on_qt_thread
+    def _createThumbnail(width: int, height: int) -> Optional[QBuffer]:
+        if not CuraApplication.getInstance().isVisible:
+            Logger.warning("Can't create snapshot when renderer not initialized.")
+            return
+        try:
+            snapshot = Snapshot.isometricSnapshot(width, height)
+
+            thumbnail_buffer = QBuffer()
+            thumbnail_buffer.open(QBuffer.OpenModeFlag.WriteOnly)
+
+            snapshot.save(thumbnail_buffer, "PNG")
+
+            return thumbnail_buffer
+
+        except:
+            Logger.logException("w", "Failed to create snapshot image")
+
+        return None
+
+    def write(self, stream: BufferedIOBase, nodes: List[SceneNode], mode=MeshWriter.OutputMode.BinaryMode) -> bool:
+        if mode != MeshWriter.OutputMode.BinaryMode:
+            Logger.log("e", "MakerbotWriter does not support text mode.")
+            self.setInformation(catalog.i18nc("@error:not supported", "MakerbotWriter does not support text mode."))
+            return False
+
+        # The GCodeWriter plugin is always available since it is in the "required" list of plugins.
+        gcode_writer = PluginRegistry.getInstance().getPluginObject("GCodeWriter")
+
+        if gcode_writer is None:
+            Logger.log("e", "Could not find the GCodeWriter plugin, is it disabled?.")
+            self.setInformation(
+                catalog.i18nc("@error:load", "Could not load GCodeWriter plugin. Try to re-enable the plugin."))
+            return False
+
+        gcode_writer = cast(MeshWriter, gcode_writer)
+
+        gcode_text_io = StringIO()
+        success = gcode_writer.write(gcode_text_io, None)
+
+        # Writing the g-code failed. Then I can also not write the gzipped g-code.
+        if not success:
+            self.setInformation(gcode_writer.getInformation())
+            return False
+
+        json_toolpaths = du.gcode_2_miracle_jtp(gcode_text_io.getvalue())
+        metadata = self._getMeta(nodes)
+
+        png_files = []
+        for png_format in self._PNG_FORMATS:
+            width, height, prefix = png_format["width"], png_format["height"], png_format["prefix"]
+            thumbnail_buffer = self._createThumbnail(width, height)
+            if thumbnail_buffer is None:
+                Logger.warning(f"Could not create thumbnail of size {width}x{height}.")
+                continue
+            png_files.append({
+                "file": f"{prefix}_{width}x{height}.png",
+                "data": thumbnail_buffer.data(),
+            })
+
+        try:
+            with ZipFile(stream, "w", compression=ZIP_DEFLATED) as zip_stream:
+                zip_stream.writestr("meta.json", json.dumps(metadata, indent=4))
+                zip_stream.writestr("print.jsontoolpath", json_toolpaths)
+                for png_file in png_files:
+                    file, data = png_file["file"], png_file["data"]
+                    zip_stream.writestr(file, data)
+        except (IOError, OSError, BadZipFile) as ex:
+            Logger.log("e", f"Could not write to (.makerbot) file because: '{ex}'.")
+            self.setInformation(catalog.i18nc("@error", "MakerbotWriter could not save to the designated path."))
+            return False
+
+        return True
+
+    def _getMeta(self, root_nodes: List[SceneNode]) -> Dict[str, any]:
+        application = CuraApplication.getInstance()
+        machine_manager = application.getMachineManager()
+        global_stack = machine_manager.activeMachine
+        extruders = global_stack.extruderList
+
+        nodes = []
+        for root_node in root_nodes:
+            for node in DepthFirstIterator(root_node):
+                if not getattr(node, "_outside_buildarea", False):
+                    if node.callDecoration(
+                            "isSliceable") and node.getMeshData() and node.isVisible() and not node.callDecoration(
+                            "isNonThumbnailVisibleMesh"):
+                        nodes.append(node)
+
+        meta = dict()
+
+        meta["bot_type"] = MakerbotWriter._PRINT_NAME_MAP.get((name := global_stack.definition.name), name)
+
+        bounds: Optional[AxisAlignedBox] = None
+        for node in nodes:
+            node_bounds = node.getBoundingBox()
+            if node_bounds is None:
+                continue
+            if bounds is None:
+                bounds = node_bounds
+            else:
+                bounds = bounds + node_bounds
+
+        if bounds is not None:
+            meta["bounding_box"] = {
+                "x_min": bounds.left,
+                "x_max": bounds.right,
+                "y_min": bounds.back,
+                "y_max": bounds.front,
+                "z_min": bounds.bottom,
+                "z_max": bounds.top,
+            }
+
+        material_bed_temperature = global_stack.getProperty("material_bed_temperature", "value")
+        meta["platform_temperature"] = material_bed_temperature
+
+        build_volume_temperature = global_stack.getProperty("build_volume_temperature", "value")
+        meta["build_plane_temperature"] = build_volume_temperature
+
+        print_information = application.getPrintInformation()
+
+        meta["commanded_duration_s"] = int(print_information.currentPrintTime)
+        meta["duration_s"] = int(print_information.currentPrintTime)
+
+        material_lengths = list(map(meterToMillimeter, print_information.materialLengths))
+        meta["extrusion_distance_mm"] = material_lengths[0]
+        meta["extrusion_distances_mm"] = material_lengths
+
+        meta["extrusion_mass_g"] = print_information.materialWeights[0]
+        meta["extrusion_masses_g"] = print_information.materialWeights
+
+        meta["uuid"] = print_information.slice_uuid
+
+        materials = []
+        for extruder in extruders:
+            guid = extruder.material.getMetaData().get("GUID")
+            material_name = extruder.material.getMetaData().get("material")
+            material = self._MATERIAL_MAP.get(guid, material_name)
+            materials.append(material)
+
+        meta["material"] = materials[0]
+        meta["materials"] = materials
+
+        materials_temps = [extruder.getProperty("default_material_print_temperature", "value") for extruder in
+                           extruders]
+        meta["extruder_temperature"] = materials_temps[0]
+        meta["extruder_temperatures"] = materials_temps
+
+        meta["model_counts"] = [{"count": 1, "name": node.getName()} for node in nodes]
+
+        tool_types = [MakerbotWriter._EXTRUDER_NAME_MAP.get((name := extruder.variant.getName()), name) for extruder in
+                      extruders]
+        meta["tool_type"] = tool_types[0]
+        meta["tool_types"] = tool_types
+
+        meta["version"] = MakerbotWriter._META_VERSION
+
+        meta["preferences"] = dict()
+        for node in nodes:
+            bounds = node.getBoundingBox()
+            meta["preferences"][str(node.getName())] = {
+                "machineBounds": [bounds.right, bounds.back, bounds.left, bounds.front] if bounds is not None else None,
+                "printMode": CuraApplication.getInstance().getIntentManager().currentIntentCategory,
+            }
+
+        meta["miracle_config"] = {"gaggles": {str(node.getName()): {} for node in nodes}}
+
+        cura_engine_info = ConanInstalls.get("curaengine", {"version": "unknown", "revision": "unknown"})
+        meta["curaengine_version"] = cura_engine_info["version"]
+        meta["curaengine_commit_hash"] = cura_engine_info["revision"]
+
+        dulcificum_info = ConanInstalls.get("dulcificum", {"version": "unknown", "revision": "unknown"})
+        meta["dulcificum_version"] = dulcificum_info["version"]
+        meta["dulcificum_commit_hash"] = dulcificum_info["revision"]
+
+        meta["makerbot_writer_version"] = self.getVersion()
+        meta["pyDulcificum_version"] = du.__version__
+
+        # Add engine plugin information to the metadata
+        for name, package_info in ConanInstalls.items():
+            if not name.startswith("curaengine_"):
+                continue
+            meta[f"{name}_version"] = package_info["version"]
+            meta[f"{name}_commit_hash"] = package_info["revision"]
+
+        # TODO add the following instructions
+        # num_tool_changes
+        # num_z_layers
+        # num_z_transitions
+        # platform_temperature
+        # total_commands
+
+        return meta
+
+
+def meterToMillimeter(value: float) -> float:
+    """Converts a value in meters to millimeters."""
+    return value * 1000.0

plugins/MakerbotWriter/__init__.py

@@ -0,0 +1,28 @@
+# Copyright (c) 2023 UltiMaker
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from UM.i18n import i18nCatalog
+
+from . import MakerbotWriter
+
+catalog = i18nCatalog("cura")
+
+
+def getMetaData():
+    file_extension = "makerbot"
+    return {
+        "mesh_writer": {
+            "output": [{
+                "extension": file_extension,
+                "description": catalog.i18nc("@item:inlistbox", "Makerbot Printfile"),
+                "mime_type": "application/x-makerbot",
+                "mode": MakerbotWriter.MakerbotWriter.OutputMode.BinaryMode,
+            }],
+        }
+    }
+
+
+def register(app):
+    return {
+        "mesh_writer": MakerbotWriter.MakerbotWriter(),
+    }

plugins/MakerbotWriter/plugin.json

@@ -0,0 +1,13 @@
+{
+  "name": "Makerbot Printfile Writer",
+  "author": "UltiMaker",
+  "version": "0.1.0",
+  "description": "Provides support for writing MakerBot Format Packages.",
+  "api": 8,
+  "supported_sdk_versions": [
+    "8.0.0",
+    "8.1.0",
+    "8.2.0"
+  ],
+  "i18n-catalog": "cura"
+}

plugins/PostProcessingPlugin/PostProcessingPlugin.py

@@ -93,6 +93,11 @@ class PostProcessingPlugin(QObject, Extension):
                     Logger.logException("e", "Exception in post-processing script.")
             if len(self._script_list):  # Add comment to g-code if any changes were made.
                 gcode_list[0] += ";POSTPROCESSED\n"
+            # Add all the active post processor names to data[0]
+                pp_name_list = Application.getInstance().getGlobalContainerStack().getMetaDataEntry("post_processing_scripts")
+                for pp_name in pp_name_list.split("\n"):
+                    pp_name = pp_name.split("]")
+                    gcode_list[0] += ";  " + str(pp_name[0]) + "]\n"
             gcode_dict[active_build_plate_id] = gcode_list
             setattr(scene, "gcode_dict", gcode_dict)
         else:

plugins/PostProcessingPlugin/scripts/LimitXYAccelJerk.py

@@ -8,6 +8,7 @@
 # This post is intended for printers with moving beds (bed slingers) so UltiMaker printers are excluded.
 # When setting an accel limit on multi-extruder printers ALL extruders are effected.
 # This post does not distinguish between Print Accel and Travel Accel.  The limit is the limit for all regardless.  Example: Skin Accel = 1000 and Outer Wall accel = 500.  If the limit is set to 300 then both Skin and Outer Wall will be Accel = 300.
+# 9/15/2023 added support for RepRap M566 command for Jerk in mm/min
 
 from ..Script import Script
 from cura.CuraApplication import CuraApplication
@@ -15,7 +16,7 @@ import re
 from UM.Message import Message
 
 class LimitXYAccelJerk(Script):
-        
+
     def initialize(self) -> None:
         super().initialize()
         # Get the Accel and Jerk and set the values in the setting boxes--
@@ -31,15 +32,20 @@ class LimitXYAccelJerk(Script):
         self._instance.setProperty("y_jerk", "value", jerk_print_old)
         ext_count = int(mycura.getProperty("machine_extruder_count", "value"))
         machine_name = str(mycura.getProperty("machine_name", "value"))
-                
+        if str(mycura.getProperty("machine_gcode_flavor", "value")) == "RepRap (RepRap)":
+            self._instance.setProperty("jerk_cmd", "value", "reprap_flavor")
+        else:
+            self._instance.setProperty("jerk_cmd", "value", "marlin_flavor")
+        firmware_flavor = str(mycura.getProperty("machine_gcode_flavor", "value"))
+
         # Warn the user if the printer is an Ultimaker-------------------------
-        if "Ultimaker" in machine_name:
+        if "Ultimaker" in machine_name or "UltiGCode" in firmware_flavor or "Griffin" in firmware_flavor:
             Message(text = "<NOTICE> [Limit the X-Y Accel/Jerk] DID NOT RUN because Ultimaker printers don't have sliding beds.").show()
-        
+
         # Warn the user if the printer is multi-extruder------------------
         if ext_count > 1:
             Message(text = "<NOTICE> 'Limit the X-Y Accel/Jerk': The post processor treats all extruders the same.  If you have multiple extruders they will all be subject to the same Accel and Jerk limits imposed.  If you have different Travel and Print Accel they will also be subject to the same limits.  If that is not acceptable then you should not use this Post Processor.").show()
- 
+
     def getSettingDataString(self):
             return """{
             "name": "Limit the X-Y Accel/Jerk (all extruders equal)",
@@ -86,6 +92,17 @@ class LimitXYAccelJerk(Script):
                     "enabled": true,
                     "default_value": false
                 },
+                "jerk_cmd":
+                {
+                    "label": "G-Code Jerk Command",
+                    "description": "Marlin uses M205.  RepRap might use M566.",
+                    "type": "enum",
+                    "options": {
+                        "marlin_flavor": "M205",
+                        "reprap_flavor": "M566"},
+                    "default_value": "marlin_flavor",
+                    "enabled":  "jerk_enable"
+                },
                 "x_jerk":
                 {
                     "label": "    X jerk",
@@ -152,19 +169,19 @@ class LimitXYAccelJerk(Script):
         extruder = mycura.extruderList
         machine_name = str(mycura.getProperty("machine_name", "value"))
         print_sequence = str(mycura.getProperty("print_sequence", "value"))
-        
+
         # Exit if 'one_at_a_time' is enabled-------------------------
         if print_sequence == "one_at_a_time":
             Message(text = "<NOTICE> [Limit the X-Y Accel/Jerk]  DID NOT RUN.  This post processor is not compatible with 'One-at-a-Time' mode.").show()
             data[0] += ";  [LimitXYAccelJerk] DID NOT RUN because Cura is set to 'One-at-a-Time' mode.\n"
             return data
-                
+
         # Exit if the printer is an Ultimaker-------------------------
         if "Ultimaker" in machine_name:
             Message(text = "<NOTICE> [Limit the X-Y Accel/Jerk]  DID NOT RUN.  This post processor is for bed slinger printers only.").show()
             data[0] += ";  [LimitXYAccelJerk] DID NOT RUN because the printer doesn't have a sliding bed.\n"
             return data
-            
+
         type_of_change = str(self.getSettingValueByKey("type_of_change"))
         accel_print_enabled = bool(extruder[0].getProperty("acceleration_enabled", "value"))
         accel_travel_enabled = bool(extruder[0].getProperty("acceleration_travel_enabled", "value"))
@@ -174,7 +191,6 @@ class LimitXYAccelJerk(Script):
         jerk_travel_enabled = str(extruder[0].getProperty("jerk_travel_enabled", "value"))
         jerk_print_old = extruder[0].getProperty("jerk_print", "value")
         jerk_travel_old = extruder[0].getProperty("jerk_travel", "value")
-        
         if int(accel_print) >= int(accel_travel):
             accel_old = accel_print
         else:
@@ -188,23 +204,30 @@ class LimitXYAccelJerk(Script):
         #Set the new Accel values----------------------------------------------------------
         x_accel = str(self.getSettingValueByKey("x_accel_limit"))
         y_accel = str(self.getSettingValueByKey("y_accel_limit"))
-        x_jerk = int(self.getSettingValueByKey("x_jerk"))  
+        x_jerk = int(self.getSettingValueByKey("x_jerk"))
         y_jerk = int(self.getSettingValueByKey("y_jerk"))
-        
+        if str(self.getSettingValueByKey("jerk_cmd")) == "reprap_flavor":
+            jerk_cmd = "M566"
+            x_jerk *= 60
+            y_jerk *= 60
+            jerk_old *= 60
+        else:
+            jerk_cmd = "M205"
+
         # Put the strings together-------------------------------------------
-        m201_limit_new = "M201 X" + x_accel + " Y" + y_accel
-        m201_limit_old = "M201 X" + str(round(accel_old)) + " Y" + str(round(accel_old))
+        m201_limit_new = f"M201 X{x_accel} Y{y_accel}"
+        m201_limit_old = f"M201 X{round(accel_old)} Y{round(accel_old)}"
         if x_jerk == 0:
             m205_jerk_pattern = "Y(\d*)"
-            m205_jerk_new = "Y" + str(y_jerk)
+            m205_jerk_new = f"Y{y_jerk}"
         if y_jerk == 0:
             m205_jerk_pattern = "X(\d*)"
-            m205_jerk_new = "X" + str(x_jerk)
+            m205_jerk_new = f"X{x_jerk}"
         if x_jerk != 0 and y_jerk != 0:
-            m205_jerk_pattern = "M205 X(\d*) Y(\d*)"
-            m205_jerk_new = "M205 X" + str(x_jerk) + " Y" + str(y_jerk)
-        m205_jerk_old = "M205 X" + str(jerk_old) + " Y" + str(jerk_old)
-        type_of_change = self.getSettingValueByKey("type_of_change") 
+            m205_jerk_pattern = jerk_cmd + " X(\d*) Y(\d*)"
+            m205_jerk_new = jerk_cmd + f" X{x_jerk} Y{y_jerk}"
+        m205_jerk_old = jerk_cmd + f" X{jerk_old} Y{jerk_old}"
+        type_of_change = self.getSettingValueByKey("type_of_change")
         
         #Get the indexes of the start and end layers----------------------------------------
         if type_of_change == 'immediate_change':
@@ -226,7 +249,7 @@ class LimitXYAccelJerk(Script):
                         end_index = num
                         break
                 except:
-                    end_index = len(data)-2      
+                    end_index = len(data)-2
 
         #Add Accel limit and new Jerk at start layer-----------------------------------------------------
         if type_of_change == "immediate_change":
@@ -239,13 +262,13 @@ class LimitXYAccelJerk(Script):
                         lines.insert(index+2,m205_jerk_new)
                     data[start_index] = "\n".join(lines)
                     break
-            
-            #Alter any existing jerk lines.  Accel lines can be ignored-----------------------------------  
+
+            #Alter any existing jerk lines.  Accel lines can be ignored-----------------------------------
             for num in range(start_index,end_index,1):
                 layer = data[num]
                 lines = layer.split("\n")
                 for index, line in enumerate(lines):
-                    if line.startswith("M205"):
+                    if line.startswith("M205") or line.startswith("M566"):
                         lines[index] = re.sub(m205_jerk_pattern, m205_jerk_new, line)
                 data[num] = "\n".join(lines)
             if end_layer != -1:
@@ -259,8 +282,8 @@ class LimitXYAccelJerk(Script):
                     pass
             else:
                 data[len(data)-1] = m201_limit_old + "\n" + m205_jerk_old + "\n" + data[len(data)-1]
-            return data        
-        
+            return data
+
         elif type_of_change == "gradual_change":
             layer_spread = end_index - start_index
             if accel_old >= int(x_accel):
@@ -269,9 +292,9 @@ class LimitXYAccelJerk(Script):
                 x_accel_hyst = round((int(x_accel) - accel_old) / layer_spread)
             if accel_old >= int(y_accel):
                 y_accel_hyst = round((accel_old - int(y_accel)) / layer_spread)
-            else:                
+            else:
                 y_accel_hyst = round((int(y_accel) - accel_old) / layer_spread)
-            
+
             if accel_old >= int(x_accel):
                 x_accel_start = round(round((accel_old - x_accel_hyst)/25)*25)
             else:
@@ -298,7 +321,7 @@ class LimitXYAccelJerk(Script):
                     x_accel_start -= x_accel_hyst
                     if x_accel_start < int(x_accel): x_accel_start = int(x_accel)
                 else:
-                    x_accel_start += x_accel_hyst                
+                    x_accel_start += x_accel_hyst
                     if x_accel_start > int(x_accel): x_accel_start = int(x_accel)
                 if accel_old >= int(y_accel):
                     y_accel_start -= y_accel_hyst
@@ -312,14 +335,14 @@ class LimitXYAccelJerk(Script):
                         lines.insert(index+1, m201_limit_new)
                         continue
                 data[num] = "\n".join(lines)
-            
+
             #Alter any existing jerk lines.  Accel lines can be ignored---------------
             if self.getSettingValueByKey("jerk_enable"):
                 for num in range(start_index,len(data)-1,1):
                     layer = data[num]
                     lines = layer.split("\n")
                     for index, line in enumerate(lines):
-                        if line.startswith("M205"):
+                        if line.startswith("M205") or line.startswith("M566"):
                             lines[index] = re.sub(m205_jerk_pattern, m205_jerk_new, line)
                     data[num] = "\n".join(lines)
                 data[len(data)-1] = m201_limit_old + "\n" + m205_jerk_old + "\n" + data[len(data)-1]

plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml

@@ -115,7 +115,7 @@ UM.Dialog
     // Utils
     function formatPrintJobName(name)
     {
-        var extensions = [ ".gcode.gz", ".gz", ".gcode", ".ufp" ]
+        var extensions = [ ".gcode.gz", ".gz", ".gcode", ".ufp", ".makerbot" ]
         for (var i = 0; i < extensions.length; i++)
         {
             var extension = extensions[i]

plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2023 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
@@ -6,7 +6,7 @@ import UM 1.3 as UM
 import Cura 1.0 as Cura
 
 Item {
-    property var cameraUrl: "";
+    property string cameraUrl: "";
 
     Rectangle {
         anchors.fill:parent;
@@ -34,22 +34,29 @@ Item {
 
     Cura.NetworkMJPGImage {
         id: cameraImage
-        anchors.horizontalCenter: parent.horizontalCenter;
-        anchors.verticalCenter: parent.verticalCenter;
-        height: Math.round((imageHeight === 0 ? 600 * screenScaleFactor : imageHeight) * width / imageWidth);
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.verticalCenter: parent.verticalCenter
+
+        readonly property real img_scale_factor: {
+            if (imageWidth > maximumWidth || imageHeight > maximumHeight) {
+                return Math.min(maximumWidth / imageWidth, maximumHeight / imageHeight);
+            }
+            return 1.0;
+        }
+
+        width: imageWidth === 0 ? 800 * screenScaleFactor : imageWidth * img_scale_factor
+        height: imageHeight === 0 ? 600 * screenScaleFactor : imageHeight * img_scale_factor
+
         onVisibleChanged: {
+            if (cameraUrl === "") return;
+
             if (visible) {
-                if (cameraUrl != "") {
-                    start();
-                }
+                start();
             } else {
-                if (cameraUrl != "") {
-                    stop();
-                }
+                stop();
             }
         }
         source: cameraUrl
-        width: Math.min(imageWidth === 0 ? 800 * screenScaleFactor : imageWidth, maximumWidth);
         z: 1
     }
 

plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py

@@ -82,13 +82,22 @@ class CloudApiClient:
         # HACK: There is something weird going on with the API, as it reports printer types in formats like
         # "ultimaker_s3", but wants "Ultimaker S3" when using the machine_variant filter query. So we need to do some
         # conversion!
+        # API points to "MakerBot Method" for a makerbot printertypes which we already changed to allign with other printer_type
 
-        machine_type = machine_type.replace("_plus", "+")
-        machine_type = machine_type.replace("_", " ")
-        machine_type = machine_type.replace("ultimaker", "ultimaker ")
-        machine_type = machine_type.replace("  ", " ")
-        machine_type = machine_type.title()
-        machine_type = urllib.parse.quote_plus(machine_type)
+        method_x = {
+            "ultimaker_method":"MakerBot Method",
+            "ultimaker_methodx":"MakerBot Method X",
+            "ultimaker_methodxl":"MakerBot Method XL"
+        }
+        if machine_type in method_x:
+            machine_type = method_x[machine_type]
+        else:
+            machine_type = machine_type.replace("_plus", "+")
+            machine_type = machine_type.replace("_", " ")
+            machine_type = machine_type.replace("ultimaker", "ultimaker ")
+            machine_type = machine_type.replace("  ", " ")
+            machine_type = machine_type.title()
+            machine_type = urllib.parse.quote_plus(machine_type)
         url = f"{self.CLUSTER_API_ROOT}/clusters?machine_variant={machine_type}"
         self._http.get(url,
                        scope=self._scope,

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -58,6 +58,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
 
     # The minimum version of firmware that support print job actions over cloud.
     PRINT_JOB_ACTIONS_MIN_VERSION = Version("5.2.12")
+    PRINT_JOB_ACTIONS_MIN_VERSION_METHOD = Version("2.700")
 
     # Notify can only use signals that are defined by the class that they are in, not inherited ones.
     # Therefore, we create a private signal used to trigger the printersChanged signal.
@@ -325,8 +326,13 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
         if not self._printers:
             return False
         version_number = self.printers[0].firmwareVersion.split(".")
-        firmware_version = Version([version_number[0], version_number[1], version_number[2]])
-        return firmware_version >= self.PRINT_JOB_ACTIONS_MIN_VERSION
+        if len(version_number)> 2:
+            firmware_version = Version([version_number[0], version_number[1], version_number[2]])
+            return firmware_version >= self.PRINT_JOB_ACTIONS_MIN_VERSION
+        else:
+            firmware_version = Version([version_number[0], version_number[1]])
+            return firmware_version >= self.PRINT_JOB_ACTIONS_MIN_VERSION_METHOD
+
 
     @pyqtProperty(bool, constant = True)
     def supportsPrintJobQueue(self) -> bool:

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py

@@ -9,6 +9,7 @@ from PyQt6.QtWidgets import QMessageBox
 
 from UM import i18nCatalog
 from UM.Logger import Logger  # To log errors talking to the API.
+from UM.Message import Message
 from UM.Settings.Interfaces import ContainerInterface
 from UM.Signal import Signal
 from UM.Util import parseBool
@@ -25,7 +26,7 @@ from .CloudOutputDevice import CloudOutputDevice
 from ..Messages.RemovedPrintersMessage import RemovedPrintersMessage
 from ..Models.Http.CloudClusterResponse import CloudClusterResponse
 from ..Messages.NewPrinterDetectedMessage import NewPrinterDetectedMessage
-
+catalog = i18nCatalog("cura")
 
 class CloudOutputDeviceManager:
     """The cloud output device manager is responsible for using the Ultimaker Cloud APIs to manage remote clusters.
@@ -179,6 +180,13 @@ class CloudOutputDeviceManager:
                 return
         Logger.log("e", f"Failed writing to specific cloud printer: {unique_id} not in remote clusters.")
 
+        # This message is added so that user knows when the print job was not sent to cloud printer
+        message = Message(catalog.i18nc("@info:status",
+                                    "Failed writing to specific cloud printer: {0} not in remote clusters.").format(unique_id),
+                      title=catalog.i18nc("@info:title", "Error"),
+                      message_type=Message.MessageType.ERROR)
+        message.show()
+
     def _createMachineStacksForDiscoveredClusters(self, discovered_clusters: List[CloudClusterResponse]) -> None:
         """**Synchronously** create machines for discovered devices
 

plugins/UM3NetworkPrinting/src/MeshFormatHandler.py

@@ -106,6 +106,10 @@ class MeshFormatHandler:
         if "application/x-ufp" not in machine_file_formats and Version(firmware_version) >= Version("4.4"):
             machine_file_formats = ["application/x-ufp"] + machine_file_formats
 
+        # Exception for makerbot firmware version >=2.700: makerbot is supported
+        elif "application/x-makerbot" not in machine_file_formats and Version(firmware_version >= Version("2.700")):
+            machine_file_formats = ["application/x-makerbot"] + machine_file_formats
+
         # Take the intersection between file_formats and machine_file_formats.
         format_by_mimetype = {f["mime_type"]: f for f in file_formats}
 

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

@@ -2,6 +2,7 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 from typing import Optional, List
 
+from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice
 from ..BaseModel import BaseModel
 
 
@@ -34,7 +35,7 @@ class CloudClusterResponse(BaseModel):
         self.host_version = host_version
         self.host_internal_ip = host_internal_ip
         self.friendly_name = friendly_name
-        self.printer_type = printer_type
+        self.printer_type = NetworkedPrinterOutputDevice.applyPrinterTypeMapping(printer_type)
         self.printer_count = printer_count
         self.capabilities = capabilities if capabilities is not None else []
         super().__init__(**kwargs)
@@ -51,3 +52,4 @@ class CloudClusterResponse(BaseModel):
         :return: A human-readable representation of the data in this object.
         """
         return str({k: v for k, v in self.__dict__.items() if k in {"cluster_id", "host_guid", "host_name", "status", "is_online", "host_version", "host_internal_ip", "friendly_name", "printer_type", "printer_count", "capabilities"}})
+

plugins/VersionUpgrade/VersionUpgrade54to55/VersionUpgrade54to55.py

@@ -11,7 +11,7 @@ import re
 
 class VersionUpgrade54to55(VersionUpgrade):
     profile_regex = re.compile(
-        r"um\_(?P<machine>s(3|5|7))_(?P<core_type>aa|cc|bb)(?P<nozzle_size>0\.(6|4|8))_(?P<material>pla|petg|abs|cpe|cpe_plus|nylon|pc|petcf|tough_pla|tpu)_(?P<layer_height>0\.\d{1,2}mm)")
+        r"um\_(?P<machine>s(3|5|7))_(?P<core_type>aa|cc|bb)(?P<nozzle_size>0\.(6|4|8))_(?P<material>pla|petg|abs|tough_pla)_(?P<layer_height>0\.\d{1,2}mm)")
 
     @staticmethod
     def _isUpgradedUltimakerDefinitionId(definition_id: str) -> bool:

resources/bundled_packages/cura.json

@@ -6,7 +6,7 @@
             "display_name": "3MF Reader",
             "description": "Provides support for reading 3MF files.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -23,7 +23,7 @@
             "display_name": "3MF Writer",
             "description": "Provides support for writing 3MF files.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -40,7 +40,7 @@
             "display_name": "AMF Reader",
             "description": "Provides support for reading AMF files.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "fieldOfView",
@@ -57,7 +57,7 @@
             "display_name": "Cura Backups",
             "description": "Backup and restore your configuration.",
             "package_version": "1.2.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -74,7 +74,7 @@
             "display_name": "CuraEngine Backend",
             "description": "Provides the link to the CuraEngine slicing backend.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -91,7 +91,7 @@
             "display_name": "Cura Profile Reader",
             "description": "Provides support for importing Cura profiles.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -108,7 +108,7 @@
             "display_name": "Cura Profile Writer",
             "description": "Provides support for exporting Cura profiles.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -125,7 +125,7 @@
             "display_name": "Ultimaker Digital Library",
             "description": "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library.",
             "package_version": "1.1.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -142,7 +142,7 @@
             "display_name": "Firmware Update Checker",
             "description": "Checks for firmware updates.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -159,7 +159,7 @@
             "display_name": "Firmware Updater",
             "description": "Provides a machine actions for updating firmware.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -176,7 +176,7 @@
             "display_name": "Compressed G-code Reader",
             "description": "Reads g-code from a compressed archive.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -193,7 +193,7 @@
             "display_name": "Compressed G-code Writer",
             "description": "Writes g-code to a compressed archive.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -210,7 +210,7 @@
             "display_name": "G-Code Profile Reader",
             "description": "Provides support for importing profiles from g-code files.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -227,7 +227,7 @@
             "display_name": "G-Code Reader",
             "description": "Allows loading and displaying G-code files.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "VictorLarchenko",
@@ -244,7 +244,7 @@
             "display_name": "G-Code Writer",
             "description": "Writes g-code to a file.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -261,7 +261,7 @@
             "display_name": "Image Reader",
             "description": "Enables ability to generate printable geometry from 2D image files.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -278,7 +278,7 @@
             "display_name": "Legacy Cura Profile Reader",
             "description": "Provides support for importing profiles from legacy Cura versions.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -295,7 +295,7 @@
             "display_name": "Machine Settings Action",
             "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "fieldOfView",
@@ -305,6 +305,23 @@
             }
         }
     },
+    "MakerbotWriter": {
+        "package_info": {
+            "package_id": "MakerbotWriter",
+            "package_type": "plugin",
+            "display_name": "Makerbot Printfile Writer",
+            "description": "Provides support for writing MakerBot Format Packages.",
+            "package_version": "1.0.1",
+            "sdk_version": "8.5.0",
+            "website": "https://ultimaker.com",
+            "author": {
+                "author_id": "UltimakerPackages",
+                "display_name": "UltiMaker",
+                "email": "plugins@ultimaker.com",
+                "website": "https://ultimaker.com"
+            }
+        }
+    },
     "ModelChecker": {
         "package_info": {
             "package_id": "ModelChecker",
@@ -312,7 +329,7 @@
             "display_name": "Model Checker",
             "description": "Checks models and print configuration for possible printing issues and give suggestions.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -329,7 +346,7 @@
             "display_name": "Monitor Stage",
             "description": "Provides a monitor stage in Cura.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -346,7 +363,7 @@
             "display_name": "Per-Object Settings Tool",
             "description": "Provides the per-model settings.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -363,7 +380,7 @@
             "display_name": "Post Processing",
             "description": "Extension that allows for user created scripts for post processing.",
             "package_version": "2.2.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -380,7 +397,7 @@
             "display_name": "Prepare Stage",
             "description": "Provides a prepare stage in Cura.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -397,7 +414,7 @@
             "display_name": "Preview Stage",
             "description": "Provides a preview stage in Cura.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -414,7 +431,7 @@
             "display_name": "Removable Drive Output Device",
             "description": "Provides removable drive hotplugging and writing support.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -431,7 +448,7 @@
             "display_name": "Sentry Logger",
             "description": "Logs certain events so that they can be used by the crash reporter",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -448,7 +465,7 @@
             "display_name": "Simulation View",
             "description": "Provides the Simulation view.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -465,7 +482,7 @@
             "display_name": "Slice Info",
             "description": "Submits anonymous slice info. Can be disabled through preferences.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -482,7 +499,7 @@
             "display_name": "Solid View",
             "description": "Provides a normal solid mesh view.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -499,7 +516,7 @@
             "display_name": "Support Eraser Tool",
             "description": "Creates an eraser mesh to block the printing of support in certain places.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -516,7 +533,7 @@
             "display_name": "Trimesh Reader",
             "description": "Provides support for reading model files.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -533,7 +550,7 @@
             "display_name": "Marketplace",
             "description": "Find, manage and install new Cura packages.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -550,7 +567,7 @@
             "display_name": "UFP Reader",
             "description": "Provides support for reading Ultimaker Format Packages.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -567,7 +584,7 @@
             "display_name": "UFP Writer",
             "description": "Provides support for writing Ultimaker Format Packages.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -584,7 +601,7 @@
             "display_name": "Ultimaker Machine Actions",
             "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -601,7 +618,7 @@
             "display_name": "UM3 Network Printing",
             "description": "Manages network connections to Ultimaker 3 printers.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -618,7 +635,7 @@
             "display_name": "USB Printing",
             "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.",
             "package_version": "1.0.2",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -635,7 +652,7 @@
             "display_name": "Version Upgrade 2.1 to 2.2",
             "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -652,7 +669,7 @@
             "display_name": "Version Upgrade 2.2 to 2.4",
             "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -669,7 +686,7 @@
             "display_name": "Version Upgrade 2.5 to 2.6",
             "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -686,7 +703,7 @@
             "display_name": "Version Upgrade 2.6 to 2.7",
             "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -703,7 +720,7 @@
             "display_name": "Version Upgrade 2.7 to 3.0",
             "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -720,7 +737,7 @@
             "display_name": "Version Upgrade 3.0 to 3.1",
             "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -737,7 +754,7 @@
             "display_name": "Version Upgrade 3.2 to 3.3",
             "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -754,7 +771,7 @@
             "display_name": "Version Upgrade 3.3 to 3.4",
             "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -771,7 +788,7 @@
             "display_name": "Version Upgrade 3.4 to 3.5",
             "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -788,7 +805,7 @@
             "display_name": "Version Upgrade 3.5 to 4.0",
             "description": "Upgrades configurations from Cura 3.5 to Cura 4.0.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -805,7 +822,7 @@
             "display_name": "Version Upgrade 4.0 to 4.1",
             "description": "Upgrades configurations from Cura 4.0 to Cura 4.1.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -822,7 +839,7 @@
             "display_name": "Version Upgrade 4.1 to 4.2",
             "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -839,7 +856,7 @@
             "display_name": "Version Upgrade 4.2 to 4.3",
             "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -856,7 +873,7 @@
             "display_name": "Version Upgrade 4.3 to 4.4",
             "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -873,7 +890,7 @@
             "display_name": "Version Upgrade 4.4 to 4.5",
             "description": "Upgrades configurations from Cura 4.4 to Cura 4.5.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -890,7 +907,7 @@
             "display_name": "Version Upgrade 4.5 to 4.6",
             "description": "Upgrades configurations from Cura 4.5 to Cura 4.6.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -907,7 +924,7 @@
             "display_name": "Version Upgrade 4.6.0 to 4.6.2",
             "description": "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -924,7 +941,7 @@
             "display_name": "Version Upgrade 4.6.2 to 4.7",
             "description": "Upgrades configurations from Cura 4.6.2 to Cura 4.7.",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -941,7 +958,7 @@
             "display_name": "Version Upgrade 4.7.0 to 4.8.0",
             "description": "Upgrades configurations from Cura 4.7.0 to Cura 4.8.0",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -958,7 +975,7 @@
             "display_name": "Version Upgrade 4.8.0 to 4.9.0",
             "description": "Upgrades configurations from Cura 4.8.0 to Cura 4.9.0",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -975,7 +992,7 @@
             "display_name": "Version Upgrade 4.9 to 4.10",
             "description": "Upgrades configurations from Cura 4.9 to Cura 4.10",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -992,7 +1009,7 @@
             "display_name": "Version Upgrade 4.11 to 4.12",
             "description": "Upgrades configurations from Cura 4.11 to Cura 4.12",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "sdk_version_semver": "7.7.0",
             "website": "https://ultimaker.com",
             "author": {
@@ -1010,7 +1027,7 @@
             "display_name": "Version Upgrade 4.13 to 5.0",
             "description": "Upgrades configurations from Cura 4.13 to Cura 5.0",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1027,7 +1044,7 @@
             "display_name": "Version Upgrade 5.2 to 5.3",
             "description": "Upgrades configurations from Cura 5.2 to Cura 5.3",
             "package_version": "1.0.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1044,7 +1061,7 @@
             "display_name": "X3D Reader",
             "description": "Provides support for reading X3D files.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "SevaAlekseyev",
@@ -1061,7 +1078,7 @@
             "display_name": "XML Material Profiles",
             "description": "Provides capabilities to read and write XML-based material profiles.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1078,7 +1095,7 @@
             "display_name": "X-Ray View",
             "description": "Provides the X-Ray view.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1095,7 +1112,7 @@
             "display_name": "Generic ABS",
             "description": "The generic ABS profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1113,7 +1130,7 @@
             "display_name": "Generic BAM",
             "description": "The generic BAM profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1131,7 +1148,7 @@
             "display_name": "Generic CFF CPE",
             "description": "The generic CFF CPE profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1149,7 +1166,7 @@
             "display_name": "Generic CFF PA",
             "description": "The generic CFF PA profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1167,7 +1184,7 @@
             "display_name": "Generic CPE",
             "description": "The generic CPE profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1185,7 +1202,7 @@
             "display_name": "Generic CPE+",
             "description": "The generic CPE+ profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1203,7 +1220,7 @@
             "display_name": "Generic GFF CPE",
             "description": "The generic GFF CPE profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1221,7 +1238,7 @@
             "display_name": "Generic GFF PA",
             "description": "The generic GFF PA profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1239,7 +1256,7 @@
             "display_name": "Generic HIPS",
             "description": "The generic HIPS profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1257,7 +1274,7 @@
             "display_name": "Generic Nylon",
             "description": "The generic Nylon profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1275,7 +1292,7 @@
             "display_name": "Generic PC",
             "description": "The generic PC profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1293,7 +1310,7 @@
             "display_name": "Generic PETG",
             "description": "The generic PETG profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1311,7 +1328,7 @@
             "display_name": "Generic PLA",
             "description": "The generic PLA profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1329,7 +1346,7 @@
             "display_name": "Generic PP",
             "description": "The generic PP profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1347,7 +1364,7 @@
             "display_name": "Generic PVA",
             "description": "The generic PVA profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1365,7 +1382,7 @@
             "display_name": "Generic Tough PLA",
             "description": "The generic Tough PLA profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1383,7 +1400,7 @@
             "display_name": "Generic TPU",
             "description": "The generic TPU profile which other profiles can be based upon.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://github.com/Ultimaker/fdm_materials",
             "author": {
                 "author_id": "Generic",
@@ -1401,7 +1418,7 @@
             "display_name": "Dagoma Chromatik PLA",
             "description": "Filament testé et approuvé pour les imprimantes 3D Dagoma. Chromatik est l'idéal pour débuter et suivre les tutoriels premiers pas. Il vous offre qualité et résistance pour chacune de vos impressions.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://dagoma.fr/boutique/filaments.html",
             "author": {
                 "author_id": "Dagoma",
@@ -1418,7 +1435,7 @@
             "display_name": "FABtotum ABS",
             "description": "This material is easy to be extruded but it is not the simplest to use. It is one of the most used in 3D printing to get very well finished objects. It is not sustainable and its smoke can be dangerous if inhaled. The reason to prefer this filament to PLA is mainly because of its precision and mechanical specs. ABS (for plastic) stands for Acrylonitrile Butadiene Styrene and it is a thermoplastic which is widely used in everyday objects. It can be printed with any FFF 3D printer which can get to high temperatures as it must be extruded in a range between 220° and 245°, so it’s compatible with all versions of the FABtotum Personal fabricator.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=40",
             "author": {
                 "author_id": "FABtotum",
@@ -1435,7 +1452,7 @@
             "display_name": "FABtotum Nylon",
             "description": "When 3D printing started this material was not listed among the extrudable filaments. It is flexible as well as resistant to tractions. It is well known for its uses in textile but also in industries which require a strong and flexible material. There are different kinds of Nylon: 3D printing mostly uses Nylon 6 and Nylon 6.6, which are the most common. It requires higher temperatures to be printed, so a 3D printer must be able to reach them (around 240°C): the FABtotum, of course, can.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=53",
             "author": {
                 "author_id": "FABtotum",
@@ -1452,7 +1469,7 @@
             "display_name": "FABtotum PLA",
             "description": "It is the most common filament used for 3D printing. It is studied to be bio-degradable as it comes from corn starch’s sugar mainly. It is completely made of renewable sources and has no footprint on polluting. PLA stands for PolyLactic Acid and it is a thermoplastic that today is still considered the easiest material to be 3D printed. It can be extruded at lower temperatures: the standard range of FABtotum’s one is between 185° and 195°.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=39",
             "author": {
                 "author_id": "FABtotum",
@@ -1469,7 +1486,7 @@
             "display_name": "FABtotum TPU Shore 98A",
             "description": "",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=66",
             "author": {
                 "author_id": "FABtotum",
@@ -1486,7 +1503,7 @@
             "display_name": "Fiberlogy HD PLA",
             "description": "With our HD PLA you have many more options. You can use this material in two ways. Choose the one you like best. You can use it as a normal PLA and get prints characterized by a very good adhesion between the layers and high precision. You can also make your prints acquire similar properties to that of ABS – better impact resistance and high temperature resistance. All you need is an oven. Yes, an oven! By annealing our HD PLA in an oven, in accordance with the manual, you will avoid all the inconveniences of printing with ABS, such as unpleasant odour or hazardous fumes.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "http://fiberlogy.com/en/fiberlogy-filaments/filament-hd-pla/",
             "author": {
                 "author_id": "Fiberlogy",
@@ -1503,7 +1520,7 @@
             "display_name": "Filo3D PLA",
             "description": "Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://dagoma.fr",
             "author": {
                 "author_id": "Dagoma",
@@ -1520,7 +1537,7 @@
             "display_name": "IMADE3D JellyBOX PETG",
             "description": "",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "http://shop.imade3d.com/filament.html",
             "author": {
                 "author_id": "IMADE3D",
@@ -1537,7 +1554,7 @@
             "display_name": "IMADE3D JellyBOX PLA",
             "description": "",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "http://shop.imade3d.com/filament.html",
             "author": {
                 "author_id": "IMADE3D",
@@ -1554,7 +1571,7 @@
             "display_name": "Octofiber PLA",
             "description": "PLA material from Octofiber.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://nl.octofiber.com/3d-printing-filament/pla.html",
             "author": {
                 "author_id": "Octofiber",
@@ -1571,7 +1588,7 @@
             "display_name": "PolyFlex™ PLA",
             "description": "PolyFlex™ is a highly flexible yet easy to print 3D printing material. Featuring good elasticity and a large strain-to- failure, PolyFlex™ opens up a completely new realm of applications.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "http://www.polymaker.com/shop/polyflex/",
             "author": {
                 "author_id": "Polymaker",
@@ -1588,7 +1605,7 @@
             "display_name": "PolyMax™ PLA",
             "description": "PolyMax™ PLA is a 3D printing material with excellent mechanical properties and printing quality. PolyMax™ PLA has an impact resistance of up to nine times that of regular PLA, and better overall mechanical properties than ABS.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "http://www.polymaker.com/shop/polymax/",
             "author": {
                 "author_id": "Polymaker",
@@ -1605,7 +1622,7 @@
             "display_name": "PolyPlus™ PLA True Colour",
             "description": "PolyPlus™ PLA is a premium PLA designed for all desktop FDM/FFF 3D printers. It is produced with our patented Jam-Free™ technology that ensures consistent extrusion and prevents jams.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "http://www.polymaker.com/shop/polyplus-true-colour/",
             "author": {
                 "author_id": "Polymaker",
@@ -1622,7 +1639,7 @@
             "display_name": "PolyWood™ PLA",
             "description": "PolyWood™ is a wood mimic printing material that contains no actual wood ensuring a clean Jam-Free™ printing experience.",
             "package_version": "1.0.1",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "http://www.polymaker.com/shop/polywood/",
             "author": {
                 "author_id": "Polymaker",
@@ -1639,7 +1656,7 @@
             "display_name": "Ultimaker ABS",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1658,7 +1675,7 @@
             "display_name": "Ultimaker Breakaway",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/breakaway",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1677,7 +1694,7 @@
             "display_name": "Ultimaker CPE",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1696,7 +1713,7 @@
             "display_name": "Ultimaker CPE+",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/cpe",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1715,7 +1732,7 @@
             "display_name": "Ultimaker Nylon",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1734,7 +1751,7 @@
             "display_name": "Ultimaker PC",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/pc",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1753,7 +1770,7 @@
             "display_name": "Ultimaker PLA",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1772,7 +1789,7 @@
             "display_name": "Ultimaker PP",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/pp",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1791,7 +1808,7 @@
             "display_name": "Ultimaker PVA",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/abs",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1810,7 +1827,7 @@
             "display_name": "Ultimaker TPU 95A",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/tpu-95a",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1829,7 +1846,7 @@
             "display_name": "Ultimaker Tough PLA",
             "description": "Example package for material and quality profiles for Ultimaker materials.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://ultimaker.com/products/materials/tough-pla",
             "author": {
                 "author_id": "UltimakerPackages",
@@ -1848,7 +1865,7 @@
             "display_name": "Vertex Delta ABS",
             "description": "ABS material and quality files for the Delta Vertex K8800.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://vertex3dprinter.eu",
             "author": {
                 "author_id": "Velleman",
@@ -1865,7 +1882,7 @@
             "display_name": "Vertex Delta PET",
             "description": "ABS material and quality files for the Delta Vertex K8800.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://vertex3dprinter.eu",
             "author": {
                 "author_id": "Velleman",
@@ -1882,7 +1899,7 @@
             "display_name": "Vertex Delta PLA",
             "description": "ABS material and quality files for the Delta Vertex K8800.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://vertex3dprinter.eu",
             "author": {
                 "author_id": "Velleman",
@@ -1899,7 +1916,7 @@
             "display_name": "Vertex Delta TPU",
             "description": "ABS material and quality files for the Delta Vertex K8800.",
             "package_version": "1.4.0",
-            "sdk_version": "8.4.0",
+            "sdk_version": "8.5.0",
             "website": "https://vertex3dprinter.eu",
             "author": {
                 "author_id": "Velleman",

resources/definitions/Mark2_for_Ultimaker2.def.json

@@ -137,8 +137,6 @@
         "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" },

resources/definitions/SV02.def.json

@@ -60,8 +60,6 @@
         "material_diameter": { "default_value": 1.75 },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "prime_tower_min_volume": { "value": "((resolveOrValue('layer_height'))/2" },
-        "prime_tower_position_x": { "value": "240" },
-        "prime_tower_position_y": { "value": "190" },
         "prime_tower_size": { "value": "30" },
         "prime_tower_wipe_enabled": { "default_value": true },
         "retraction_amount": { "default_value": 5 },

resources/definitions/atmat_signal_pro_base.def.json

@@ -111,8 +111,6 @@
         "minimum_polygon_circumference": { "value": "0.2" },
         "optimize_wall_printing_order": { "value": "True" },
         "prime_tower_enable": { "value": "True" },
-        "prime_tower_position_x": { "value": "270" },
-        "prime_tower_position_y": { "value": "270" },
         "retraction_amount": { "value": "1" },
         "retraction_combing": { "value": "'noskin'" },
         "retraction_combing_max_distance": { "value": "10" },

resources/definitions/bibo2_dual.def.json

@@ -41,8 +41,6 @@
         "machine_start_gcode": { "default_value": "M104 T0 165\nM104 T1 165\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 2mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nT{initial_extruder_nr}\nM117 BIBO Printing..." },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": true },
         "machine_width": { "default_value": 214 },
-        "prime_tower_position_x": { "value": "50" },
-        "prime_tower_position_y": { "value": "50" },
         "speed_print": { "default_value": 40 }
     }
 }

resources/definitions/builder_premium_large.def.json

@@ -81,8 +81,6 @@
         "material_standby_temperature": { "value": "material_print_temperature" },
         "prime_blob_enable": { "enabled": true },
         "prime_tower_min_volume": { "default_value": 50 },
-        "prime_tower_position_x": { "value": "175" },
-        "prime_tower_position_y": { "value": "178" },
         "prime_tower_wipe_enabled": { "default_value": false },
         "retraction_amount": { "default_value": 3 },
         "retraction_speed": { "default_value": 15 },

resources/definitions/builder_premium_medium.def.json

@@ -81,8 +81,6 @@
         "material_standby_temperature": { "value": "material_print_temperature" },
         "prime_blob_enable": { "enabled": true },
         "prime_tower_min_volume": { "default_value": 50 },
-        "prime_tower_position_x": { "value": "175" },
-        "prime_tower_position_y": { "value": "178" },
         "prime_tower_wipe_enabled": { "default_value": false },
         "retraction_amount": { "default_value": 3 },
         "retraction_speed": { "default_value": 15 },

resources/definitions/builder_premium_small.def.json

@@ -80,8 +80,6 @@
         "material_standby_temperature": { "value": "material_print_temperature" },
         "prime_blob_enable": { "enabled": true },
         "prime_tower_min_volume": { "default_value": 50 },
-        "prime_tower_position_x": { "value": "175" },
-        "prime_tower_position_y": { "value": "178" },
         "prime_tower_wipe_enabled": { "default_value": false },
         "retraction_amount": { "default_value": 3 },
         "retraction_speed": { "default_value": 15 },

resources/definitions/cartesio.def.json

@@ -66,8 +66,6 @@
         "optimize_wall_printing_order": { "default_value": true },
         "prime_blob_enable": { "default_value": false },
         "prime_tower_min_volume": { "value": "0.7" },
-        "prime_tower_position_x": { "value": "125" },
-        "prime_tower_position_y": { "value": "70" },
         "prime_tower_size": { "value": 24.0 },
         "retraction_extra_prime_amount": { "minimum_value_warning": "-2.0" }
     }

resources/definitions/creality_ender3v3se.def.json

@@ -0,0 +1,52 @@
+{
+    "version": 2,
+    "name": "Creality Ender-3 V3 SE",
+    "inherits": "creality_base",
+    "metadata":
+    {
+        "visible": true,
+        "manufacturer": "Creality3D",
+        "file_formats": "text/x-gcode",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains": { "0": "creality_base_extruder_0" },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle",
+        "quality_definition": "creality_base",
+        "variants_name": "Nozzle Size"
+    },
+    "overrides":
+    {
+        "gantry_height": { "value": 25 },
+        "machine_depth": { "default_value": 220 },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-20, 10],
+                [10, 10],
+                [10, -10],
+                [-20, -10]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 250 },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 5000.0 },
+        "machine_max_acceleration_y": { "value": 5000.0 },
+        "machine_max_acceleration_z": { "value": 500.0 },
+        "machine_max_feedrate_e": { "value": 100 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 30 },
+        "machine_name": { "default_value": "Creality Ender-3 V3 SE" },
+        "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nM420 S1; Enable mesh 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\nM109 S[material_print_temperature_layer_0]\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y145.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 E-1.0000 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0.0000 F1800 \n" },
+        "machine_width": { "default_value": 220 },
+        "retraction_amount": { "value": 0.8 },
+        "retraction_speed": { "default_value": 40 },
+        "speed_layer_0": { "value": 30 },
+        "speed_print": { "value": 180 }
+    }
+}

resources/definitions/deltacomb_base.def.json

@@ -55,8 +55,6 @@
         "machine_shape": { "default_value": "elliptic" },
         "machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nM420 S1; Bed Level Enable\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 In stampa...\nM140 S{print_bed_temperature} ;set the target bed temperature\n;---------------------------------------" },
         "prime_tower_brim_enable": { "value": false },
-        "prime_tower_position_x": { "value": "prime_tower_size / 2" },
-        "prime_tower_position_y": { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" },
         "prime_tower_size": { "value": "math.sqrt(extruders_enabled_count * prime_tower_min_volume / layer_height / math.pi) * 2" },
         "retraction_amount": { "default_value": 3.5 },
         "retraction_combing": { "value": "'noskin'" },

resources/definitions/dxu.def.json

@@ -131,8 +131,6 @@
         "machine_width": { "default_value": 238 },
         "material_adhesion_tendency": { "enabled": true },
         "material_diameter": { "default_value": 1.75 },
-        "prime_tower_position_x": { "value": "180" },
-        "prime_tower_position_y": { "value": "160" },
         "retraction_amount": { "default_value": 6.5 },
         "retraction_speed": { "default_value": 25 },
         "speed_support": { "value": "speed_wall_0" },