Jaime van Kessel 42caf57993 Added "material" to default resolve strategies ...

CURA-1263

2016-11-22 13:31:58 +01:00

..

__init__.py

Added stub workspace reader

2016-11-08 10:00:00 +01:00

ThreeMFReader.py

Fixed issue with per-object settings in 3mf reader

2016-11-10 11:46:13 +01:00

ThreeMFWorkspaceReader.py

Added "material" to default resolve strategies

2016-11-22 13:31:58 +01:00

WorkspaceDialog.py

Added material conflict option

2016-11-16 14:45:34 +01:00

WorkspaceDialog.qml

Materials are now also handled in conflict resolvement

2016-11-17 11:16:15 +01:00