diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9c940330e1..ffc9b27b8b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,7 +40,6 @@ on: options: - self-hosted-X64 - self-hosted-ARM64 - - macos-11 - macos-12 jobs: @@ -53,4 +52,4 @@ jobs: staging: ${{ inputs.staging }} architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} - secrets: inherit \ No newline at end of file + secrets: inherit diff --git a/conandata.yml b/conandata.yml index 89ceba3d30..cf94aee8ac 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,11 +5,10 @@ requirements: - "curaengine/(latest)@ultimaker/testing" - "cura_binary_data/(latest)@ultimaker/testing" - "fdm_materials/(latest)@ultimaker/testing" - - "curaengine_plugin_gradual_flow/0.1.0-beta.3" + - "curaengine_plugin_gradual_flow/0.1.1-beta.3" - "dulcificum/latest@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - - "curaengine_grpc_definitions/0.2.0" - "native_cad_plugin/2.0.0" requirements_internal: - "fdm_materials/(latest)@internal/testing" diff --git a/conanfile.py b/conanfile.py index 221d4ea288..787c26785f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -329,7 +329,6 @@ class CuraConan(ConanFile): self.options["cpython"].shared = True self.options["boost"].header_only = True if self.settings.os == "Linux": - self.options["curaengine_grpc_definitions"].shared = True self.options["openssl"].shared = True if self.conf.get("user.curaengine:sentry_url", "", check_type=str) != "": self.options["curaengine"].enable_sentry = True diff --git a/cura/Machines/Models/IntentTranslations.py b/cura/Machines/Models/IntentTranslations.py index 3a2afcb7c5..aab902204a 100644 --- a/cura/Machines/Models/IntentTranslations.py +++ b/cura/Machines/Models/IntentTranslations.py @@ -24,6 +24,10 @@ intent_translations["quick"] = { "name": catalog.i18nc("@label", "Draft"), "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") } +intent_translations["annealing"] = { + "name": catalog.i18nc("@label", "Annealing"), + "description": catalog.i18nc("@text", "The annealing profile requires post-processing in an oven after the print is finished. This profile retains the dimensional accuracy of the printed part after annealing and improves strength, stiffness, and thermal resistance.") +} intent_translations["solid"] = { "name": catalog.i18nc("@label", "Solid"), "description": catalog.i18nc("@text",