Ghostkeeper 03b4213e92

Merge branch '3.2' ...

Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...

2018-02-12 13:10:24 +01:00

..

__init__.py

Changing AGPLv3 to LGPLv3

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

MachineSettingsAction.py

Fixes for custom FMD printer material diameter upgrade and storage - CURA-4835

2018-01-22 17:18:09 +01:00

MachineSettingsAction.qml

Merge branch '3.2'

2018-02-12 13:10:24 +01:00

plugin.json

Fix code style

2017-06-22 08:54:04 +02:00