Nino van Hooff 182bab6467 Merge remote-tracking branch 'origin/master' into CURA-6983_sync_packages ... # Conflicts: # plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py # plugins/Toolbox/src/Toolbox.py		2020-01-15 15:40:03 +01:00
..
bundled_packages	Add sentry logger to display breadcrumbs	2019-11-22 13:26:17 +01:00
definitions	Change description of nozzle wipes settings	2020-01-09 15:06:58 +01:00
extruders	Merge branch 'master' of https://github.com/beamup3d/Cura into beamup3d-master	2020-01-03 11:55:55 +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	Compress BeamUp S platform mesh with Decimate to 0.1 degrees	2020-01-03 12:52:26 +01:00
qml	Merge remote-tracking branch 'origin/master' into CURA-6983_sync_packages	2020-01-15 15:40:03 +01:00
quality	Merge branch 'master' of https://github.com/beamup3d/Cura into beamup3d-master	2020-01-03 11:55:55 +01:00
setting_visibility	Move settings to the right _visibility_ categories as well.	2020-01-07 13:40:24 +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