Ghostkeeper 826044da7e Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines. resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.		2018-11-26 13:43:20 +01:00
..
__init__.py	Make sidebar view working for active stage	2017-12-06 12:23:41 +01:00
plugin.json	Increase plugin API version to 5	2018-08-27 13:59:00 +02:00
PrepareMenu.qml	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-26 13:43:20 +01:00
PrepareStage.py	Moved the prepareMenu into the prepare stage plugin	2018-10-12 13:29:57 +02:00