Ghostkeeper 7df4c01814

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ...

Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.

2018-12-03 11:45:05 +01:00

..

resources

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

2018-12-03 11:45:05 +01:00

src

Compare SDK version as Version instances

2018-11-15 15:20:21 +01:00

__init__.py

CURA-5330 Fix code style and typing in Toolbox plugin

2018-06-13 18:22:27 +02:00

plugin.json

Increase plugin API version to 5

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