3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

Browse source
This commit is contained in:
Casper Lamboo 2024-02-19 10:35:12 +01:00 • committed by GitHub
commit ab1d1407fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
635 changed files with 693 additions and 658 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/LegacyProfileReader/DictionaryOfDoom.json
View file

@ -68,7 +68,7 @@
"meshfix_keep_open_polygons": "fix_horrible_use_open_bits",
"magic_mesh_surface_mode": "\"surface\" if simple_mode else \"normal\"",
"magic_spiralize": "spiralize",
"prime_tower_enable": "wipe_tower",
"prime_tower_mode": "\"normal\" if wipe_tower else \"none\"",
"prime_tower_size": "math.sqrt(float(wipe_tower_volume) / float(layer_height))",
"ooze_shield_enabled": "ooze_shield",
"skin_overlap": "fill_overlap"

2
plugins/SliceInfoPlugin/SliceInfo.py
View file

@ -263,7 +263,7 @@ class SliceInfo(QObject, Extension):
print_settings["retraction_enable"] = global_stack.getProperty("retraction_enable", "value")
# Prime tower settings
print_settings["prime_tower_enable"] = global_stack.getProperty("prime_tower_enable", "value")
print_settings["prime_tower_mode"] = global_stack.getProperty("prime_tower_mode", "value")
# Infill settings
print_settings["infill_sparse_density"] = global_stack.getProperty("infill_sparse_density", "value")

9
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -579,8 +579,9 @@ class XmlMaterialProfile(InstanceContainer):
meta_data[tag_name] = entry.text
if tag_name in self.__material_metadata_setting_map:
common_setting_values[self.__material_metadata_setting_map[tag_name]] = entry.text
for tag_name, value in meta_data.items():
if tag_name in self.__material_metadata_setting_map:
common_setting_values[self.__material_metadata_setting_map[tag_name]] = value
if "description" not in meta_data:
meta_data["description"] = ""
@ -1222,7 +1223,9 @@ class XmlMaterialProfile(InstanceContainer):
"diameter": "material_diameter"
}
__material_metadata_setting_map = {
"GUID": "material_guid"
"GUID": "material_guid",
"material": "material_type",
"brand": "material_brand",
}
# Map of recognised namespaces with a proper prefix.