 Jaime van Kessel
|
f4d4fb9001
Material values are now also lazy loaded
|
7 years ago |
|
Jaime van Kessel
|
bda818b104
MetaData of material profile is now set in one batch instead of multiple calls
|
7 years ago |
|
Simon Edwards
|
fb70eb6813
Merge branch 'master' into python_type_hinting
|
7 years ago |
|
Simon Edwards
|
38a7ffa7da
Some fixes regarding submodules and imports.
|
7 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 |
|
Jaime van Kessel
|
db0fb0c652
Compatible metadata entry is now correctly set for each variant & machine
|
8 years ago |
|
Arjen Hiemstra
|
e0b926878f
Remove code that sets incompatible materials to invalid type
|
8 years ago |
|
fieldOfView
|
472ba7ed26
Fix exporting materials for machines other than those in the product_id_map
|
8 years ago |
|
Jaime van Kessel
|
b707c8d806
XML profile now returns serialization data even if it's read only
|
8 years ago |
|
Jack Ha
|
fb3f03b446
Fixed XML setMetaDataEntry for changing too much meta data. Contributes to CURA-2159
|
8 years ago |
|
Jack Ha
|
df536e158b
Fixed XmlMaterialProfile serialize for booleans. Contributes to CURA-2159
|
8 years ago |
|
Jaime van Kessel
|
f81a5fe301
Removed very annoying message spam
|
8 years ago |
|
Jaime van Kessel
|
d68f6a4e9a
Instead of discarding a profile if it's not compatible, we mark it as such.
|
8 years ago |
|
fieldOfView
|
0828d4f1ca
Fix dirty flag of incompatible_materials
|
8 years ago |
|
Jack Ha
|
2138a87582
Busy with CURA-2159
|
8 years ago |
|
Jaime van Kessel
|
c65e79a5db
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3
|
8 years ago |
|
Jaime van Kessel
|
697329f5d2
Fixed review issues
|
8 years ago |
|
fieldOfView
|
a2d74cc984
Fix documentation
|
8 years ago |
|
Jaime van Kessel
|
bef410b4a3
Machines are now flattened before merging them
|
8 years ago |
|
Jaime van Kessel
|
bacac1e42e
XML material profile merging is now far less naive.
|
8 years ago |
|
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 |
