Ghostkeeper 01ec607d40

Merge branch '4.6' ...

Conflicts:
	resources/texts/change_log.txt: Both modified but had different wording for the pause-at-height bugfix with motor timeout. I used the wording in 4.6 since it was more extensive.

2020-04-06 09:20:18 +02: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 '4.6'

2020-04-06 09:20:18 +02:00

extruders

Merge pull request #7368 from maukcc/master

2020-03-30 15:53:09 +02:00

i18n

Fix duplicate shortcut keys

2020-03-24 13:18:50 +01:00

images

Merge pull request #7101 from yyh1002/master

2020-03-18 16:12:50 +01:00

intent

Increment setting version to 13

2020-04-01 15:14:01 +02:00

meshes

Merge pull request #7136 from hussainsail2002/master

2020-03-24 16:54:14 +01:00

qml

Merge branch '4.6'

2020-04-02 17:21:03 +02:00

quality

Increment setting version to 13

2020-04-01 15:14:01 +02:00

setting_visibility

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

2020-02-13 09:05:18 +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

Updated "What's New?"change log for 4.6

2020-04-03 16:02:00 +02:00

themes

Add placeholder header pattern

2020-03-20 14:05:42 +01:00

variants

Increment setting version to 13

2020-04-01 15:14:01 +02:00

public_key.pem

Move the package signature pem file to the Resources folder

2020-03-19 15:14:21 +01:00