Ghostkeeper 1d7792861d

Merge branch '3.0' ...

Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.

2017-10-02 17:40:24 +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

Changing AGPLv3 to LGPLv3

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

ThreeMFWorkspaceReader.py

Overriding custom FDM printer with 1 extruder doesn't cause issue anymore.

2017-10-02 15:30:24 +02:00

WorkspaceDialog.py

Changing AGPLv3 to LGPLv3

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

WorkspaceDialog.qml

Merge branch '3.0'

2017-09-28 13:01:10 +02:00