Lipu Fei 173f125d3e Fix merge conflicts		2019-01-24 14:55:29 +01:00
..
bundled_packages	Add VersionUpgrade40to41 as a bundled package	2019-01-14 17:10:52 +01:00
definitions	Fix merge conflicts	2019-01-24 14:55:29 +01:00
extruders	4904 cubicon device (#4963)	2019-01-22 16:44:04 +01:00
i18n	Add translation for missing line in Korean	2018-11-08 09:48:52 +01:00
images	4904 cubicon device (#4963)	2019-01-22 16:44:04 +01:00
meshes	Added definitions for Wanhao Duplicator 9	2018-11-27 19:46:49 +03:00
qml	Merge branch '4.0' of github.com:Ultimaker/Cura	2019-01-23 11:18:27 +01:00
quality	Adding NWA3D A5 printer (#5118)	2019-01-17 17:39:00 +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 '4.0'	2019-01-20 21:25:19 +01:00
variants	Update all profiles to setting_version 7	2019-01-17 11:49:26 +01:00