Date: Thu, 4 Aug 2022 23:00:17 GMT From: Diane Bruce <db@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0628704aae0c - main - ports/cura: Update to 4.13.1 Message-ID: <202208042300.274N0HVR097292@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=0628704aae0c4d91e325b2d7d53dab04bcd2769a commit 0628704aae0c4d91e325b2d7d53dab04bcd2769a Author: Diane Bruce <db@FreeBSD.org> AuthorDate: 2022-08-04 22:52:04 +0000 Commit: Diane Bruce <db@FreeBSD.org> CommitDate: 2022-08-04 22:52:04 +0000 ports/cura: Update to 4.13.1 Major update to 4.13.1 not 4.12 I've said it before and I'll say it again. This port should be a group effort but a cads porting team. I'd be happy to give up Maintainership as my only interest with cura was to get it into ports. PR: ports/255630 Reported by: unrelentingtech <greg@unrelenting.technology> Tested by: trombik1973@gmail.com --- cad/cura-engine/Makefile | 8 +- cad/cura-engine/distinfo | 6 +- cad/cura-engine/files/patch-CMakeLists.txt | 19 + cad/cura-engine/files/patch-src_support.cpp | 4 +- cad/cura/Makefile | 15 +- cad/cura/distinfo | 6 +- .../files/patch-cura_OAuth2_KeyringAttribute.py | 11 + cad/cura/files/patch-cura__app.py | 4 +- cad/cura/pkg-plist | 2750 ++++++++++++++++++-- cad/uranium/Makefile | 4 +- cad/uranium/distinfo | 6 +- cad/uranium/pkg-plist | 70 +- devel/libnest2d-ultimaker/Makefile | 12 +- devel/libnest2d-ultimaker/distinfo | 6 +- devel/libsavitar/Makefile | 4 +- devel/libsavitar/distinfo | 6 +- devel/py-pynest2d/Makefile | 8 +- devel/py-pynest2d/distinfo | 6 +- net/libarcus/Makefile | 3 +- net/libarcus/distinfo | 6 +- .../{patch-protobuf => patch-src_Socket__p.h} | 6 +- net/libcharon/Makefile | 5 +- net/libcharon/distinfo | 6 +- net/libcharon/pkg-plist | 3 +- 24 files changed, 2617 insertions(+), 357 deletions(-) diff --git a/cad/cura-engine/Makefile b/cad/cura-engine/Makefile index 068b59d590b7..c2dc753d91e2 100644 --- a/cad/cura-engine/Makefile +++ b/cad/cura-engine/Makefile @@ -1,7 +1,6 @@ PORTNAME= CuraEngine -DISTVERSION= 4.8 -PORTREVISION= 4 PORTEPOCH= 1 +DISTVERSION= 4.13.1 CATEGORIES= cad DIST_SUBDIR= Ultimaker @@ -20,12 +19,15 @@ STB_TAG= d5d052c USE_GITHUB= yes GH_ACCOUNT= Ultimaker GH_PROJECT= CuraEngine -GH_TAGNAME= fadb5d6b GH_TUPLE= nothings:stb:${STB_TAG}:stb/include/stb CMAKE_ARGS+= -DStb_FOUND:BOOL=ON \ -DStb_INCLUDE_DIRS=${WRKSRC}/include +# disable OpenMP as it does not work (at least) on CURRENT. +# OpenMP support is planned to be replaced with native thread. +# see files/patch-CMakeLists.txt + PLIST_FILES= bin/CuraEngine .include <bsd.port.mk> diff --git a/cad/cura-engine/distinfo b/cad/cura-engine/distinfo index c339eae0ec4f..4c534022b2b3 100644 --- a/cad/cura-engine/distinfo +++ b/cad/cura-engine/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1605914147 -SHA256 (Ultimaker/Ultimaker-CuraEngine-4.8-fadb5d6b_GH0.tar.gz) = 28cabbc8d102eed1cd16774440973f0912adc8fbd2901eae8de6856888099f02 -SIZE (Ultimaker/Ultimaker-CuraEngine-4.8-fadb5d6b_GH0.tar.gz) = 1684943 +TIMESTAMP = 1645697559 +SHA256 (Ultimaker/Ultimaker-CuraEngine-4.13.1_GH0.tar.gz) = 283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657 +SIZE (Ultimaker/Ultimaker-CuraEngine-4.13.1_GH0.tar.gz) = 1727935 SHA256 (Ultimaker/nothings-stb-d5d052c_GH0.tar.gz) = ce1a6424b43287166a962827d83d98cedcd9d515e69052b17d8a7896f9fb7517 SIZE (Ultimaker/nothings-stb-d5d052c_GH0.tar.gz) = 1358441 diff --git a/cad/cura-engine/files/patch-CMakeLists.txt b/cad/cura-engine/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..0316bafae5b0 --- /dev/null +++ b/cad/cura-engine/files/patch-CMakeLists.txt @@ -0,0 +1,19 @@ +--- CMakeLists.txt.orig 2022-04-29 23:17:19 UTC ++++ CMakeLists.txt +@@ -117,16 +117,6 @@ if (WIN32) + add_definitions(-DNOMINMAX) + endif() + +-option (ENABLE_OPENMP +- "Use OpenMP for parallel code" ON) +- +-if (ENABLE_OPENMP) +- FIND_PACKAGE( OpenMP ) +- if( OPENMP_FOUND ) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" ) +- endif() +-endif() +- + if(USE_SYSTEM_LIBS) + include_directories(${Polyclipping_INCLUDE_DIRS} "${CMAKE_BINARY_DIR}" ${RAPIDJSON_INCLUDE_DIRS}) + else() diff --git a/cad/cura-engine/files/patch-src_support.cpp b/cad/cura-engine/files/patch-src_support.cpp index ab6355fce883..6f15baa3cc2e 100644 --- a/cad/cura-engine/files/patch-src_support.cpp +++ b/cad/cura-engine/files/patch-src_support.cpp @@ -1,8 +1,8 @@ ---- src/support.cpp.orig 2020-03-17 23:31:20 UTC +--- src/support.cpp.orig 2022-01-24 15:11:50 UTC +++ src/support.cpp @@ -1,3 +1,5 @@ +#undef __GNUC__ +#define __GNUC__ 9 - //Copyright (c) 2019 Ultimaker B.V. + //Copyright (c) 2021 Ultimaker B.V. //CuraEngine is released under the terms of the AGPLv3 or higher. diff --git a/cad/cura/Makefile b/cad/cura/Makefile index cb5501742591..a9b86e0dbca3 100644 --- a/cad/cura/Makefile +++ b/cad/cura/Makefile @@ -1,6 +1,5 @@ PORTNAME= Cura -DISTVERSION= 4.8.0 -PORTREVISION= 8 +DISTVERSION= 4.13.1 PORTEPOCH= 2 CATEGORIES= cad DIST_SUBDIR= Ultimaker @@ -16,16 +15,19 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy-stl>0:math/py-numpy-stl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \ qt5-graphicaleffects>0:graphics/qt5-graphicaleffects \ qt5-quickcontrols>0:x11-toolkits/qt5-quickcontrols \ qt5-quickcontrols2>0:x11-toolkits/qt5-quickcontrols2 \ Uranium>=${DISTVERSION}:cad/uranium \ - libCharon>=${DISTVERSION}:net/libcharon \ + libCharon>=4.13.0:net/libcharon \ CuraEngine>=${DISTVERSION}:cad/cura-engine \ - fdm_materials>=${DISTVERSION}:cad/fdm_materials \ + fdm_materials>=4.13.0:cad/fdm_materials \ ${PYTHON_PKGNAMEPREFIX}trimesh>0:devel/py-trimesh@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pynest2d>=${DISTVERSION}:devel/py-pynest2d@${PY_FLAVOR} - + ${PYTHON_PKGNAMEPREFIX}pynest2d>=4.12.1:devel/py-pynest2d@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sentry-sdk>0:devel/py-sentry-sdk@${PY_FLAVOR} \ + libArcus>=${DISTVERSION}:net/libarcus \ + libSavitar>=${DISTVERSION}:devel/libsavitar LIB_DEPENDS= libArcus.so:net/libarcus \ libSavitar.so:devel/libsavitar @@ -36,7 +38,6 @@ CMAKE_ARGS+= -DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts" \ -DCURA_VERSION=${DISTVERSION} USE_GITHUB= yes GH_ACCOUNT= Ultimaker -GH_TAGNAME= 58bae31 NO_ARCH= yes SHEBANG_FILES= cura_app.py diff --git a/cad/cura/distinfo b/cad/cura/distinfo index f0b96f0fd265..fe51e1450d13 100644 --- a/cad/cura/distinfo +++ b/cad/cura/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608787903 -SHA256 (Ultimaker/Ultimaker-Cura-4.8.0-58bae31_GH0.tar.gz) = 267cde97a328958059b2ae327e000a8874b23e10f8b0e63044b1f8429016c1e7 -SIZE (Ultimaker/Ultimaker-Cura-4.8.0-58bae31_GH0.tar.gz) = 31929701 +TIMESTAMP = 1645697504 +SHA256 (Ultimaker/Ultimaker-Cura-4.13.1_GH0.tar.gz) = bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c +SIZE (Ultimaker/Ultimaker-Cura-4.13.1_GH0.tar.gz) = 42339030 diff --git a/cad/cura/files/patch-cura_OAuth2_KeyringAttribute.py b/cad/cura/files/patch-cura_OAuth2_KeyringAttribute.py new file mode 100644 index 000000000000..d38210f76b94 --- /dev/null +++ b/cad/cura/files/patch-cura_OAuth2_KeyringAttribute.py @@ -0,0 +1,11 @@ +--- cura/OAuth2/KeyringAttribute.py.orig 2022-04-28 04:59:10 UTC ++++ cura/OAuth2/KeyringAttribute.py +@@ -5,7 +5,7 @@ from typing import Type, TYPE_CHECKING, Optional, List + from io import BlockingIOError + import keyring + from keyring.backend import KeyringBackend +-from keyring.errors import NoKeyringError, PasswordSetError, KeyringLocked ++from keyring.errors import PasswordSetError, KeyringLocked + + from UM.Logger import Logger + diff --git a/cad/cura/files/patch-cura__app.py b/cad/cura/files/patch-cura__app.py index 1da6d6b56d88..519db7713567 100644 --- a/cad/cura/files/patch-cura__app.py +++ b/cad/cura/files/patch-cura__app.py @@ -1,8 +1,8 @@ --- cura_app.py.orig 2020-02-28 16:06:57 UTC +++ cura_app.py @@ -1,4 +1,4 @@ --#!/usr/bin/env python3 +-#!/usr/bin/env python3.8 +#!/usr/bin/env %%PYTHON_CMD%% - # Copyright (c) 2020 Ultimaker B.V. + # Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. diff --git a/cad/cura/pkg-plist b/cad/cura/pkg-plist index 8a56c209094c..91c63c37cc88 100644 --- a/cad/cura/pkg-plist +++ b/cad/cura/pkg-plist @@ -1,6 +1,7 @@ bin/cura lib/cura/plugins/3MFReader/ThreeMFReader.py lib/cura/plugins/3MFReader/ThreeMFWorkspaceReader.py +lib/cura/plugins/3MFReader/UpdatableMachinesModel.py lib/cura/plugins/3MFReader/WorkspaceDialog.py lib/cura/plugins/3MFReader/WorkspaceDialog.qml lib/cura/plugins/3MFReader/__init__.py @@ -42,6 +43,51 @@ lib/cura/plugins/CuraProfileReader/plugin.json lib/cura/plugins/CuraProfileWriter/CuraProfileWriter.py lib/cura/plugins/CuraProfileWriter/__init__.py lib/cura/plugins/CuraProfileWriter/plugin.json +lib/cura/plugins/DigitalLibrary/__init__.py +lib/cura/plugins/DigitalLibrary/plugin.json +lib/cura/plugins/DigitalLibrary/resources/images/arrow_down.svg +lib/cura/plugins/DigitalLibrary/resources/images/digital_factory.svg +lib/cura/plugins/DigitalLibrary/resources/images/placeholder.svg +lib/cura/plugins/DigitalLibrary/resources/images/projects_not_found.svg +lib/cura/plugins/DigitalLibrary/resources/images/update.svg +lib/cura/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml +lib/cura/plugins/DigitalLibrary/resources/qml/DigitalFactoryOpenDialog.qml +lib/cura/plugins/DigitalLibrary/resources/qml/DigitalFactorySaveDialog.qml +lib/cura/plugins/DigitalLibrary/resources/qml/LoadMoreProjectsCard.qml +lib/cura/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml +lib/cura/plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml +lib/cura/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml +lib/cura/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml +lib/cura/plugins/DigitalLibrary/src/BackwardsCompatibleMessage.py +lib/cura/plugins/DigitalLibrary/src/BaseModel.py +lib/cura/plugins/DigitalLibrary/src/CloudError.py +lib/cura/plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py +lib/cura/plugins/DigitalLibrary/src/DFFileUploader.py +lib/cura/plugins/DigitalLibrary/src/DFLibraryFileUploadRequest.py +lib/cura/plugins/DigitalLibrary/src/DFLibraryFileUploadResponse.py +lib/cura/plugins/DigitalLibrary/src/DFPrintJobUploadRequest.py +lib/cura/plugins/DigitalLibrary/src/DFPrintJobUploadResponse.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryController.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryFeatureBudgetResponse.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryFileModel.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryFileProvider.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryFileResponse.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryOutputDevicePlugin.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryProjectModel.py +lib/cura/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py +lib/cura/plugins/DigitalLibrary/src/ExportFileJob.py +lib/cura/plugins/DigitalLibrary/src/PaginationLinks.py +lib/cura/plugins/DigitalLibrary/src/PaginationManager.py +lib/cura/plugins/DigitalLibrary/src/PaginationMetadata.py +lib/cura/plugins/DigitalLibrary/src/ResponseMeta.py +lib/cura/plugins/DigitalLibrary/src/__init__.py +lib/cura/plugins/DigitalLibrary/tests/TestDFFileExportAndUploadManager.py +lib/cura/plugins/DigitalLibrary/tests/TestDigitalFactoryFileModel.py +lib/cura/plugins/DigitalLibrary/tests/TestDigitalFactoryProjectModel.py +lib/cura/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py +lib/cura/plugins/DigitalLibrary/tests/conftest.py lib/cura/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py lib/cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py lib/cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerLookup.py @@ -107,16 +153,16 @@ lib/cura/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py lib/cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml lib/cura/plugins/PerObjectSettingsTool/__init__.py lib/cura/plugins/PerObjectSettingsTool/plugin.json -lib/cura/plugins/PerObjectSettingsTool/tool_icon.svg lib/cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py lib/cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml lib/cura/plugins/PostProcessingPlugin/README.md lib/cura/plugins/PostProcessingPlugin/Script.py +lib/cura/plugins/PostProcessingPlugin/Script.svg lib/cura/plugins/PostProcessingPlugin/__init__.py lib/cura/plugins/PostProcessingPlugin/plugin.json -lib/cura/plugins/PostProcessingPlugin/postprocessing.svg lib/cura/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py lib/cura/plugins/PostProcessingPlugin/scripts/ColorMix.py +lib/cura/plugins/PostProcessingPlugin/scripts/CreateThumbnail.py lib/cura/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py lib/cura/plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py lib/cura/plugins/PostProcessingPlugin/scripts/ExampleScript.md @@ -165,9 +211,9 @@ lib/cura/plugins/SimulationView/layers3d.shader lib/cura/plugins/SimulationView/layers3d_shadow.shader lib/cura/plugins/SimulationView/layers_shadow.shader lib/cura/plugins/SimulationView/plugin.json +lib/cura/plugins/SimulationView/resources/Pause.svg +lib/cura/plugins/SimulationView/resources/Play.svg lib/cura/plugins/SimulationView/resources/nozzle.stl -lib/cura/plugins/SimulationView/resources/simulation_pause.svg -lib/cura/plugins/SimulationView/resources/simulation_resume.svg lib/cura/plugins/SimulationView/simulationview_composite.shader lib/cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml lib/cura/plugins/SliceInfoPlugin/SliceInfo.py @@ -181,12 +227,11 @@ lib/cura/plugins/SolidView/xray_overlay.shader lib/cura/plugins/SupportEraser/SupportEraser.py lib/cura/plugins/SupportEraser/__init__.py lib/cura/plugins/SupportEraser/plugin.json -lib/cura/plugins/SupportEraser/tool_icon.svg lib/cura/plugins/Toolbox/__init__.py lib/cura/plugins/Toolbox/plugin.json +lib/cura/plugins/Toolbox/resources/images/Shop.svg lib/cura/plugins/Toolbox/resources/images/installed_check.svg lib/cura/plugins/Toolbox/resources/images/placeholder.svg -lib/cura/plugins/Toolbox/resources/images/shop.svg lib/cura/plugins/Toolbox/resources/qml/Toolbox.qml lib/cura/plugins/Toolbox/resources/qml/components/ToolboxActionButtonStyle.qml lib/cura/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml @@ -243,6 +288,7 @@ lib/cura/plugins/UFPWriter/kitten.png lib/cura/plugins/UFPWriter/plugin.json lib/cura/plugins/UM3NetworkPrinting/__init__.py lib/cura/plugins/UM3NetworkPrinting/plugin.json +lib/cura/plugins/UM3NetworkPrinting/resources/png/Ultimaker 2+ Connect.png lib/cura/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png lib/cura/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png lib/cura/plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png @@ -271,23 +317,20 @@ lib/cura/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml lib/cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml lib/cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml lib/cura/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml +lib/cura/plugins/UM3NetworkPrinting/resources/svg/Camera.svg +lib/cura/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg +lib/cura/plugins/UM3NetworkPrinting/resources/svg/Check.svg +lib/cura/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg +lib/cura/plugins/UM3NetworkPrinting/resources/svg/CloudPlatform.svg +lib/cura/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg +lib/cura/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg lib/cura/plugins/UM3NetworkPrinting/resources/svg/UM3-icon.svg lib/cura/plugins/UM3NetworkPrinting/resources/svg/UM3x-icon.svg lib/cura/plugins/UM3NetworkPrinting/resources/svg/UMs5-icon.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/cloud-flow-completed.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/cloud-flow-start.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg +lib/cura/plugins/UM3NetworkPrinting/resources/svg/Warning.svg +lib/cura/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg +lib/cura/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg lib/cura/plugins/UM3NetworkPrinting/resources/svg/ultibot.svg -lib/cura/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg lib/cura/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py lib/cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py lib/cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -303,6 +346,7 @@ lib/cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py lib/cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadBlockedMessage.py lib/cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py lib/cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadProgressMessage.py +lib/cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadQueueFullMessage.py lib/cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py lib/cura/plugins/UM3NetworkPrinting/src/Messages/__init__.py lib/cura/plugins/UM3NetworkPrinting/src/Models/BaseModel.py @@ -317,7 +361,7 @@ lib/cura/plugins/UM3NetworkPrinting/src/Models/Http/ClusterBuildPlate.py lib/cura/plugins/UM3NetworkPrinting/src/Models/Http/ClusterMaterial.py lib/cura/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintCoreConfiguration.py lib/cura/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConfigurationChange.py -lib/cura/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraint.py +lib/cura/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraints.py lib/cura/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobImpediment.py lib/cura/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py lib/cura/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py @@ -345,7 +389,6 @@ lib/cura/plugins/USBPrinting/AvrFirmwareUpdater.py lib/cura/plugins/USBPrinting/MonitorItem.qml lib/cura/plugins/USBPrinting/USBPrinterOutputDevice.py lib/cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py -lib/cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py.orig lib/cura/plugins/USBPrinting/__init__.py lib/cura/plugins/USBPrinting/avr_isp/__init__.py lib/cura/plugins/USBPrinting/avr_isp/chipDB.py @@ -399,6 +442,9 @@ lib/cura/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json lib/cura/plugins/VersionUpgrade/VersionUpgrade40to41/VersionUpgrade40to41.py lib/cura/plugins/VersionUpgrade/VersionUpgrade40to41/__init__.py lib/cura/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json +lib/cura/plugins/VersionUpgrade/VersionUpgrade411to412/VersionUpgrade411to412.py +lib/cura/plugins/VersionUpgrade/VersionUpgrade411to412/__init__.py +lib/cura/plugins/VersionUpgrade/VersionUpgrade411to412/plugin.json lib/cura/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py lib/cura/plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py lib/cura/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json @@ -422,6 +468,15 @@ lib/cura/plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json lib/cura/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py lib/cura/plugins/VersionUpgrade/VersionUpgrade462to47/__init__.py lib/cura/plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json +lib/cura/plugins/VersionUpgrade/VersionUpgrade47to48/VersionUpgrade47to48.py +lib/cura/plugins/VersionUpgrade/VersionUpgrade47to48/__init__.py +lib/cura/plugins/VersionUpgrade/VersionUpgrade47to48/plugin.json +lib/cura/plugins/VersionUpgrade/VersionUpgrade48to49/VersionUpgrade48to49.py +lib/cura/plugins/VersionUpgrade/VersionUpgrade48to49/__init__.py +lib/cura/plugins/VersionUpgrade/VersionUpgrade48to49/plugin.json +lib/cura/plugins/VersionUpgrade/VersionUpgrade49to410/VersionUpgrade49to410.py +lib/cura/plugins/VersionUpgrade/VersionUpgrade49to410/__init__.py +lib/cura/plugins/VersionUpgrade/VersionUpgrade49to410/plugin.json lib/cura/plugins/X3DReader/X3DReader.py lib/cura/plugins/X3DReader/__init__.py lib/cura/plugins/X3DReader/plugin.json @@ -446,6 +501,7 @@ lib/cura/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py %%PYTHON_SITELIBDIR%%/cura/Arranging/Arrange.py %%PYTHON_SITELIBDIR%%/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py %%PYTHON_SITELIBDIR%%/cura/Arranging/ArrangeObjectsJob.py +%%PYTHON_SITELIBDIR%%/cura/Arranging/Nest2DArrange.py %%PYTHON_SITELIBDIR%%/cura/Arranging/ShapeArray.py %%PYTHON_SITELIBDIR%%/cura/Arranging/__init__.py %%PYTHON_SITELIBDIR%%/cura/AutoSave.py @@ -508,6 +564,7 @@ lib/cura/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py %%PYTHON_SITELIBDIR%%/cura/OAuth2/AuthorizationRequestHandler.py %%PYTHON_SITELIBDIR%%/cura/OAuth2/AuthorizationRequestServer.py %%PYTHON_SITELIBDIR%%/cura/OAuth2/AuthorizationService.py +%%PYTHON_SITELIBDIR%%/cura/OAuth2/KeyringAttribute.py %%PYTHON_SITELIBDIR%%/cura/OAuth2/LocalAuthorizationServer.py %%PYTHON_SITELIBDIR%%/cura/OAuth2/Models.py %%PYTHON_SITELIBDIR%%/cura/OAuth2/__init__.py @@ -536,6 +593,7 @@ lib/cura/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py %%PYTHON_SITELIBDIR%%/cura/PrinterOutput/PrinterOutputController.py %%PYTHON_SITELIBDIR%%/cura/PrinterOutput/PrinterOutputDevice.py %%PYTHON_SITELIBDIR%%/cura/PrinterOutput/PrinterOutputModel.py +%%PYTHON_SITELIBDIR%%/cura/PrinterOutput/UploadMaterialsJob.py %%PYTHON_SITELIBDIR%%/cura/PrinterOutput/__init__.py %%PYTHON_SITELIBDIR%%/cura/PrinterOutputDevice.py %%PYTHON_SITELIBDIR%%/cura/ReaderWriters/ProfileReader.py @@ -556,6 +614,10 @@ lib/cura/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py %%PYTHON_SITELIBDIR%%/cura/Settings/CuraContainerStack.py %%PYTHON_SITELIBDIR%%/cura/Settings/CuraFormulaFunctions.py %%PYTHON_SITELIBDIR%%/cura/Settings/CuraStackBuilder.py +%%PYTHON_SITELIBDIR%%/cura/Settings/DatabaseHandlers/IntentDatabaseHandler.py +%%PYTHON_SITELIBDIR%%/cura/Settings/DatabaseHandlers/QualityDatabaseHandler.py +%%PYTHON_SITELIBDIR%%/cura/Settings/DatabaseHandlers/VariantDatabaseHandler.py +%%PYTHON_SITELIBDIR%%/cura/Settings/DatabaseHandlers/__init__.py %%PYTHON_SITELIBDIR%%/cura/Settings/Exceptions.py %%PYTHON_SITELIBDIR%%/cura/Settings/ExtruderManager.py %%PYTHON_SITELIBDIR%%/cura/Settings/ExtruderStack.py @@ -590,6 +652,7 @@ lib/cura/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py %%PYTHON_SITELIBDIR%%/cura/UI/WelcomePagesModel.py %%PYTHON_SITELIBDIR%%/cura/UI/WhatsNewPagesModel.py %%PYTHON_SITELIBDIR%%/cura/UI/__init__.py +%%PYTHON_SITELIBDIR%%/cura/UltimakerCloud/CloudMaterialSync.py %%PYTHON_SITELIBDIR%%/cura/UltimakerCloud/UltimakerCloudConstants.py %%PYTHON_SITELIBDIR%%/cura/UltimakerCloud/UltimakerCloudScope.py %%PYTHON_SITELIBDIR%%/cura/UltimakerCloud/__init__.py @@ -599,15 +662,19 @@ lib/cura/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py %%PYTHON_SITELIBDIR%%/cura/Utils/__init__.py %%PYTHON_SITELIBDIR%%/cura/XRayPass.py %%PYTHON_SITELIBDIR%%/cura/__init__.py -share/applications/cura.desktop +share/applications/com.ultimaker.cura.desktop +share/cura/resources/README_resources.txt share/cura/resources/bundled_packages/cura.json share/cura/resources/definitions/101Hero.def.json share/cura/resources/definitions/3dator.def.json +share/cura/resources/definitions/3di_base.def.json +share/cura/resources/definitions/3di_d300.def.json share/cura/resources/definitions/3dtech_semi_professional.def.json share/cura/resources/definitions/I3MetalMotion.def.json share/cura/resources/definitions/Mark2_for_Ultimaker2.def.json share/cura/resources/definitions/SV01.def.json share/cura/resources/definitions/SV02.def.json +share/cura/resources/definitions/SV03.def.json share/cura/resources/definitions/abax_pri3.def.json share/cura/resources/definitions/abax_pri5.def.json share/cura/resources/definitions/abax_titan.def.json @@ -632,10 +699,19 @@ share/cura/resources/definitions/anet3d_et5_x.def.json share/cura/resources/definitions/anycubic_4max.def.json share/cura/resources/definitions/anycubic_chiron.def.json share/cura/resources/definitions/anycubic_i3_mega.def.json +share/cura/resources/definitions/anycubic_i3_mega_s.def.json +share/cura/resources/definitions/anycubic_i3_mega_x.def.json share/cura/resources/definitions/anycubic_kossel.def.json share/cura/resources/definitions/anycubic_kossel_linear_plus.def.json share/cura/resources/definitions/anycubic_kossel_pulley.def.json share/cura/resources/definitions/anycubic_mega_zero.def.json +share/cura/resources/definitions/anycubic_vyper.def.json +share/cura/resources/definitions/arjun300.def.json +share/cura/resources/definitions/arjun_duplication.def.json +share/cura/resources/definitions/arjun_mirrored.def.json +share/cura/resources/definitions/arjunpro300.def.json +share/cura/resources/definitions/arjunpro_duplication.def.json +share/cura/resources/definitions/arjunpro_mirrored.def.json share/cura/resources/definitions/artillery_base.def.json share/cura/resources/definitions/artillery_genius.def.json share/cura/resources/definitions/artillery_sidewinder_x1.def.json @@ -653,6 +729,14 @@ share/cura/resources/definitions/atmat_signal_pro_base.def.json share/cura/resources/definitions/atmat_signal_xl.def.json share/cura/resources/definitions/atmat_signal_xxl.def.json share/cura/resources/definitions/atmat_signal_xxxl.def.json +share/cura/resources/definitions/atom2.def.json +share/cura/resources/definitions/atom3.def.json +share/cura/resources/definitions/atom3_lite.def.json +share/cura/resources/definitions/atomstack_cambrian_base.def.json +share/cura/resources/definitions/atomstack_cambrianmaxe175.def.json +share/cura/resources/definitions/atomstack_cambrianmaxe285.def.json +share/cura/resources/definitions/atomstack_cambrianproe175.def.json +share/cura/resources/definitions/atomstack_cambrianproe285.def.json share/cura/resources/definitions/beamup_l.def.json share/cura/resources/definitions/beamup_s.def.json share/cura/resources/definitions/bfb.def.json @@ -660,6 +744,7 @@ share/cura/resources/definitions/bibo2_dual.def.json share/cura/resources/definitions/biqu_b1.def.json share/cura/resources/definitions/biqu_b1_abl.def.json share/cura/resources/definitions/biqu_base.def.json +share/cura/resources/definitions/biqu_bx_abl.def.json share/cura/resources/definitions/blv_mgn_cube_300.def.json share/cura/resources/definitions/blv_mgn_cube_350.def.json share/cura/resources/definitions/blv_mgn_cube_base.def.json @@ -675,6 +760,8 @@ share/cura/resources/definitions/cartesio.def.json share/cura/resources/definitions/cocoon_create.def.json share/cura/resources/definitions/cocoon_create_modelmaker.def.json share/cura/resources/definitions/cocoon_create_touch.def.json +share/cura/resources/definitions/crazy3dprint_base.def.json +share/cura/resources/definitions/crazy3dprint_cz_300.def.json share/cura/resources/definitions/creality_base.def.json share/cura/resources/definitions/creality_cr-x.def.json share/cura/resources/definitions/creality_cr10.def.json @@ -689,17 +776,28 @@ share/cura/resources/definitions/creality_cr20pro.def.json share/cura/resources/definitions/creality_cr6se.def.json share/cura/resources/definitions/creality_ender2.def.json share/cura/resources/definitions/creality_ender3.def.json -share/cura/resources/definitions/creatable_d3.def.json share/cura/resources/definitions/creality_ender3pro.def.json share/cura/resources/definitions/creality_ender4.def.json share/cura/resources/definitions/creality_ender5.def.json share/cura/resources/definitions/creality_ender5plus.def.json +share/cura/resources/definitions/creality_ender6.def.json +share/cura/resources/definitions/creasee_cs20.def.json +share/cura/resources/definitions/creasee_cs30.def.json +share/cura/resources/definitions/creasee_cs50spro.def.json +share/cura/resources/definitions/creasee_phoenix.def.json +share/cura/resources/definitions/creasee_skywalker.def.json +share/cura/resources/definitions/creatable_d3.def.json +share/cura/resources/definitions/cremaker_common.def.json +share/cura/resources/definitions/cremaker_m_v1.def.json +share/cura/resources/definitions/cremaker_m_v2.def.json +share/cura/resources/definitions/cremaker_s_v1.def.json share/cura/resources/definitions/cubicon_3dp_110f.def.json share/cura/resources/definitions/cubicon_3dp_210f.def.json share/cura/resources/definitions/cubicon_3dp_310f.def.json share/cura/resources/definitions/cubicon_common.def.json share/cura/resources/definitions/cubicon_dual_pro_a30.def.json share/cura/resources/definitions/cubicon_style_neo_a22.def.json +share/cura/resources/definitions/cubicon_style_neo_a31.def.json share/cura/resources/definitions/cubicon_style_plus_a15.def.json share/cura/resources/definitions/custom.def.json share/cura/resources/definitions/dagoma_delta.def.json @@ -726,25 +824,39 @@ share/cura/resources/definitions/diy220.def.json share/cura/resources/definitions/dxu.def.json share/cura/resources/definitions/dxu_dual.def.json share/cura/resources/definitions/easyarts_ares.def.json +share/cura/resources/definitions/eazao_zero.def.json +share/cura/resources/definitions/eryone_er20.def.json +share/cura/resources/definitions/eryone_thinker.def.json share/cura/resources/definitions/erzay3d.def.json share/cura/resources/definitions/fabtotum.def.json share/cura/resources/definitions/fabxpro.def.json +share/cura/resources/definitions/farm2.def.json +share/cura/resources/definitions/farm2_ce.def.json share/cura/resources/definitions/fdmextruder.def.json share/cura/resources/definitions/fdmprinter.def.json share/cura/resources/definitions/felixpro2dual.def.json share/cura/resources/definitions/felixtec4dual.def.json +share/cura/resources/definitions/flashforge_base.def.json +share/cura/resources/definitions/flashforge_dreamer_nx.def.json +share/cura/resources/definitions/flsun_q5.def.json share/cura/resources/definitions/flsun_qq.def.json share/cura/resources/definitions/flsun_qq_s.def.json +share/cura/resources/definitions/flsun_sr.def.json share/cura/resources/definitions/flyingbear_base.def.json share/cura/resources/definitions/flyingbear_ghost_4s.def.json share/cura/resources/definitions/flyingbear_ghost_5.def.json share/cura/resources/definitions/folgertech_FT-5.def.json share/cura/resources/definitions/fusedform_300.def.json +share/cura/resources/definitions/fusedform_300_doppia.def.json share/cura/resources/definitions/fusedform_600.def.json +share/cura/resources/definitions/fusedform_600_doppia.def.json share/cura/resources/definitions/fusedform_600plus.def.json +share/cura/resources/definitions/fusedform_600plus_doppia.def.json share/cura/resources/definitions/fusedform_base.def.json +share/cura/resources/definitions/fusedform_doppia_base.def.json share/cura/resources/definitions/fusedform_mini.def.json share/cura/resources/definitions/fusedform_std.def.json +share/cura/resources/definitions/fusedform_std_doppia.def.json share/cura/resources/definitions/geeetech_A10.def.json share/cura/resources/definitions/geeetech_A10M.def.json share/cura/resources/definitions/geeetech_A10T.def.json @@ -754,65 +866,130 @@ share/cura/resources/definitions/geeetech_A20T.def.json share/cura/resources/definitions/geeetech_a30.def.json share/cura/resources/definitions/gmax15plus.def.json share/cura/resources/definitions/gmax15plus_dual.def.json +share/cura/resources/definitions/goofoo_base.def.json +share/cura/resources/definitions/goofoo_e-one.def.json +share/cura/resources/definitions/goofoo_far.def.json +share/cura/resources/definitions/goofoo_gemini.def.json +share/cura/resources/definitions/goofoo_giant.def.json +share/cura/resources/definitions/goofoo_max.def.json +share/cura/resources/definitions/goofoo_mido.def.json +share/cura/resources/definitions/goofoo_miniplus.def.json +share/cura/resources/definitions/goofoo_near.def.json +share/cura/resources/definitions/goofoo_nova.def.json +share/cura/resources/definitions/goofoo_open.def.json +share/cura/resources/definitions/goofoo_plus.def.json +share/cura/resources/definitions/goofoo_small.def.json +share/cura/resources/definitions/goofoo_t-one.def.json +share/cura/resources/definitions/goofoo_tiny.def.json +share/cura/resources/definitions/goofoo_tinyplus.def.json share/cura/resources/definitions/grr_neo.def.json share/cura/resources/definitions/hellbot_adonis.def.json +share/cura/resources/definitions/hellbot_hidra.def.json +share/cura/resources/definitions/hellbot_hidra_plus.def.json +share/cura/resources/definitions/hellbot_magna_2_230.def.json +share/cura/resources/definitions/hellbot_magna_2_230_dual.def.json +share/cura/resources/definitions/hellbot_magna_2_300.def.json +share/cura/resources/definitions/hellbot_magna_2_300_dual.def.json +share/cura/resources/definitions/hellbot_magna_2_400.def.json +share/cura/resources/definitions/hellbot_magna_2_400_dual.def.json +share/cura/resources/definitions/hellbot_magna_2_500.def.json +share/cura/resources/definitions/hellbot_magna_2_500_dual.def.json share/cura/resources/definitions/hellbot_magna_I.def.json share/cura/resources/definitions/hellbot_magna_dual.def.json share/cura/resources/definitions/helloBEEprusa.def.json share/cura/resources/definitions/hms434.def.json +share/cura/resources/definitions/ideagen3D_sapphire_plus.def.json share/cura/resources/definitions/imade3d_jellybox.def.json share/cura/resources/definitions/imade3d_jellybox_2.def.json share/cura/resources/definitions/imade3d_jellybox_root.def.json +share/cura/resources/definitions/inat_base.def.json +share/cura/resources/definitions/inat_proton_x_rail.def.json +share/cura/resources/definitions/inat_proton_x_rod.def.json share/cura/resources/definitions/innovo_inventor.def.json share/cura/resources/definitions/jgaurora_a1.def.json share/cura/resources/definitions/jgaurora_a3s.def.json share/cura/resources/definitions/jgaurora_a5.def.json +share/cura/resources/definitions/jgaurora_a6.def.json share/cura/resources/definitions/jgaurora_jgmaker_magic.def.json share/cura/resources/definitions/jgaurora_z_603s.def.json share/cura/resources/definitions/julia.def.json share/cura/resources/definitions/kemiq_q2_beta.def.json share/cura/resources/definitions/kemiq_q2_gama.def.json share/cura/resources/definitions/key3d_tyro.def.json +share/cura/resources/definitions/kingroon_base.def.json +share/cura/resources/definitions/kingroon_kp3.def.json +share/cura/resources/definitions/kingroon_kp3s.def.json +share/cura/resources/definitions/koonovo_base.def.json +share/cura/resources/definitions/koonovo_elf.def.json +share/cura/resources/definitions/koonovo_kn3.def.json +share/cura/resources/definitions/koonovo_kn5.def.json +share/cura/resources/definitions/koonovo_pyramid.def.json +share/cura/resources/definitions/kosher.def.json +share/cura/resources/definitions/kosher_duplication.def.json +share/cura/resources/definitions/kosher_mirror.def.json share/cura/resources/definitions/kossel_mini.def.json share/cura/resources/definitions/kossel_pro.def.json share/cura/resources/definitions/kupido.def.json share/cura/resources/definitions/leapfrog_bolt_pro.def.json share/cura/resources/definitions/leapfrog_creatr_hs.def.json share/cura/resources/definitions/leapfrog_creatr_hs_xl.def.json +share/cura/resources/definitions/liquid.def.json +share/cura/resources/definitions/longer_base.def.json +share/cura/resources/definitions/longer_cube2.def.json +share/cura/resources/definitions/longer_lk1.def.json +share/cura/resources/definitions/longer_lk1plus.def.json +share/cura/resources/definitions/longer_lk1pro.def.json +share/cura/resources/definitions/longer_lk4.def.json +share/cura/resources/definitions/longer_lk4pro.def.json +share/cura/resources/definitions/longer_lk5.def.json +share/cura/resources/definitions/longer_lk5pro.def.json share/cura/resources/definitions/lotmaxx_sc10.def.json -share/cura/resources/definitions/mendel90.def.json share/cura/resources/definitions/lotmaxx_sc20.def.json share/cura/resources/definitions/lotmaxx_sc60.def.json +share/cura/resources/definitions/lulzbot_mini_2_common.def.json +share/cura/resources/definitions/lulzbot_mini_2_se.def.json +share/cura/resources/definitions/lulzbot_mini_2_sl.def.json +share/cura/resources/definitions/lulzbot_taz_pro_common.def.json +share/cura/resources/definitions/lulzbot_taz_pro_dual.def.json share/cura/resources/definitions/makeR_pegasus.def.json share/cura/resources/definitions/makeR_prusa_tairona_i3.def.json share/cura/resources/definitions/makeblock_mcreate.def.json share/cura/resources/definitions/makeit_pro_l.def.json share/cura/resources/definitions/makeit_pro_m.def.json share/cura/resources/definitions/makeit_pro_mx.def.json +share/cura/resources/definitions/maker_made_300x.def.json share/cura/resources/definitions/maker_starter.def.json share/cura/resources/definitions/makerbotreplicator.def.json share/cura/resources/definitions/malyan_m180.def.json share/cura/resources/definitions/malyan_m200.def.json share/cura/resources/definitions/mankati_fullscale_xt_plus.def.json share/cura/resources/definitions/mbot3d_grid2plus.def.json -share/cura/resources/definitions/mbot3d_grid4.def.json share/cura/resources/definitions/mbot3d_grid2plus_dual.def.json +share/cura/resources/definitions/mbot3d_grid4.def.json share/cura/resources/definitions/mbot3d_grid4_dual.def.json +share/cura/resources/definitions/mendel90.def.json +share/cura/resources/definitions/mingda_base.def.json +share/cura/resources/definitions/mingda_d2.def.json +share/cura/resources/definitions/mingda_d3pro.def.json +share/cura/resources/definitions/mingda_d4pro.def.json +share/cura/resources/definitions/mingda_rock3.def.json share/cura/resources/definitions/monoprice_select_mini_v1.def.json share/cura/resources/definitions/monoprice_select_mini_v2.def.json share/cura/resources/definitions/monoprice_ultimate.def.json share/cura/resources/definitions/mp_mini_delta.def.json +share/cura/resources/definitions/mp_mini_delta_v2.def.json share/cura/resources/definitions/nwa3d_a31.def.json share/cura/resources/definitions/nwa3d_a5.def.json share/cura/resources/definitions/ord.def.json +share/cura/resources/definitions/pbr3d_g1.def.json share/cura/resources/definitions/peopoly_moai.def.json share/cura/resources/definitions/predator.def.json share/cura/resources/definitions/printrbot_play.def.json share/cura/resources/definitions/printrbot_play_heated.def.json share/cura/resources/definitions/printrbot_simple.def.json -share/cura/resources/definitions/prusa_i3.def.json share/cura/resources/definitions/printrbot_simple_extended.def.json share/cura/resources/definitions/printrbot_simple_makers_kit.def.json +share/cura/resources/definitions/prusa_i3.def.json share/cura/resources/definitions/prusa_i3_mk2.def.json share/cura/resources/definitions/prusa_i3_mk3.def.json share/cura/resources/definitions/prusa_i3_xl.def.json @@ -821,38 +998,59 @@ share/cura/resources/definitions/raise3D_N2_dual.def.json share/cura/resources/definitions/raise3D_N2_plus_dual.def.json share/cura/resources/definitions/raise3D_N2_plus_single.def.json share/cura/resources/definitions/raise3D_N2_single.def.json +share/cura/resources/definitions/renkforce_basic3.def.json +share/cura/resources/definitions/renkforce_pro3.def.json +share/cura/resources/definitions/renkforce_pro6.def.json share/cura/resources/definitions/renkforce_rf100.def.json share/cura/resources/definitions/renkforce_rf100_v2.def.json share/cura/resources/definitions/renkforce_rf100_xl.def.json -share/cura/resources/definitions/tam.def.json share/cura/resources/definitions/rigid3d.def.json share/cura/resources/definitions/rigid3d_3rdgen.def.json share/cura/resources/definitions/rigid3d_base.def.json share/cura/resources/definitions/rigid3d_hobby.def.json share/cura/resources/definitions/rigid3d_mucit.def.json +share/cura/resources/definitions/rigid3d_mucit2.def.json share/cura/resources/definitions/rigid3d_zero.def.json share/cura/resources/definitions/rigid3d_zero2.def.json share/cura/resources/definitions/rigidbot.def.json share/cura/resources/definitions/rigidbot_big.def.json share/cura/resources/definitions/robo_3d_r1.def.json +share/cura/resources/definitions/seckit_skgo.def.json +share/cura/resources/definitions/seckit_sktank.def.json share/cura/resources/definitions/seemecnc_artemis.def.json share/cura/resources/definitions/seemecnc_v32.def.json share/cura/resources/definitions/skriware_2.def.json share/cura/resources/definitions/smoothie.def.json +share/cura/resources/definitions/snapmaker2.def.json +share/cura/resources/definitions/snapmaker2_A150.def.json +share/cura/resources/definitions/snapmaker2_A250.def.json +share/cura/resources/definitions/snapmaker2_A350.def.json share/cura/resources/definitions/stereotech_start.def.json share/cura/resources/definitions/stereotech_ste320.def.json share/cura/resources/definitions/strateo3d.def.json +share/cura/resources/definitions/stream20dual_mk2.def.json +share/cura/resources/definitions/stream20pro_mk2.def.json +share/cura/resources/definitions/stream30dual_mk2.def.json +share/cura/resources/definitions/stream30pro_mk2.def.json +share/cura/resources/definitions/stream30ultra.def.json +share/cura/resources/definitions/stream30ultrasc.def.json share/cura/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +share/cura/resources/definitions/syndaveraxi.def.json +share/cura/resources/definitions/syndaveraxi2.def.json +share/cura/resources/definitions/tam.def.json share/cura/resources/definitions/tevo_blackwidow.def.json share/cura/resources/definitions/tevo_tarantula.def.json share/cura/resources/definitions/tevo_tarantula_pro.def.json share/cura/resources/definitions/tevo_tornado.def.json share/cura/resources/definitions/tinyboy_e10.def.json share/cura/resources/definitions/tinyboy_e16.def.json +share/cura/resources/definitions/tinyboy_fabrikator15.def.json share/cura/resources/definitions/tinyboy_ra20.def.json share/cura/resources/definitions/tizyx_evy.def.json share/cura/resources/definitions/tizyx_evy_dual.def.json share/cura/resources/definitions/tizyx_k25.def.json +share/cura/resources/definitions/trimaker_cosmosII.def.json +share/cura/resources/definitions/trimaker_nebula.def.json share/cura/resources/definitions/tronxy_d01.def.json share/cura/resources/definitions/tronxy_x.def.json share/cura/resources/definitions/tronxy_x5sa.def.json @@ -861,6 +1059,11 @@ share/cura/resources/definitions/tronxy_x5sa_500.def.json share/cura/resources/definitions/tronxy_xy2.def.json share/cura/resources/definitions/tronxy_xy2pro.def.json share/cura/resources/definitions/tronxy_xy3.def.json +share/cura/resources/definitions/two_trees_base.def.json +share/cura/resources/definitions/two_trees_bluer.def.json +share/cura/resources/definitions/two_trees_bluerplus.def.json +share/cura/resources/definitions/two_trees_sapphireplus.def.json +share/cura/resources/definitions/two_trees_sapphirepro.def.json share/cura/resources/definitions/ubuild-3d_mr_bot_280.def.json share/cura/resources/definitions/ultimaker.def.json share/cura/resources/definitions/ultimaker2.def.json @@ -889,6 +1092,7 @@ share/cura/resources/definitions/vertex_delta_k8800.def.json share/cura/resources/definitions/vertex_k8400.def.json share/cura/resources/definitions/vertex_k8400_dual.def.json share/cura/resources/definitions/vertex_nano_k8600.def.json +share/cura/resources/definitions/voron0_120.def.json share/cura/resources/definitions/voron2_250.def.json share/cura/resources/definitions/voron2_300.def.json share/cura/resources/definitions/voron2_350.def.json @@ -903,16 +1107,32 @@ share/cura/resources/definitions/wanhao_duplicator5Smini.def.json share/cura/resources/definitions/wanhao_i3.def.json share/cura/resources/definitions/wanhao_i3mini.def.json share/cura/resources/definitions/wanhao_i3plus.def.json +share/cura/resources/definitions/weedo_x40.def.json share/cura/resources/definitions/winbo_dragonl4.def.json share/cura/resources/definitions/winbo_mini2.def.json share/cura/resources/definitions/winbo_superhelper105.def.json share/cura/resources/definitions/winbo_superhelper155.def.json +share/cura/resources/definitions/xyzprinting_base.def.json +share/cura/resources/definitions/xyzprinting_da_vinci_1p0_pro.def.json +share/cura/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json +share/cura/resources/definitions/xyzprinting_da_vinci_jr_pro_xeplus.def.json +share/cura/resources/definitions/xyzprinting_da_vinci_jr_pro_xplus.def.json +share/cura/resources/definitions/xyzprinting_da_vinci_jr_w_pro.def.json +share/cura/resources/definitions/xyzprinting_da_vinci_super.def.json share/cura/resources/definitions/z-bolt_classic.def.json share/cura/resources/definitions/z-bolt_plus.def.json +share/cura/resources/definitions/zav_base.def.json +share/cura/resources/definitions/zav_big.def.json +share/cura/resources/definitions/zav_bigplus.def.json +share/cura/resources/definitions/zav_l.def.json +share/cura/resources/definitions/zav_max.def.json +share/cura/resources/definitions/zav_maxpro.def.json +share/cura/resources/definitions/zav_mini.def.json share/cura/resources/definitions/zone3d_printer.def.json share/cura/resources/definitions/zyyx_agile.def.json share/cura/resources/extruders/101Hero_extruder_0.def.json share/cura/resources/extruders/3dator_extruder_0.def.json +share/cura/resources/extruders/3di_base_extruder_0.def.json share/cura/resources/extruders/3dtech_semi_professional_extruder_0.def.json share/cura/resources/extruders/I3MetalMotion_extruder_0.def.json share/cura/resources/extruders/Mark2_extruder1.def.json @@ -920,6 +1140,7 @@ share/cura/resources/extruders/Mark2_extruder2.def.json share/cura/resources/extruders/SV01_extruder_0.def.json share/cura/resources/extruders/SV02_extruder_0.def.json share/cura/resources/extruders/SV02_extruder_1.def.json +share/cura/resources/extruders/SV03_extruder_0.def.json share/cura/resources/extruders/abax_pri3_extruder_0.def.json share/cura/resources/extruders/abax_pri5_extruder_0.def.json share/cura/resources/extruders/abax_titan_extruder_0.def.json @@ -930,14 +1151,30 @@ share/cura/resources/extruders/anet3d_extruder_0.def.json share/cura/resources/extruders/anycubic_4max_extruder_0.def.json share/cura/resources/extruders/anycubic_chiron_extruder_0.def.json share/cura/resources/extruders/anycubic_i3_mega_extruder_0.def.json +share/cura/resources/extruders/anycubic_i3_mega_s_extruder_0.def.json share/cura/resources/extruders/anycubic_kossel_extruder_0.def.json share/cura/resources/extruders/anycubic_mega_zero_extruder_0.def.json +share/cura/resources/extruders/anycubic_vyper_extruder_0.def.json +share/cura/resources/extruders/arjun_dm_extruder.def.json +share/cura/resources/extruders/arjun_extruder_0.def.json +share/cura/resources/extruders/arjun_extruder_1.def.json +share/cura/resources/extruders/arjun_mm_extruder.def.json +share/cura/resources/extruders/arjunpro_dm_extruder.def.json +share/cura/resources/extruders/arjunpro_extruder_0.def.json +share/cura/resources/extruders/arjunpro_extruder_1.def.json +share/cura/resources/extruders/arjunpro_mm_extruder.def.json share/cura/resources/extruders/artillery_base_extruder_0.def.json share/cura/resources/extruders/atmat_signal_pro_extruder_left.def.json -share/cura/resources/extruders/bfb_extruder_0.def.json share/cura/resources/extruders/atmat_signal_pro_extruder_right.def.json +share/cura/resources/extruders/atom2_extruder_0.def.json +share/cura/resources/extruders/atom3_extruder_0.def.json +share/cura/resources/extruders/atomstack_cambrianmaxe175_extruder_0.def.json +share/cura/resources/extruders/atomstack_cambrianmaxe285_extruder_0.def.json +share/cura/resources/extruders/atomstack_cambrianproe175_extruder_0.def.json +share/cura/resources/extruders/atomstack_cambrianproe285_extruder_0.def.json share/cura/resources/extruders/beamup_l_extruder_0.def.json share/cura/resources/extruders/beamup_s_extruder_0.def.json +share/cura/resources/extruders/bfb_extruder_0.def.json share/cura/resources/extruders/bibo2_dual_extruder_0.def.json share/cura/resources/extruders/bibo2_dual_extruder_1.def.json share/cura/resources/extruders/biqu_base_extruder_0.def.json @@ -962,14 +1199,22 @@ share/cura/resources/extruders/cocoon_create_modelmaker_extruder_0.def.json share/cura/resources/extruders/cocoon_create_touch_extruder_0.def.json share/cura/resources/extruders/cr-x_extruder_0.def.json share/cura/resources/extruders/cr-x_extruder_1.def.json +share/cura/resources/extruders/crazy3dprint_cz300_extruder_0.def.json share/cura/resources/extruders/creality_base_extruder_0.def.json +share/cura/resources/extruders/creasee_cs50spro_extruder.def.json +share/cura/resources/extruders/creasee_extruder_0.def.json +share/cura/resources/extruders/creasee_extruder_1.def.json +share/cura/resources/extruders/creasee_phoenix_extruder.def.json +share/cura/resources/extruders/creasee_skywalker_extruder.def.json share/cura/resources/extruders/creatable_d3_extruder_0.def.json +share/cura/resources/extruders/cremaker_extruder_0.def.json share/cura/resources/extruders/cubicon_3dp_110f_extruder_0.def.json share/cura/resources/extruders/cubicon_3dp_210f_extruder_0.def.json share/cura/resources/extruders/cubicon_3dp_310f_extruder_0.def.json share/cura/resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json share/cura/resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json share/cura/resources/extruders/cubicon_style_neo_a22_extruder_0.def.json +share/cura/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json share/cura/resources/extruders/cubicon_style_plus_a15_extruder_0.def.json share/cura/resources/extruders/custom_extruder_1.def.json share/cura/resources/extruders/custom_extruder_2.def.json @@ -1002,25 +1247,35 @@ share/cura/resources/extruders/deltacomb_dc20flux_extruder_3.def.json share/cura/resources/extruders/deltacomb_dc30dual_extruder_0.def.json share/cura/resources/extruders/deltacomb_dc30dual_extruder_1.def.json share/cura/resources/extruders/deltacomb_dc30flux_extruder_0.def.json -share/cura/resources/extruders/diy220_extruder_0.def.json share/cura/resources/extruders/deltacomb_dc30flux_extruder_1.def.json share/cura/resources/extruders/deltacomb_dc30flux_extruder_2.def.json share/cura/resources/extruders/deltacomb_dc30flux_extruder_3.def.json +share/cura/resources/extruders/diy220_extruder_0.def.json share/cura/resources/extruders/dxu_extruder1.def.json share/cura/resources/extruders/dxu_extruder2.def.json share/cura/resources/extruders/easyarts_ares_extruder_0.def.json +share/cura/resources/extruders/eazao_zero_extruder_0.def.json +share/cura/resources/extruders/eryone_er20_extruder_0.def.json +share/cura/resources/extruders/eryone_thinker_extruder_0.def.json share/cura/resources/extruders/erzay3d_extruder_0.def.json share/cura/resources/extruders/fabtotum_extruder_0.def.json share/cura/resources/extruders/fabxpro_extruder_0.def.json +share/cura/resources/extruders/farm2_ce_extruder_1.def.json +share/cura/resources/extruders/farm2_extruder_1.def.json share/cura/resources/extruders/felixpro2_dual_extruder_0.def.json share/cura/resources/extruders/felixpro2_dual_extruder_1.def.json share/cura/resources/extruders/felixtec4_dual_extruder_0.def.json share/cura/resources/extruders/felixtec4_dual_extruder_1.def.json +share/cura/resources/extruders/flashforge_dreamernx_extruder_0.def.json +share/cura/resources/extruders/flsun_q5_extruder.def.json share/cura/resources/extruders/flsun_qq_extruder.def.json share/cura/resources/extruders/flsun_qq_s_extruder_0.def.json +share/cura/resources/extruders/flsun_sr_extruder_0.def.json share/cura/resources/extruders/flyingbear_base_extruder_0.def.json share/cura/resources/extruders/folgertech_FT-5_extruder_0.def.json share/cura/resources/extruders/fusedform_base_extruder_0.def.json +share/cura/resources/extruders/fusedform_doppia_base_extruder_0.def.json +share/cura/resources/extruders/fusedform_doppia_base_extruder_1.def.json share/cura/resources/extruders/geeetech_A10M_1.def.json share/cura/resources/extruders/geeetech_A10M_2.def.json share/cura/resources/extruders/geeetech_A10T_1.def.json @@ -1037,10 +1292,31 @@ share/cura/resources/extruders/geeetech_a30_extruder_0.def.json share/cura/resources/extruders/gmax15plus_dual_extruder_0.def.json share/cura/resources/extruders/gmax15plus_dual_extruder_1.def.json share/cura/resources/extruders/gmax15plus_extruder_0.def.json +share/cura/resources/extruders/goofoo_base_extruder.def.json +share/cura/resources/extruders/goofoo_gemini_1st.def.json +share/cura/resources/extruders/goofoo_gemini_2st.def.json +share/cura/resources/extruders/goofoo_tone_1st.def.json +share/cura/resources/extruders/goofoo_tone_2st.def.json share/cura/resources/extruders/grr_neo_extruder_0.def.json share/cura/resources/extruders/hBp_extruder_left.def.json share/cura/resources/extruders/hBp_extruder_right.def.json share/cura/resources/extruders/hellbot_adonis_extruder.def.json +share/cura/resources/extruders/hellbot_hidra_extruder_0.def.json +share/cura/resources/extruders/hellbot_hidra_extruder_1.def.json +share/cura/resources/extruders/hellbot_hidra_plus_extruder_0.def.json +share/cura/resources/extruders/hellbot_hidra_plus_extruder_1.def.json +share/cura/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json +share/cura/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json +share/cura/resources/extruders/hellbot_magna_2_230_extruder_0.def.json +share/cura/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json +share/cura/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json +share/cura/resources/extruders/hellbot_magna_2_300_extruder_0.def.json +share/cura/resources/extruders/hellbot_magna_2_400_dual_extruder_0.def.json +share/cura/resources/extruders/hellbot_magna_2_400_dual_extruder_1.def.json +share/cura/resources/extruders/hellbot_magna_2_400_extruder_0.def.json +share/cura/resources/extruders/hellbot_magna_2_500_dual_extruder_0.def.json +share/cura/resources/extruders/hellbot_magna_2_500_dual_extruder_1.def.json +share/cura/resources/extruders/hellbot_magna_2_500_extruder_0.def.json share/cura/resources/extruders/hellbot_magna_dual_extruder_1.def.json share/cura/resources/extruders/hellbot_magna_dual_extruder_2.def.json share/cura/resources/extruders/hellbot_magna_i_extruder.def.json @@ -1052,18 +1328,31 @@ share/cura/resources/extruders/hms434_tool_5.def.json *** 3842 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208042300.274N0HVR097292>