Nino van Hooff 8dbd67f5bd Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories ... # Conflicts: # resources/qml/Menus/SettingVisibilityPresetsMenu.qml # resources/qml/Settings/SettingView.qml		2020-01-02 15:32:26 +01:00
..
bundled_packages	Add sentry logger to display breadcrumbs	2019-11-22 13:26:17 +01:00
definitions	Remove maximum on small feature speed	2019-12-31 11:07:11 +01:00
extruders	Merge branch 'master' of github.com:Ultimaker/Cura	2019-12-23 15:58:44 +01:00
i18n	Spanish i18n fix fillament weight	2019-12-02 23:30:54 +01:00
images	Update enterprise splash screen background	2019-12-10 16:27:30 +01:00
intent	Also bump up the setting version of files changed since this branch was branched	2019-11-20 16:51:15 +01:00
meshes	Convert stl to binary (instead of ASCII)	2019-12-23 15:58:13 +01:00
qml	Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories	2020-01-02 15:32:26 +01:00
quality	Remove useless override of bed temperature	2020-01-02 09:49:52 +01:00
setting_visibility	Add brim gap setting (#6279)	2019-12-16 13:55:08 +01: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	Add change log entry for 4.4.1	2019-12-23 10:52:51 +01:00
themes	Change RadioCheckbar active button color	2019-12-10 13:19:10 +01:00
variants	Merge branch 'voron2_duplicated'	2019-12-19 14:06:43 +01:00