Diego Prado Gesto 5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header ... Conflicts: plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml resources/qml/Menus/ViewMenu.qml resources/themes/cura-dark/theme.json resources/themes/cura-light/theme.json		2018-10-29 11:10:25 +01:00
..
bundled_packages	Move Firmware Updater into a plugin of its own	2018-10-03 20:55:51 +02:00
definitions	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2018-10-25 15:51:51 +02:00
extruders	Merge pull request #4472 from jscurtu/master	2018-10-25 15:26:31 +02:00
i18n	Add missing quote.	2018-10-03 16:57:26 +02:00
images	updated moai plate image	2018-08-28 08:01:51 +02:00
meshes	Merge pull request #4472 from jscurtu/master	2018-10-25 15:26:31 +02:00
qml	Merge branch 'ui_rework_4_0' into cura4.0_header	2018-10-29 11:10:25 +01:00
quality	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2018-10-25 15:51:51 +02: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 cura4.0_header	2018-10-29 11:10:25 +01:00
variants	fix setting versions numbers	2018-10-01 22:42:20 +02:00