Jaime van Kessel 99b236c8d4 Removed "fix" that caused project files to create new instances if there was no conflict. ...

The overriding doesn't make any sense. The original commit mentions that it should fix something, but it doesn't acutally fix it. It seems
the original issue was fixed in the proper place, leaving this code to mess everything up.

CURA-3756

2017-07-17 11:08:31 +02:00

..

__init__.py

Moved certain meta data entries to seperate file

2017-06-21 11:22:35 +02:00

plugin.json

Set author to Ultimaker B.V. instead of Ultimaker

2017-06-28 13:50:37 +02:00

ThreeMFReader.py

Only 3mf nodes with mesh data are getting the sliceable object decorator. CURA-3559

2017-03-20 14:43:46 +01:00

ThreeMFWorkspaceReader.py

Removed "fix" that caused project files to create new instances if there was no conflict.

2017-07-17 11:08:31 +02:00

WorkspaceDialog.py

Fix WorkspaceDialog to include resolve for definition_changes

2017-05-10 13:07:45 +02:00

WorkspaceDialog.qml

fixed too big dialogs and hidden checkboxes

2017-05-31 12:46:07 +02:00