Merge branch 'main' into main

.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
+    secrets: inherit

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"

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

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",

resources/definitions/creality_ender3v3ke.def.json

@@ -49,7 +49,7 @@
         "material_print_temp_wait": { "default_value": false },
         "retraction_amount": { "default_value": 0.8 },
         "retraction_combing": { "value": "no_outer_surfaces" },
-        "retraction_combing_max_distance": { "default_value": 5.0 },
+        "retraction_combing_max_distance": { "value": 5.0 },
         "retraction_extrusion_window": { "value": "retraction_amount" },
         "retraction_min_travel": { "value": 2.0 },
         "retraction_speed": { "default_value": 40 },

resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg

@@ -5,7 +5,7 @@ version = 4
 
 [metadata]
 hardware_type = nozzle
-setting_version = 22
+setting_version = 23
 type = variant
 
 [values]

resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg

@@ -5,7 +5,7 @@ version = 4
 
 [metadata]
 hardware_type = nozzle
-setting_version = 22
+setting_version = 23
 type = variant
 
 [values]

resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg

@@ -5,7 +5,7 @@ version = 4
 
 [metadata]
 hardware_type = nozzle
-setting_version = 22
+setting_version = 23
 type = variant
 
 [values]

resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg

@@ -5,7 +5,7 @@ version = 4
 
 [metadata]
 hardware_type = nozzle
-setting_version = 22
+setting_version = 23
 type = variant
 
 [values]

resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg

@@ -5,7 +5,7 @@ version = 4
 
 [metadata]
 hardware_type = nozzle
-setting_version = 22
+setting_version = 23
 type = variant
 
 [values]

resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg

@@ -5,7 +5,7 @@ version = 4
 
 [metadata]
 hardware_type = nozzle
-setting_version = 22
+setting_version = 23
 type = variant
 
 [values]

resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg

@@ -5,7 +5,7 @@ version = 4
 
 [metadata]
 hardware_type = nozzle
-setting_version = 22
+setting_version = 23
 type = variant
 
 [values]