Merge branch 'main' into CURA-11403_save-PAP

conanfile.py

@@ -350,6 +350,7 @@ class CuraConan(ConanFile):
         self.requires("cpython/3.10.4@ultimaker/stable")
         self.requires("clipper/6.4.2@ultimaker/stable")
         self.requires("openssl/3.2.0")
+        self.requires("protobuf/3.21.12")
         self.requires("boost/1.82.0")
         self.requires("spdlog/1.12.0")
         self.requires("fmt/10.1.1")

resources/definitions/ultimaker_method_base.def.json

@@ -28,7 +28,6 @@
             "generic_hips_175",
             "generic_pc_175",
             "ultimaker_rapidrinse_175",
-            "ultimaker_sr30_175",
             "generic_tpu_175",
             "goofoo_",
             "ideagen3D_",

resources/definitions/ultimaker_methodx.def.json

@@ -35,7 +35,6 @@
             "generic_nylon_175",
             "generic_hips_175",
             "generic_pc_175",
-            "ultimaker_sr30_175",
             "generic_tpu_175",
             "goofoo_",
             "ideagen3D_",

resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1C
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+

resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1C
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+

resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1XA
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+

resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg

@@ -0,0 +1,17 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_sr30_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 2XA
+
+[values]
+infill_sparse_density = 100
+

resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = LABS
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+

resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = LABS
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+

resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg

@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodxl
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1C
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+