Ghostkeeper 289399825b Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict. resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side. resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups. resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict. resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.		2018-11-27 15:01:48 +01:00
..
resources	Change all uses of 'small' and 'very small' fonts to default	2018-11-26 17:33:37 +01:00
src	Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin	2018-11-27 12:59:44 +01:00
tests	Removed the asserts on internals	2018-11-23 10:33:57 +01:00
__init__.py	Remove unnecessary import and declaration of i18n in plugins	2018-10-03 22:00:24 +02:00
plugin.json	Increase plugin API version to 5	2018-08-27 13:59:00 +02:00