Ghostkeeper 266e08fdff Merge branch 'master' into ui_rework_4_0 ... Conflicts: plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky. resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.		2018-11-13 16:23:36 +01:00
..
bundled_packages	Change the Ultimaker author_id to UltimakerPackages. Apparently this is	2018-11-09 17:18:01 +01:00
definitions	Don't allow support interface offset greater than support offset	2018-11-08 13:03:37 +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 'master' into ui_rework_4_0	2018-11-13 16:23:36 +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	Modify the color behavior of the toolbar buttons.	2018-11-12 09:35:32 +01:00
variants	Rename CC Red 0.6 to CC 0.6	2018-11-06 15:31:51 +01:00