Lipu Fei 8b913f4009 Merge remote-tracking branch 'origin/master' into CURA-6863_duplicated_material_oddness		2019-10-14 12:23:49 +02:00
..
bundled_packages	Fix merge conflicts with master	2019-09-24 14:26:43 +02:00
definitions	Fix overriding of prime tower position	2019-10-14 11:02:43 +02:00
extruders	Fix whitespace	2019-09-26 10:33:44 +02:00
i18n	Update translations for Cura 4.3	2019-09-30 15:47:24 +02:00
images	Hellbot printers definitions added	2019-09-16 16:23:35 -03:00
meshes	Hellbot printers definitions added	2019-09-16 16:23:35 -03:00
qml	Merge remote-tracking branch 'origin/master' into CURA-6863_duplicated_material_oddness	2019-10-14 12:23:49 +02:00
quality	Merge remote-tracking branch 'origin/master' into feature_intent	2019-10-01 09:41:05 +02:00
setting_visibility	Add Z Seam Position in Expert View	2019-09-10 13:36:10 +02:00
shaders	Older drivers can lie w.r.t. GLSL-version if it's forced lower.	2019-09-21 14:58:59 +02:00
texts	Added CS tickets to the change log	2019-09-24 12:26:24 +02:00
themes	Change the action_button_hover color in dark theme	2019-09-26 13:16:52 +02:00
variants	Fix merge conflicts with master	2019-09-24 14:26:43 +02:00