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
..
bundled_packages	Add previewStage to bundled cura package list	2018-11-19 16:16:41 +01:00
definitions	Fix typo	2018-11-22 10:55:53 +01:00
extruders	Add Anycubic 4Max profile	2018-10-25 15:51:59 +02: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 branch 'master' of git://github.com/stelgenhof/Cura into stelgenhof-master	2018-11-08 16:29:40 +01:00
qml	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-26 13:43:20 +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-26 13:43:20 +01:00
variants	Rename CC Red 0.6 to CC 0.6	2018-11-06 15:31:51 +01:00