From 9eace13dc92ccae2b6d4bc98d153d858def9d598 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 11 Mar 2024 09:04:39 +0100 Subject: [PATCH 1/3] Update version to 5.8 alpha --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index fdfc2dec11..24f9abf294 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,4 +1,4 @@ -version: "5.7.0-alpha.1" +version: "5.8.0-alpha.0" requirements: - "uranium/(latest)@ultimaker/testing" - "curaengine/(latest)@ultimaker/testing" From 2048b040241e91cea6c8d6c722255e3712bae6f2 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Tue, 12 Mar 2024 18:03:55 +0100 Subject: [PATCH 2/3] Remove solid intent mode for SR-30 (support material) PP-447 --- ...methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg | 17 ----------------- ...ethodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg | 17 ----------------- 2 files changed, 34 deletions(-) delete mode 100644 resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg delete mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg diff --git a/resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg deleted file mode 100644 index a833556bd8..0000000000 --- a/resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[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 - diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg deleted file mode 100644 index 01a55c85a4..0000000000 --- a/resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -definition = ultimaker_methodxl -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 - From a67a61298e63540b4c80a1879fc78db1fb7ea896 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Wed, 13 Mar 2024 09:22:49 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Undo changes to conandata.yml Co-authored-by: HellAholic --- conandata.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conandata.yml b/conandata.yml index 24f9abf294..0d0452ebbe 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,14 +1,14 @@ -version: "5.8.0-alpha.0" +version: "5.7.0-beta.0" requirements: - - "uranium/(latest)@ultimaker/testing" - - "curaengine/(latest)@ultimaker/testing" - - "cura_binary_data/(latest)@ultimaker/testing" - - "fdm_materials/(latest)@ultimaker/testing" + - "uranium/(latest)@ultimaker/stable" + - "curaengine/(latest)@ultimaker/stable" + - "cura_binary_data/(latest)@ultimaker/stable" + - "fdm_materials/(latest)@ultimaker/stable" - "curaengine_plugin_gradual_flow/0.1.0-beta.3" - "dulcificum/latest@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - - "curaengine_grpc_definitions/(latest)@ultimaker/testing" + - "curaengine_grpc_definitions/0.2.0" requirements_internal: - "fdm_materials/(latest)@internal/testing" - "cura_private_data/(latest)@internal/testing"