From 3136dfc0ec1d6dcef35825573f5a888e1119bfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20J=C3=A4ger?= Date: Fri, 9 Aug 2024 18:13:01 +0200 Subject: [PATCH 01/35] Process M82 and M83 command for Marlin flavoured GCode too --- plugins/GCodeReader/FlavorParser.py | 10 ++++++++-- plugins/GCodeReader/RepRapFlavorParser.py | 8 -------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index 372ee83135..74dbeadec0 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -298,8 +298,14 @@ class FlavorParser: position.e.extend([0] * (self._extruder_number - len(position.e) + 1)) return position - def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> Position: - pass + def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> None: + # Set extrusion mode + if M == 82: + # Set absolute extrusion mode + self._is_absolute_extrusion = True + elif M == 83: + # Set relative extrusion mode + self._is_absolute_extrusion = False _type_keyword = ";TYPE:" _layer_keyword = ";LAYER:" diff --git a/plugins/GCodeReader/RepRapFlavorParser.py b/plugins/GCodeReader/RepRapFlavorParser.py index 10b7b78587..1a80412238 100644 --- a/plugins/GCodeReader/RepRapFlavorParser.py +++ b/plugins/GCodeReader/RepRapFlavorParser.py @@ -11,14 +11,6 @@ class RepRapFlavorParser(FlavorParser.FlavorParser): def __init__(self): super().__init__() - def processMCode(self, M, line, position, path): - if M == 82: - # Set absolute extrusion mode - self._is_absolute_extrusion = True - elif M == 83: - # Set relative extrusion mode - self._is_absolute_extrusion = False - def _gCode90(self, position, params, path): """Set the absolute positioning From c6a2ccec1e82b566451fb55e78835a5015adade4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 08:27:11 +0100 Subject: [PATCH 02/35] Remove duplicated keychain entry. part of CURA-11622 --- conandata.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conandata.yml b/conandata.yml index 910a7fa0f4..997bac3365 100644 --- a/conandata.yml +++ b/conandata.yml @@ -275,11 +275,6 @@ pip_requirements_core: hashes: - sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4 - sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6 - keyring: - version: "23.0.1" - hashes: - - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 trimesh: version: "3.9.36" hashes: From 23cc0b4d01e1b635c0d2ca87f386067b7f780153 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 08:27:43 +0100 Subject: [PATCH 03/35] Hopefully all of the hidden imports are OK now for keyring. part of CURA-11622 --- conandata.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conandata.yml b/conandata.yml index 997bac3365..7b61e16ac3 100644 --- a/conandata.yml +++ b/conandata.yml @@ -107,7 +107,16 @@ pyinstaller: - "fcntl" - "stl" - "serial" + - "win32cred" - "win32timezone" + - "win32ctypes.core.ctypes" + - "win32ctypes.core.ctypes._common" + - "win32ctypes.core.ctypes._dll" + - "win32ctypes.core.ctypes._resource" + - "win32ctypes.core.ctypes._system_information" + - "win32ctypes.core.ctypes._time" + - "win32ctypes.core.ctypes._authentication" + - "pkgutil" collect_all: - "cura" - "UM" @@ -119,6 +128,7 @@ pyinstaller: - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" + - "keyrings.alt" icon: Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" From ef02ab543e998d0544022af076e09ccf3e0152e3 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 09:25:49 +0100 Subject: [PATCH 04/35] Try if we can get rid of this workaround. done part of CURA-11622 --- cura/OAuth2/KeyringAttribute.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cura/OAuth2/KeyringAttribute.py b/cura/OAuth2/KeyringAttribute.py index 58b45a67ef..adaa01621c 100644 --- a/cura/OAuth2/KeyringAttribute.py +++ b/cura/OAuth2/KeyringAttribute.py @@ -16,8 +16,6 @@ if TYPE_CHECKING: import sys from UM.Platform import Platform if Platform.isWindows(): - if hasattr(sys, "frozen"): - import win32timezone from keyring.backends.Windows import WinVaultKeyring keyring.set_keyring(WinVaultKeyring()) if Platform.isOSX(): From e2c3dd62ce6b90a92306b293f66943bcd793cb61 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 13:16:29 +0100 Subject: [PATCH 05/35] Try to fix that not all pyqt dynamic libs are in the win-install. part of CURA-11622 --- conandata.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conandata.yml b/conandata.yml index 7b61e16ac3..c125ed5082 100644 --- a/conandata.yml +++ b/conandata.yml @@ -125,6 +125,7 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" + - "PyQt6" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From 89287f829d4c580e407e4a97f06ff46290c9f5fc Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 14:33:16 +0100 Subject: [PATCH 06/35] (win-install) That pulled in too much pyqt, try more fine-grained. part of CURA-11622 --- conandata.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index c125ed5082..c4474fe032 100644 --- a/conandata.yml +++ b/conandata.yml @@ -100,6 +100,15 @@ pyinstaller: - "pyDulcificum" - "pynest2d" - "PyQt6" + - "PyQt6.QtQml" + - "PyQt6.QtQuick" + - "PyQt6.QtQuick.Widgets" + - "PyQt6.QtQuick.Controls" + - "PyQt6.QtQuick.Dialogs" + - "PyQt6.QtQuick.Layouts" + - "PyQt6.QtWidgets" + - "PyQt6.QtDBus" + - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -125,7 +134,15 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" - - "PyQt6" + - "PyQt6.QtQml" + - "PyQt6.QtQuick" + - "PyQt6.QtQuick.Widgets" + - "PyQt6.QtQuick.Controls" + - "PyQt6.QtQuick.Dialogs" + - "PyQt6.QtQuick.Layouts" + - "PyQt6.QtWidgets" + - "PyQt6.QtDBus" + - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From 5e59458893fc46cbdeb64c8a8e4cddb595196759 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 16:35:28 +0100 Subject: [PATCH 07/35] More needed PyQt for Windows? part of CURA-11622 --- conandata.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conandata.yml b/conandata.yml index c4474fe032..4426ffa3bc 100644 --- a/conandata.yml +++ b/conandata.yml @@ -100,6 +100,8 @@ pyinstaller: - "pyDulcificum" - "pynest2d" - "PyQt6" + - "PyQt6.Qt" + - "PyQt6.Qt6" - "PyQt6.QtQml" - "PyQt6.QtQuick" - "PyQt6.QtQuick.Widgets" @@ -134,6 +136,8 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" + - "PyQt6.Qt" + - "PyQt6.Qt6" - "PyQt6.QtQml" - "PyQt6.QtQuick" - "PyQt6.QtQuick.Widgets" From 55f59b79712d4897bf1d459d68ac4313efc736b1 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 17:30:27 +0100 Subject: [PATCH 08/35] Better rid of 'forbidden modules' and related folders. part of CURA-11622 --- conandata.yml | 2 +- conanfile.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 4426ffa3bc..13bd7a7492 100644 --- a/conandata.yml +++ b/conandata.yml @@ -163,7 +163,7 @@ pyinstaller: - [ "qt", "lab", "animat" ] - [ "qt", "mqtt" ] - [ "qt", "net", "auth" ] - - [ "qt", "quick3d" ] + - [ "quick3d" ] - [ "qt", "timeline" ] - [ "qt", "virt", "key" ] - [ "qt", "wayland", "compos" ] diff --git a/conanfile.py b/conanfile.py index 5501b189a1..fa15577126 100644 --- a/conanfile.py +++ b/conanfile.py @@ -179,6 +179,7 @@ class CuraConan(ConanFile): "qtmqtt", "qtnetworkauth", "qtquick3d", + "quick3d", "qtquick3dphysics", "qtquicktimeline", "qtvirtualkeyboard", @@ -207,7 +208,7 @@ class CuraConan(ConanFile): to_remove_files.append(pathname) for dirname in dir_: for forbidden in prohibited: - if forbidden.lower() == str(dirname).lower(): + if forbidden.lower() in str(dirname).lower(): pathname = os.path.join(root, dirname) to_remove_dirs.append(pathname) break From cc93e8c8664be5b16a581b83105ba3b988c99b1c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 19:58:56 +0100 Subject: [PATCH 09/35] Prune included binaries. Hopefully get rid of Qt Quick 3D (as opposed to Qt Quick). part of CURA-11622 --- conandata.yml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/conandata.yml b/conandata.yml index 13bd7a7492..832670d43e 100644 --- a/conandata.yml +++ b/conandata.yml @@ -103,14 +103,6 @@ pyinstaller: - "PyQt6.Qt" - "PyQt6.Qt6" - "PyQt6.QtQml" - - "PyQt6.QtQuick" - - "PyQt6.QtQuick.Widgets" - - "PyQt6.QtQuick.Controls" - - "PyQt6.QtQuick.Dialogs" - - "PyQt6.QtQuick.Layouts" - - "PyQt6.QtWidgets" - - "PyQt6.QtDBus" - - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -120,13 +112,6 @@ pyinstaller: - "serial" - "win32cred" - "win32timezone" - - "win32ctypes.core.ctypes" - - "win32ctypes.core.ctypes._common" - - "win32ctypes.core.ctypes._dll" - - "win32ctypes.core.ctypes._resource" - - "win32ctypes.core.ctypes._system_information" - - "win32ctypes.core.ctypes._time" - - "win32ctypes.core.ctypes._authentication" - "pkgutil" collect_all: - "cura" @@ -139,14 +124,6 @@ pyinstaller: - "PyQt6.Qt" - "PyQt6.Qt6" - "PyQt6.QtQml" - - "PyQt6.QtQuick" - - "PyQt6.QtQuick.Widgets" - - "PyQt6.QtQuick.Controls" - - "PyQt6.QtQuick.Dialogs" - - "PyQt6.QtQuick.Layouts" - - "PyQt6.QtWidgets" - - "PyQt6.QtDBus" - - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From 66c1a08478d3bee614613ba56d771facfdff6493 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Dec 2024 09:03:14 +0100 Subject: [PATCH 10/35] Added the additional hooks folder now present in the cura-workflows repo. part of CURA-11622 --- UltiMaker-Cura.spec.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 2dce96282e..d618ca3309 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -28,7 +28,7 @@ a = Analysis( binaries=binaries, datas=datas, hiddenimports=hiddenimports, - hookspath=[], + hookspath=["Cura-workflows/runner_scripts/pyinstaller_hooks"], hooksconfig={}, runtime_hooks=[], excludes=[], From bec87b88dd99f50215591a8b687620dc6d238b86 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Dec 2024 10:20:49 +0100 Subject: [PATCH 11/35] (installer) Unwanted files are in there, try if it can start without. part of CURA-11622 --- conandata.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 832670d43e..8fa90458b1 100644 --- a/conandata.yml +++ b/conandata.yml @@ -102,7 +102,6 @@ pyinstaller: - "PyQt6" - "PyQt6.Qt" - "PyQt6.Qt6" - - "PyQt6.QtQml" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -123,7 +122,6 @@ pyinstaller: - "win32ctypes" - "PyQt6.Qt" - "PyQt6.Qt6" - - "PyQt6.QtQml" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From cca70d83da6371c1ee9b44071206d07122b53046 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Dec 2024 16:17:18 +0100 Subject: [PATCH 12/35] Install: Fix MacOs; Previous Windows fixes caused Mac build to fail. part of CURA-11622 --- conandata.yml | 10 ++++++---- conanfile.py | 10 ++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/conandata.yml b/conandata.yml index 8fa90458b1..dd81e0dcf5 100644 --- a/conandata.yml +++ b/conandata.yml @@ -100,8 +100,6 @@ pyinstaller: - "pyDulcificum" - "pynest2d" - "PyQt6" - - "PyQt6.Qt" - - "PyQt6.Qt6" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -112,6 +110,9 @@ pyinstaller: - "win32cred" - "win32timezone" - "pkgutil" + hiddenimports_WINDOWS_ONLY: + - "PyQt6.Qt" + - "PyQt6.Qt6" collect_all: - "cura" - "UM" @@ -120,12 +121,13 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" - - "PyQt6.Qt" - - "PyQt6.Qt6" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" - "keyrings.alt" + collect_all_WINDOWS_ONLY: + - "PyQt6.Qt" + - "PyQt6.Qt6" icon: Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" diff --git a/conanfile.py b/conanfile.py index fa15577126..01e2ffb579 100644 --- a/conanfile.py +++ b/conanfile.py @@ -310,6 +310,12 @@ class CuraConan(ConanFile): except Exception as ex: print(f"WARNING: Attempt to delete binary {unwanted_path} results in: {str(ex)}") + hiddenimports = pyinstaller_metadata["hiddenimports"] + collect_all = pyinstaller_metadata["collect_all"] + if self.settings.os == "Windows": + hiddenimports += pyinstaller_metadata["hiddenimports_WINDOWS_ONLY"] + collect_all += pyinstaller_metadata["collect_all_WINDOWS_ONLY"] + # Write the actual file: with open(os.path.join(location, "UltiMaker-Cura.spec"), "w") as f: f.write(pyinstaller.render( @@ -319,8 +325,8 @@ class CuraConan(ConanFile): datas = datas, binaries = filtered_binaries, venv_script_path = str(self._script_dir), - hiddenimports = pyinstaller_metadata["hiddenimports"], - collect_all = pyinstaller_metadata["collect_all"], + hiddenimports = hiddenimports, + collect_all = collect_all, icon = icon_path, entitlements_file = entitlements_file, osx_bundle_identifier = "'nl.ultimaker.cura'" if self.settings.os == "Macos" else "None", From f54eeede77944586d219aef976fbc36122dee656 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 14:42:32 +0100 Subject: [PATCH 13/35] Fix the rename script call path --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 50932c8702..1f54826893 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -41,7 +41,7 @@ jobs: - name: Rename the installers id: rename-installers working-directory: installers - run: python ./Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT + run: python ../Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT - name: create the release notes shell: python From dd4b9e80c142991a2c9bbb07ea08b00ef1e893ab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 17:11:02 +0100 Subject: [PATCH 14/35] Allow package overrides when building installers --- .github/workflows/installers.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 3ce0aec312..1d9b057f67 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -8,8 +8,12 @@ on: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' type: string + package_overrides: + description: 'Space-separated List of specific packages to be used' + default: '' + type: string conan_args: - description: 'Conan args, e.g. --requires' + description: 'Conan args' default: '' type: string enterprise: @@ -28,6 +32,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From a7ac441d0fd23a0b9c38fd870f5e33be3cc7341a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 10:22:40 +0100 Subject: [PATCH 15/35] Revert "Allow package overrides when building installers" This reverts commit dd4b9e80c142991a2c9bbb07ea08b00ef1e893ab. --- .github/workflows/installers.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 1d9b057f67..3ce0aec312 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -8,12 +8,8 @@ on: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' type: string - package_overrides: - description: 'Space-separated List of specific packages to be used' - default: '' - type: string conan_args: - description: 'Conan args' + description: 'Conan args, e.g. --requires' default: '' type: string enterprise: @@ -32,7 +28,6 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} - package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From 5d08f8eeefe5e69019fddde7a05bfac7905a0a4c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 17:11:02 +0100 Subject: [PATCH 16/35] Allow package overrides when building installers --- .github/workflows/installers.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 3ce0aec312..1d9b057f67 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -8,8 +8,12 @@ on: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' type: string + package_overrides: + description: 'Space-separated List of specific packages to be used' + default: '' + type: string conan_args: - description: 'Conan args, e.g. --requires' + description: 'Conan args' default: '' type: string enterprise: @@ -28,6 +32,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From 20b311f12e248ee6b150c467e40a87ac9a70cb0f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 11:14:50 +0100 Subject: [PATCH 17/35] Set proper default version value --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f4d5052c0d..fc749b13c5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ffc9b27b8b..2a9afda211 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bdfc92e5ab..f86815d3a9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: From 0b661203e76f1c3d41ba6ebf2b5ae90723552e3a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 11:18:08 +0100 Subject: [PATCH 18/35] Allow specific installers to have package overrides --- .github/workflows/installers.yml | 2 +- .github/workflows/linux.yml | 7 ++++++- .github/workflows/macos.yml | 7 ++++++- .github/workflows/windows.yml | 7 ++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 1d9b057f67..d63ed5bd6b 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -9,7 +9,7 @@ on: default: 'cura/[*]@ultimaker/testing' type: string package_overrides: - description: 'Space-separated List of specific packages to be used' + description: 'List of specific packages to be used (space-separated)' default: '' type: string conan_args: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fc749b13c5..66975ddf15 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,8 +9,12 @@ on: default: 'cura/[*]@ultimaker/testing' required: true type: string + package_overrides: + description: 'List of specific packages to be used (space-separated)' + default: '' + type: string conan_args: - description: 'Conan args, e.g. --requires' + description: 'Conan args' default: '' required: false type: string @@ -38,6 +42,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2a9afda211..97ea2b25ad 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -9,8 +9,12 @@ on: default: 'cura/[*]@ultimaker/testing' required: true type: string + package_overrides: + description: 'List of specific packages to be used (space-separated)' + default: '' + type: string conan_args: - description: 'Conan args: eq.: --require-override' + description: 'Conan args' default: '' required: false type: string @@ -47,6 +51,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f86815d3a9..c17d19fd72 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -9,8 +9,12 @@ on: default: 'cura/[*]@ultimaker/testing' required: true type: string + package_overrides: + description: 'List of specific packages to be used (space-separated)' + default: '' + type: string conan_args: - description: 'Conan args: eq.: --requires' + description: 'Conan args' default: '' required: false type: string @@ -38,6 +42,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From 50470758b218136560e6a3e3d8ddb32b1df2fae3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 13:33:31 +0100 Subject: [PATCH 19/35] Use proper private materials data --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index dd81e0dcf5..9e4bd1e9c8 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,7 +9,7 @@ requirements: - "pysavitar/5.4.0-alpha.0@ultimaker/stable" - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - - "fdm_materials/5.8.1" + - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" From 97c89edee9579999ead5f45b55a278dc4cd808e0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 15:34:19 +0100 Subject: [PATCH 20/35] Set empty package version for installers by default --- .github/workflows/installers.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index d63ed5bd6b..6dc2df99eb 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' type: string package_overrides: description: 'List of specific packages to be used (space-separated)' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 66975ddf15..e1dd221532 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' required: true type: string package_overrides: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 97ea2b25ad..b5de83128c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' required: true type: string package_overrides: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c17d19fd72..af827ba5ea 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' required: true type: string package_overrides: From fb720c3a07f8af300540b21075319c2b1701bc31 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 15:40:15 +0100 Subject: [PATCH 21/35] Set version as not required --- .github/workflows/linux.yml | 1 - .github/workflows/macos.yml | 1 - .github/workflows/windows.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e1dd221532..e4cb523240 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -7,7 +7,6 @@ on: cura_conan_version: description: 'Cura Conan Version' default: '' - required: true type: string package_overrides: description: 'List of specific packages to be used (space-separated)' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b5de83128c..02be9703ec 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -7,7 +7,6 @@ on: cura_conan_version: description: 'Cura Conan Version' default: '' - required: true type: string package_overrides: description: 'List of specific packages to be used (space-separated)' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index af827ba5ea..fe96125dc9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -7,7 +7,6 @@ on: cura_conan_version: description: 'Cura Conan Version' default: '' - required: true type: string package_overrides: description: 'List of specific packages to be used (space-separated)' From cd49eb3bffa86cec2fe840ed400b03f6041d4099 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 17:27:05 +0100 Subject: [PATCH 22/35] Use proper user for private data --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 9e4bd1e9c8..56536e1176 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,7 +10,7 @@ requirements: - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - - "cura_private_data/5.10.0-alpha.0@internal/testing" + - "cura_private_data/5.10.0-alpha.0@ultimaker/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: From 86e799e565ee2ae55eb08c389c42731a39107090 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 20:21:17 +0100 Subject: [PATCH 23/35] Use fdm_materials_private when appropriate --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 01e2ffb579..659915b0ba 100644 --- a/conanfile.py +++ b/conanfile.py @@ -412,7 +412,7 @@ class CuraConan(ConanFile): # Copy materials (flat) rmdir(self, str(Path(self.source_folder, "resources", "materials"))) - fdm_materials = self.dependencies["fdm_materials"].cpp_info + fdm_materials = self.dependencies["fdm_materials_private" if self.options.internal else "fdm_materials"].cpp_info copy(self, "*", fdm_materials.resdirs[0], self.source_folder) # Copy internal resources From ddb5aee0568bf14cd7c2c3790748e3cb49288ffa Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 20:43:19 +0100 Subject: [PATCH 24/35] Use private data from internal conan-user --- conandata.yml | 4 ++-- conanfile.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conandata.yml b/conandata.yml index 56536e1176..6bec3ee231 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,8 +9,8 @@ requirements: - "pysavitar/5.4.0-alpha.0@ultimaker/stable" - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - - "cura_private_data/5.10.0-alpha.0@ultimaker/testing" + - "fdm_materials/5.10.0-alpha.0@internal/testing" + - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: diff --git a/conanfile.py b/conanfile.py index 659915b0ba..01e2ffb579 100644 --- a/conanfile.py +++ b/conanfile.py @@ -412,7 +412,7 @@ class CuraConan(ConanFile): # Copy materials (flat) rmdir(self, str(Path(self.source_folder, "resources", "materials"))) - fdm_materials = self.dependencies["fdm_materials_private" if self.options.internal else "fdm_materials"].cpp_info + fdm_materials = self.dependencies["fdm_materials"].cpp_info copy(self, "*", fdm_materials.resdirs[0], self.source_folder) # Copy internal resources From 709367419befffdda610850a9905d617d137e082 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 08:44:49 +0100 Subject: [PATCH 25/35] Fix nightly release notes creation --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1f54826893..88352a6452 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -62,7 +62,7 @@ jobs: timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")), caller_workflow=caller_workflow, branch="" if is_main else short_version, - branch_specific="" is_main else f"?branch={short_version}", + branch_specific="" if is_main else f"?branch={short_version}", )) - name: Update nightly release description and binaries From e0689f90628a0383a4f9dd7299a52827ea9bd0cb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 09:26:46 +0100 Subject: [PATCH 26/35] Remove scary warning for conan migration --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d3fa8f55ce..37978a30f9 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@
-# ⚠️ ⚠️ On 03-12-2024, we will start merging branches on all the Cura-related repositories, that contain a migration of our Conan recipes to use Conan 2, and also a huge rework on many GitHub workflows. Unfortunately, we cannot test everything until it is merged, so it is very likely that some existing workflows will stop working. If you are a developer, you may also encounter troubles when updating your branches or updating your Conan dependencies. This message will be removed when the situation is stable enough. After that, please open new issues if you are still in trouble with the new recipes/workflows. Sorry for the inconvenience. ⚠️ ⚠️ - [![Badge Issues]][Issues]    [![Badge PullRequests]][PullRequests]    [![Badge Closed]][Closed] From 0efa90a2c394765f5eba9167eb34b067829fca6a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 17 Dec 2024 09:58:03 +0100 Subject: [PATCH 27/35] Fix release-notes file path --- .github/workflows/nightly.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 88352a6452..500e82c7db 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -66,11 +66,10 @@ jobs: )) - name: Update nightly release description and binaries - working-directory: installers run: | gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md - for file in "*"; do + for file in "installers/*"; do gh release upload ${{ inputs.release_tag }} $file --clobber done env: From f95d073b1bfc5aef03e095727c7e03cf597fff5b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 17 Dec 2024 16:21:42 +0100 Subject: [PATCH 28/35] Use common linter workflow --- .github/workflows/printer-linter-format.yml | 43 +++++++-------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 9e208f46a4..2b9c592816 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -1,34 +1,19 @@ name: printer-linter-format on: - push: - paths: - - 'resources/definitions/**' - - 'resources/extruders/**' - - 'resources/intent/**' - - 'resources/quality/**' - - 'resources/variants/**' + push: + paths: + - 'resources/definitions/**' + - 'resources/extruders/**' + - 'resources/intent/**' + - 'resources/quality/**' + - 'resources/variants/**' jobs: - printer-linter-format: - name: Printer linter auto format - - runs-on: ubuntu-latest - steps: - - name: Setup the build environment - uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - - - uses: greguintow/get-diff-action@v7 - with: - PATTERNS: | - resources/+(definitions|extruders)/*.def.json - resources/+(intent|quality|variants)/**/*.inst.cfg - - - name: Format file - if: env.GIT_DIFF && !env.MATCHED_FILES - run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }} - - - uses: stefanzweifel/git-auto-commit-action@v4 - if: env.GIT_DIFF && !env.MATCHED_FILES - with: - commit_message: "Applied printer-linter format" + printer-linter-format: + name: Printer linter auto format + uses: ultimaker/cura-workflows/.github/workflows/lint-formatter.yml@main + with: + file_patterns: resources/+(definitions|extruders)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg + command: python printer-linter/src/terminal.py --format + commit_message: "Apply printer-linter format" From d1932b5bdb81d49da0231574095250758b9fa8a5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 17 Dec 2024 16:32:24 +0100 Subject: [PATCH 29/35] Fix file patterns syntax, maybe --- .github/workflows/printer-linter-format.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 2b9c592816..246170c1e4 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -14,6 +14,8 @@ jobs: name: Printer linter auto format uses: ultimaker/cura-workflows/.github/workflows/lint-formatter.yml@main with: - file_patterns: resources/+(definitions|extruders)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg + file_patterns: | + resources/+(definitions|extruders)/*.def.json + resources/+(intent|quality|variants)/**/*.inst.cfg command: python printer-linter/src/terminal.py --format commit_message: "Apply printer-linter format" From 5ccb96e07bb9d97663f8be48d9a7224e11c82629 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Dec 2024 09:10:56 +0100 Subject: [PATCH 30/35] Adjust nightly builds tags --- .github/workflows/nightly-stable.yml | 2 +- .github/workflows/nightly-testing.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml index f548b81875..e166027dd8 100644 --- a/.github/workflows/nightly-stable.yml +++ b/.github/workflows/nightly-stable.yml @@ -11,6 +11,6 @@ jobs: uses: ./.github/workflows/nightly.yml with: cura_conan_version: "cura/[*]@ultimaker/stable" - release_tag: "nightly" + release_tag: "nightly-stable" caller_workflow: "nightly-stable.yml" secrets: inherit diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index 160ad5c46d..c1ccb67f1c 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -11,6 +11,6 @@ jobs: uses: ./.github/workflows/nightly.yml with: cura_conan_version: "cura/[*]@ultimaker/testing" - release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever + release_tag: "nightly-testing" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" secrets: inherit From 2951a6b0f79e247bd9fd943b444844a1ffe06704 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 12:25:16 +0100 Subject: [PATCH 31/35] Fix nightly release notes syntax --- .github/workflows/nightly_release_notes.md.jinja | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja index 62edf16408..a3e7b96362 100644 --- a/.github/workflows/nightly_release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -4,8 +4,7 @@ | | | |--------------:|--------------------------------------------------------------------------------------------| -| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }} -?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | +| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | # Unit Test results From 345980026c92e1064d87dc4d7e79a2c5b3f5d7cc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 12:29:02 +0100 Subject: [PATCH 32/35] Display proper CuraEngine packaging action result --- .github/workflows/nightly_release_notes.md.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja index a3e7b96362..ccd807d23d 100644 --- a/.github/workflows/nightly_release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -23,7 +23,7 @@ | | | |------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **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) | +| **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/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) | From 07880cd590dfee1005927b92d3134b962487ace0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 12:33:41 +0100 Subject: [PATCH 33/35] Always display sub-packages main branch results --- .github/workflows/nightly.yml | 1 - .../workflows/nightly_release_notes.md.jinja | 28 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 500e82c7db..d77cac7990 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -61,7 +61,6 @@ jobs: f.write(release_notes.render( timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")), caller_workflow=caller_workflow, - branch="" if is_main else short_version, branch_specific="" if is_main else f"?branch={short_version}", )) diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja index ccd807d23d..a14c8d76a0 100644 --- a/.github/workflows/nightly_release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -4,17 +4,17 @@ | | | |--------------:|--------------------------------------------------------------------------------------------| -| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | +| **Nightlies** | [![nightly](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/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) | +| **Cura** | [![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** | [![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** | [![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** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) | +| **synsepalum-dulcificum** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg)](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) | @@ -22,14 +22,14 @@ | | | |------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **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/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/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) | +| **Cura** | [![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** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml) | +| **Uranium** | [![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** | [![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** | [![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** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) | +| **synsepalum-dulcificum** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml) | +| **CuraEngine gRPC definitions** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg)](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) | From f17872725ada7803bdf53027d4cf7b6117a06dd6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 14:42:53 +0100 Subject: [PATCH 34/35] Set proper method to define env variables --- resources/conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/conanfile.py b/resources/conanfile.py index aea89f4569..cebaea4345 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -46,9 +46,9 @@ class CuraResource(ConanFile): def package_info(self): self.cpp_info.includedirs = [] - self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res")) - self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions")) - self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders")) + self.runenv_info.define("CURA_RESOURCES", os.path.join(self.package_folder, "res")) + self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions")) + self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders")) def package_id(self): self.info.clear() From 382b98e8b0c910fdf8b1509557ae8afab38f1817 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 15:19:24 +0100 Subject: [PATCH 35/35] Fix wrong setting version on profiles --- resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 120 files changed, 120 insertions(+), 120 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index d89894647c..9819984b71 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index e3d0252d49..05d0a504e9 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index ab3e3e17ea..e1111c1026 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index b9e9565c3c..b4e2f49779 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index 991ac5d101..10f80e4785 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index e148d1c4b6..c84b36660b 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index 9b9a0ffee9..c6eb62e1b6 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index d134c72fdb..f2e5706e31 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index e7b6b714fb..9324b9ba0e 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index a93e0bd832..862586934e 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index ee2404bc08..ee753c59cf 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 6931141a6f..3505479774 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index 895ff9daf4..dcf9a6fe45 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index f10be46a98..b79bb0e096 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index 2b7356f1a5..0d85a07e9c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index 542b8d2986..734e32367c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 2ce1651a4c..97c131f56b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index cac8e008e9..3da38499ee 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index 616a9537c8..aaa65f6439 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index 75ed433d4c..cd98f31944 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 217caf5659..c8bfbf11a3 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index bd067c1827..e14363b52d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 05000e8e19..c476909acf 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index a934707451..376ddc9f11 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index 49bdf430a3..dbac6990bf 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 531dcb8b39..990496f4d9 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 656d982e01..3a58e94bc1 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index 3b0eb953ba..13b1d6c2f0 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index 51128170f4..21843a75c9 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index 00ba1c8267..9b982421ed 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 57751118f9..633abd8caa 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 4016f5584e..fe16e614b0 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index b7474b0cbd..bb5a5abf6c 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index de76119db3..8820ff968c 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index 4819149590..917e90cf7f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index 777d39748c..1cb5221228 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index 294d9c66b8..3a18c9f8c1 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index 53497d7923..b8865a8af8 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index 43a0ffa1ad..983addb707 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index 8c737fbf04..80328cf24f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index 2d4595f38e..a0e8fa9446 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 7b8ecd4957..27dccc84ed 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index cc323328b3..6b6e07d252 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index fcdc58c5d0..1a9e191377 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 63d675bb68..e467bdc3d3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index e948b334da..90e70de319 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index 5b11b8a69a..b4a86e68d8 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index ebb14aab78..4e97f5035e 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index 0fc5fbe8d5..465abff92e 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index efcf6f0246..872f7a3313 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index 670e236a79..0e252d6c8d 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index 878507ce99..29a9a6dcfc 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index f4f6b4dfff..9f25c84c7c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 7fa652d855..a331f526c6 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 898a271b49..a6a095226f 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index b7aaa1f7a2..a5e7c74186 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index f05f652783..08fee402c5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index 4bb9372a9b..67368a8f18 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index fbb74fb9ca..d62d2bf669 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index 3e8e8195bc..573dd89ea5 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index 66b0fd971c..ac210cfdc1 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index 26bdebd1b2..1a0a40ba8a 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index 4e5662790b..aab8ba5499 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 5e053d8bc4..7438b747db 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index d2b06a4d31..9da50270b2 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index b6a752f140..7dec53da68 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 51da4e343b..186d2ad149 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index 77aebb66d9..81d541a38b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index 9b99c0eef3..78628ebbc4 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index a6b11d0f45..af96ecd40d 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index 6b74da6994..1bb40fb822 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index 431ecc57e9..34c27750dc 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 94fa58ec41..74e38683e2 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index ed6e3bbd96..8da78abc98 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 49e348299b..3620d1c44c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index 2d1e463704..8593ee439e 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 4a61f16bb9..b5220d0a37 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index 3906f5a5a3..7fd15f3ffb 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 6316562eec..f1446254a2 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index 51f85f9d60..dd518500b3 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index def6946bf1..94def9aa8f 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 13df7a17fe..4ba5c656f2 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index f7f4de0b25..ed1a9d44e8 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 0f7fdf0238..c24f054304 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index d41c155234..62e5ac1d1e 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index 9c69b07258..f74b615074 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index 5b35eec0b7..ac5377a9fa 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index 470729ca7c..78c4f59752 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index e2b949208e..97cc5bd288 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index e630937656..98f7f15cb3 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index a026d13755..bbc2b959f0 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 2551c5085d..211c9317fe 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 03d7a5de60..776d93e857 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index bc372dae4b..2ffba84452 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index 41af7ad552..500999a45f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index 990bb0d518..9bd3bc46a3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index 8a739087b3..cad3c1ae88 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index 7fae42c017..ee3accfaba 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index 81f7a4affd..a326841ab0 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index f8382a17f7..7e9fd11c83 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index a9c02df5d2..29df645cce 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index f3920f61e8..a064df9b4b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index 3be4231e8b..daeb14d863 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index 7ac9945261..214ebfcaa1 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index 79e3d1d86a..e4fb8078cb 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index b48aadb0e4..421af6a4b1 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index cabb3d9020..7b7d35e6b7 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 30d016cf2c..455b0031c4 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 57ddcf68f4..5422b31737 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 5de4dff512..c74b5ec7f9 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 0fdf7be51c..b37f33ef17 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index 374535d12f..1b364cc93c 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 9790b61217..0ccc19d779 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index a395749b1d..ec266f9e8a 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index d5ca080c10..34cfd8d758 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 212b8b9ba5..8503117126 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index 441cbb9d4f..800f262b7c 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index d431a471c7..fc11f58931 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index e611c83dd9..9fc17ac4d6 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 041a037ed0..b8b4cb618d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm