 Jaime van Kessel
|
cb1a36577c
Machines are now flattened before merging them
|
8 years ago |
|
Jaime van Kessel
|
ad22cf4861
XML material profile merging is now far less naive.
|
8 years ago |
|
Jaime van Kessel
|
1fda24c43f
Removed dead code
|
8 years ago |
|
Jaime van Kessel
|
389cea2fcc
Merge branch 'duplicate-material' of github.com:Ultimaker/Cura
|
8 years ago |
|
Jaime van Kessel
|
1940d45971
Added way to acces inherited files
|
8 years ago |
|
Jaime van Kessel
|
7a54f21633
Added inherited_files property
|
8 years ago |
|
Jaime van Kessel
|
6a2e5ffe77
Added inheritance support to XML material profile deserialization
|
8 years ago |
|
Jack Ha
|
5da6d70163
Fixed duplicate material. CURA-1969
|
8 years ago |
|
Jack Ha
|
e0e1147708
Somewhat working materialspage duplicate. Contributes to CURA-1969
|
8 years ago |
|
Jack Ha
|
2daf0b1683
Cleanup after mistakenly committing crap.
|
8 years ago |
|
Jack Ha
|
6a2c97e4ac
Merge
|
8 years ago |
|
fieldOfView
|
30a679ddf9
Reduce loadingtime of XmlMaterialProfiles by 25%
|
8 years ago |
|
fieldOfView
|
0e2d35a88d
Use parseBool instead of inline variation
|
8 years ago |
|
Jack Ha
|
2ae998737f
Added materialspage Display Name field and made it work. CURA-1969
|
8 years ago |
|
Jaime van Kessel
|
8df5bba6e9
Removing auto rename if certain properties are changed
|
8 years ago |
|
Jaime van Kessel
|
3b9a642d02
Disabled renaming if type of material is changed by user
|
8 years ago |
|
Jaime van Kessel
|
3a921264fc
Explicitly check label xml element if it's none
|
8 years ago |
|
Jaime van Kessel
|
a904067d7a
Added label property to XML profile (as per 1.2 spec)
|
8 years ago |
|
fieldOfView
|
d3a0c0fa77
Add documentation
|
8 years ago |
|
fieldOfView
|
6b6d763657
Make globally incompatible materials not show up in menus
|
8 years ago |
|
fieldOfView
|
eb176847be
Implement "hardware compatible" for XmlMaterialProfile
|
8 years ago |
|
fieldOfView
|
3671d241d5
Show color + material in menus and Materials page
|
8 years ago |
|
Jaime van Kessel
|
286949dad1
Merge branch 'master' of github.com:Ultimaker/Cura
|
8 years ago |
|
fieldOfView
|
86ead22143
Make machine identifiers consistent
|
8 years ago |
|
Jaime van Kessel
|
7744ee5f13
Duplicating a material forces unique ID
|
8 years ago |
|
Jaime van Kessel
|
7075e438d9
Changing metadata now only targets profiles that share basefile
|
8 years ago |
|
Jaime van Kessel
|
37e4b9e940
Duplicating a container no longer forces unique GUID
|
8 years ago |
|
Arjen Hiemstra
|
57f63bfc73
Update material container's name when its "material" metadata key changes
|
8 years ago |
|
Arjen Hiemstra
|
f49528b71f
Do not try to set base_file metadata if it was never set before
|
8 years ago |
|
Arjen Hiemstra
|
571523e0ef
Ensure an XML material always has a description and adhesion_info metadata entry
|
8 years ago |
|
Arjen Hiemstra
|
fdab77ff6a
Also duplicate the base file when duplicating a material profile
|
8 years ago |
|
Arjen Hiemstra
|
f21079b763
Store the base material file as a metadata property of XmlMaterialProfile
|
8 years ago |
|
Arjen Hiemstra
|
750ecfc2e1
Remove some now-useless code relating to spool weight
|
8 years ago |
|
Arjen Hiemstra
|
2bc3a10776
Properly handle machines that have no variants
|
8 years ago |
|
Arjen Hiemstra
|
827c7b84fd
Do not try to set a property of a read-only material
|
8 years ago |
|
Arjen Hiemstra
|
e80a999740
Fix up readOnly property of XmlMaterialProfile
|
8 years ago |
|
Arjen Hiemstra
|
c9b1c36cc3
Add some documentation to XmlMaterialProfile
|
8 years ago |
|
Arjen Hiemstra
|
ded4c89cb5
Ensure metadata changes are propagated to the related containers
|
8 years ago |
|
Arjen Hiemstra
|
8badb061da
Check for definition_id, not variant name
|
8 years ago |
|
Arjen Hiemstra
|
26f7ba0a74
Fix up XmlMaterialProfile::serialize so we can properly serialize duplicated materials
|
8 years ago |
|
Arjen Hiemstra
|
ee0160075e
Override InstanceContainer::duplicate in XmlMAterialProfile
|
8 years ago |
|
Arjen Hiemstra
|
a3ea042d4b
Implement serialization of XmlMaterialProfile
|
8 years ago |
|
Arjen Hiemstra
|
eaea940aa2
Add support for some additional properties to XmlMaterialProfile
|
8 years ago |
|
Arjen Hiemstra
|
90ac1c1380
Add support for hotend-specfic overrides to XmlMaterialProfile
|
8 years ago |
|
Arjen Hiemstra
|
f491405eb1
Use a copy of the metadata for Xml materials
|
8 years ago |
|
Arjen Hiemstra
|
e0fab7aa11
Add some logging and documentation to XmlMaterialProfile
|
8 years ago |
|
Arjen Hiemstra
|
d5fa6d884f
Fix XML material profiles so the global properties are properly set
|
8 years ago |
|
Arjen Hiemstra
|
e29cc5e699
Create machine-specific material containers for machine specific overrides in XML material files
|
8 years ago |
|
Arjen Hiemstra
|
e0c7ed8561
Add a plugin that loads XML materials and an example material
|
8 years ago |
