Merge branch 'main' into CURA-12091_fix_infill_plugin_start_crash

Ultimaker · Aug 30, 2024 · 0c07609 · 0c07609
2 parents 19ac42f + 11f1608
commit 0c07609
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
@@ -1084,9 +1084,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 },