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
..
bundled_packages	Add previewStage to bundled cura package list	2018-11-19 16:16:41 +01:00
definitions	Move material diameter and machine nozzle size to the extruder	2018-11-27 13:12:47 +01:00
extruders	Move material diameter and machine nozzle size to the extruder	2018-11-27 13:12:47 +01:00
i18n	Add translation for missing line in Korean	2018-11-08 09:48:52 +01:00
images	updated moai plate image	2018-08-28 08:01:51 +02:00
meshes	Merge pull request #4666 from pinchies/add-jg-a5	2018-11-26 15:43:41 +01:00
qml	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-27 15:01:48 +01:00
quality	Improve generic profiles for fabtotum and zyyx	2018-11-13 11:48:02 +01:00
setting_visibility	Update unit test for 'visibilit_settings' and removed unused settings from expert.cfv	2018-09-18 11:10:24 +02:00
shaders	Fix support blocker on older (legacy) opengl	2018-05-14 14:29:41 +02:00
themes	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-27 15:01:48 +01:00
variants	Rename CC Red 0.6 to CC 0.6	2018-11-06 15:31:51 +01:00