Mark f61efb8e20 resolve merge conflict

2018-04-17 10:39:35 +02:00

..

__init__.py

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

plugin.json

Set author to Ultimaker B.V. instead of Ultimaker

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

ThreeMFReader.py

Fix loading parented objects from 3mf files

2018-03-19 18:25:40 +01:00

ThreeMFWorkspaceReader.py

resolve merge conflict

2018-04-17 10:39:35 +02:00

WorkspaceDialog.py

Show printer group and which machine to update in project loading

2018-03-20 16:23:23 +01:00

WorkspaceDialog.qml

Show printer group and which machine to update in project loading

2018-03-20 16:23:23 +01:00