Ghostkeeper b3c03b8771

Merge branch 'master' into libArachne_rebased ...

Conflicts:
	resources/texts/change_log.txt -> 4.9 got added while we added the Arachne change log as well. I put 4.9 below the Arachne info.

2021-04-08 13:49:52 +02:00

..

bundled_packages

Increment SDK version to 7.5.0

2021-04-06 13:28:08 +02:00

definitions

Merge branch 'master' into libArachne_rebased

2021-04-08 13:49:52 +02:00

extruders

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

2021-04-08 11:53:06 +02:00

i18n

Czech Translations for 4.9

2021-04-02 19:28:44 +02:00

images

Merge branch 'master' into libArachne_rebased

2021-04-08 13:49:52 +02:00

intent

Revert "Bump setting_version to 17" for instances

2021-04-02 10:43:24 +02:00

meshes

Merge pull request #9270 from mehmetsutas/Rigid3D

2021-03-29 13:53:30 +02:00

qml

Workaround old-style menu's not closeable on Mac OSX.

2021-04-06 12:21:59 +02:00

quality

Revert "Bump setting_version to 17" for instances

2021-04-02 10:43:24 +02:00

setting_visibility

Merge branch 'master' into libArachne_rebased

2021-04-08 13:49:52 +02:00

shaders

Actually show 'on buildplate' color when z=0.

2021-01-22 18:47:45 +01:00

texts

Merge branch 'master' into libArachne_rebased

2021-04-08 13:49:52 +02:00

themes

Remove now unused image of printers

2021-04-01 19:36:00 +02:00

variants

Revert "Bump setting_version to 17" for instances

2021-04-02 10:43:24 +02:00

public_key.pem

Move the package signature pem file to the Resources folder

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