Ghostkeeper 611208368c

Merge branch 'master' into libArachne_rebased ...

Conflicts:
	cura/CuraApplication.py: Setting version
	fdmprinter and fdmextruder: Setting version
	intents, qualities and variants: Setting version
	Changelog: 4.9.1 was added, should be below Arachne changes

2021-06-16 18:04:54 +02:00

..

bundled_packages

Update SDK/API from 7.5.0 to 7.6.0 for 4.10

2021-06-15 16:08:07 +02:00

definitions

Merge branch 'master' into libArachne_rebased

2021-06-16 18:04:54 +02:00

extruders

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

2021-06-08 16:00:46 +02:00

i18n

Update headers to reflect 4.10 version number

2021-06-10 17:44:18 +02:00

images

Merge branch 'master' into libArachne_rebased

2021-06-16 18:04:54 +02:00

intent

Merge branch 'master' into libArachne_rebased

2021-06-16 18:04:54 +02:00

meshes

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

2021-06-08 16:00:46 +02:00

qml

Use buttons from QtQuick.Controls 2

2021-06-15 16:28:20 +02:00

quality

Merge branch 'master' into libArachne_rebased

2021-06-16 18:04:54 +02:00

setting_visibility

Merge branch 'master' into libArachne_rebased

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

shaders

Add missing type to lowestPrintableHeight variable

2021-05-12 13:26:10 +02:00

texts

Merge branch 'master' into libArachne_rebased

2021-06-16 18:04:54 +02:00

themes

Revert "Fix merge conflict"

2021-06-03 17:27:35 +02:00

variants

Merge branch 'master' into libArachne_rebased

2021-06-16 18:04:54 +02:00

public_key.pem

Move the package signature pem file to the Resources folder

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