Ghostkeeper a1438e91d0

Merge branch '4.5' ...

Conflicts:
	cura_app.py -> Due to moving some imports around.

2020-02-25 12:07:47 +01:00

..

bundled_packages

Bump SDK version number of Cura 4.5 to 7.1

2020-02-10 10:45:07 +01:00

definitions

Merge branch 'master' of https://github.com/FN5969/Cura into FN5969-master

2020-02-24 17:00:12 +01:00

extruders

Merge branch 'master' of https://github.com/FN5969/Cura into FN5969-master

2020-02-24 17:00:12 +01:00

i18n

Merge branch '4.5'

2020-02-25 12:07:47 +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

Merge branch 'master' of https://github.com/FN5969/Cura into FN5969-master

2020-02-24 17:00:12 +01:00

qml

Merge branch '4.5'

2020-02-25 12:07:47 +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

Merge pull request #7010 from smartavionics/mb-hole-offset

2020-02-13 09:05:18 +01:00

shaders

…

texts

Add change log entry for 4.4.1

2019-12-23 10:52:51 +01:00

themes

Update fonts using Google Noto Sans Fonts

2020-02-05 11:25:27 +01:00

variants

Merge branch 'voron2_duplicated'

2019-12-19 14:06:43 +01:00