Daniel Schiavini a1c252d3a2 Revert "Revert "fix merge conflict"" ...

This reverts commit 4bffa6d90f2e6e9784c7e5508b61e00a92ecb74f.

2018-12-07 10:25:46 +01:00

..

__init__.py

Remove unnecessary import and declaration of i18n in plugins

2018-10-03 22:00:24 +02:00

MachineSettingsAction.py

Only use setMetaDataEntry()

2018-07-11 11:14:57 +02:00

MachineSettingsAction.qml

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

plugin.json

Increase plugin API version to 5

2018-08-27 13:59:00 +02:00