Merge branch 'main' into CURA-11761_container_stack_cache

Ultimaker · Sep 5, 2024 · ac8176d · ac8176d
2 parents d025255 + acb5563
commit ac8176d
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 6 deletions.
diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
@@ -1090,9 +1090,8 @@ def _addSettingElement(self, builder, instance):
  # Skip material properties (eg diameter) or metadata (eg GUID)
  return
 
- truth_map = { True: "yes", False: "no" }
- if tag_name != "cura:setting" and instance.value in truth_map:
- data = truth_map[instance.value]
+ if tag_name != "cura:setting" and isinstance(instance.value, bool):
+ data = "yes" if instance.value else "no"
  else:
  data = str(instance.value)
 

diff --git a/resources/definitions/creality_ender3v3se.def.json b/resources/definitions/creality_ender3v3se.def.json
@@ -36,9 +36,9 @@
  },
  "machine_heated_bed": { "default_value": true },
  "machine_height": { "default_value": 250 },
- "machine_max_acceleration_e": { "value": 5000 },
- "machine_max_acceleration_x": { "value": 5000.0 },
- "machine_max_acceleration_y": { "value": 5000.0 },
+ "machine_max_acceleration_e": { "value": 2500 },
+ "machine_max_acceleration_x": { "value": 2500.0 },
+ "machine_max_acceleration_y": { "value": 2500.0 },
  "machine_max_acceleration_z": { "value": 500.0 },
  "machine_max_feedrate_e": { "value": 100 },
  "machine_max_feedrate_x": { "value": 500 },

diff --git a/resources/variants/creality/creality_crm4_0.2.inst.cfg b/resources/variants/creality/creality_crm4_0.2.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.2mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/creality/creality_crm4_0.3.inst.cfg b/resources/variants/creality/creality_crm4_0.3.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.3mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.3
+
diff --git a/resources/variants/creality/creality_crm4_0.4.inst.cfg b/resources/variants/creality/creality_crm4_0.4.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.4mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/creality/creality_crm4_0.5.inst.cfg b/resources/variants/creality/creality_crm4_0.5.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.5mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.5
+
diff --git a/resources/variants/creality/creality_crm4_0.6.inst.cfg b/resources/variants/creality/creality_crm4_0.6.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.6mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/creality/creality_crm4_0.8.inst.cfg b/resources/variants/creality/creality_crm4_0.8.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.8mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+
diff --git a/resources/variants/creality/creality_crm4_1.0.inst.cfg b/resources/variants/creality/creality_crm4_1.0.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 1.0mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 1.0
+