 Lipu Fei
|
3c663d576c
Do not save setting_version when serializing an XML material
|
7 years ago |
|
Lipu Fei
|
ecdf0bbe33
Fix setting_version in metadata for XMLMaterial
|
7 years ago |
|
Lipu Fei
|
63b71b8661
Fix typo in comments
|
7 years ago |
|
Lipu Fei
|
68989f2871
Use optional arg in serialize() to exclude network auth keys
|
7 years ago |
|
Ghostkeeper
|
d6941fef2f
Interpret material compatible 'unknown' as 'yes'
|
7 years ago |
|
Lipu Fei
|
071005541c
Use XMLMaterialProfile version tag to determine its version
|
7 years ago |
|
Lipu Fei
|
b4949a164c
WIP: Add temporary fix to make materials work with 2.7 version upgrade
|
7 years ago |
|
fieldOfView
|
49f2fb2cea
Fix filtering maerials after editing materials
|
7 years ago |
|
fieldOfView
|
a7cdf49018
Fix setting metadata on fdmmaterial containers
|
7 years ago |
|
fieldOfView
|
5550fe0da8
Fix confusion around the use of the word "global"
|
7 years ago |
|
fieldOfView
|
944318d44a
Fix loading material diameter and GUID from XML file
|
7 years ago |
|
Lipu Fei
|
8ede981a2c
Set version in <fdmmaterial> when saving XML material files
|
7 years ago |
|
Lipu Fei
|
9a08e0cc27
Only use <fdmmaterial version> for detecting material file version
|
7 years ago |
|
Jaime van Kessel
|
4b826b747b
Added exception handling to XML parsing
|
7 years ago |
|
Jaime van Kessel
|
75b3f08318
Removed unneeded logging
|
7 years ago |
|
Lipu Fei
|
593697e0ed
Fix XML material upgrade
|
7 years ago |
|
Ghostkeeper
|
c48017e174
Convert all metadata fields to string
|
7 years ago |
|
Ghostkeeper
|
2365267f35
Be robust against older specification version numbers
|
7 years ago |
|
Ghostkeeper
|
365f7cad4c
Read setting_version from version attribute on root
|
7 years ago |
|
Ghostkeeper
|
a472fd8163
Remove debug print
|
7 years ago |
|
Ghostkeeper
|
1e4c394b71
Remove getting superfluous material density
|
7 years ago |
|
Ghostkeeper
|
c8295434f3
Load setting_version from XML material profile
|
7 years ago |
|
Ghostkeeper
|
38f081539a
Fix deserialising density
|
7 years ago |
|
Jaime van Kessel
|
c20542b7b8
Merge branch 'feature_CURA-3540_upgrade_for_project' of github.com:Ultimaker/Cura
|
7 years ago |
|
Ghostkeeper
|
f1ac1bd876
Add JellyBox to XML material printer name translations
|
7 years ago |
|
Lipu Fei
|
b3f60c461b
Fix type hinting and function name for upgrade profile
|
7 years ago |
|
Lipu Fei
|
4f2c76e462
Update a profile when deserializing it
|
7 years ago |
|
fieldOfView
|
e92aaca7b6
Filter materials by the (approximate) material diameter of the printer
|
7 years ago |
|
Lipu Fei
|
18cf9e3172
CURA-3500 Make sure that material XMLs have utf-8 encoding
|
8 years ago |
|
Ghostkeeper
|
b488441d81
Fix link to ContainerRegistry
|
8 years ago |
|
Simon Edwards
|
92cee4a9d7
Merge branch 'master' into python_type_hinting
|
8 years ago |
|
Jaime van Kessel
|
c18fb02f82
Removed unneeded (and somewhat expensive) checks
|
8 years ago |
|
Jaime van Kessel
|
6e7c4711e3
When creating XML profiles, directly set the name
|
8 years ago |
|
Jaime van Kessel
|
f4d4fb9001
Material values are now also lazy loaded
|
8 years ago |
|
Jaime van Kessel
|
bda818b104
MetaData of material profile is now set in one batch instead of multiple calls
|
8 years ago |
|
Simon Edwards
|
fb70eb6813
Merge branch 'master' into python_type_hinting
|
8 years ago |
|
Simon Edwards
|
38a7ffa7da
Some fixes regarding submodules and imports.
|
8 years ago |
|
Ghostkeeper
|
f4fa3ac53f
Add translation for UM3 and UM3E from XML profiles
|
8 years ago |
|
Simon Edwards
|
d4619da358
Merge branch 'master' into python_type_hinting
|
8 years ago |
|
Simon Edwards
|
74e5798509
Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
|
8 years ago |
|
Jack Ha
|
94ccd4b04b
Solve material properties not being saved. CURA-2586
|
8 years ago |
|
Jaime van Kessel
|
58e7e6ef5a
Added default_printing_temperature property
|
8 years ago |
|
Jack Ha
|
b88ed76b7c
Solve merge conflict PrinterOutputDevice. CURA-1263
|
8 years ago |
|
Jack Ha
|
a8d5537487
Fix XmlMaterialProfile setProperty in correct container. Contributes to CURA-2861
|
8 years ago |
|
Simon Edwards
|
98a6568313
Merge branch 'master' into python_type_hinting
|
8 years ago |
|
Simon Edwards
|
14afd9eab7
Heaps to changes to get the Cura code through the type checker (with minimal checking).
|
8 years ago |
|
Jaime van Kessel
|
aca8110edd
Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler
|
8 years ago |
|
Jaime van Kessel
|
c1650125e9
The compatible setting is now serialized correctly
|
8 years ago |
|
Jaime van Kessel
|
2e1f4e3740
Serialize now uses base_file as well instead of only GUID to find containers to use
|
8 years ago |
|
Jaime van Kessel
|
92a4fd7239
Materials are now also handled in conflict resolvement
|
8 years ago |
