Lipu Fei 17c93dea80 Fix merge conflicts with 4.0		2018-12-13 14:39:28 +01:00
..
bundled_packages	Fix merge conflicts	2018-12-12 13:26:01 +01:00
definitions	Change default profile of Aurora and Alfawise printers	2018-12-03 17:23:44 +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 pull request #4982 from Ultimaker/fix_preview_stage_menu	2018-12-13 09:32:01 +01:00
quality	Merge pull request #4782 from Ultimaker/M&P-Setting-Optimization	2018-12-11 13:24:43 +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 'fix_toolbutton_style' of github.com:Ultimaker/Cura into 4.0	2018-12-13 13:26:35 +01:00
variants	CC06 profile fix	2018-12-04 08:25:05 +01:00