Jack Ha 5152b2ae65 Solved merge conflicts. CURA-4525

2017-12-21 10:52:51 +01: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

ThreeMFWorkspaceWriter.py

Merge branch 'master' into feature_local_container_server

2017-12-08 16:03:05 +01:00

ThreeMFWriter.py

Solved merge conflicts. CURA-4525

2017-12-21 10:52:51 +01:00