Ghostkeeper b8ccb32836

Merge branch 'master' into libArachne_rebased ...

Conflicts:
	resources/definitions/ultimaker2.def.json -> Additions in Arachne around a place where we fixed an enum setting.
	resources/definitions/ultimaker3.def.json
	resources/definitions/ultimaker_s3.def.json
	resources/definitions/ultimaker_s5.def.json

2021-11-12 15:08:29 +01:00

..

bundled_packages

Merge branch 'master' into CURA-8510_version_upgrade

2021-09-23 17:01:00 +02:00

definitions

Merge branch 'master' into libArachne_rebased

2021-11-12 15:08:29 +01:00

extruders

Fix file extension

2021-11-03 17:27:49 +01:00

i18n

Merge branch '4.12' of github.com:Ultimaker/Cura

2021-11-11 15:32:39 +01:00

images

Merge branch 'master' into libArachne_rebased

2021-11-12 15:08:29 +01:00

intent

Revert settings-version to the one for Arachne-builds.

2021-10-20 11:01:13 +02:00

meshes

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

2021-10-15 16:07:59 +02:00

qml

Merge branch '4.12'

2021-11-08 13:55:09 +01:00

quality

Merge branch 'master' into libArachne_rebased

2021-11-12 15:08:29 +01:00

setting_visibility

Merge branch 'master' into merge_main_20211019

2021-10-20 08:38:01 +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-11-12 15:08:29 +01:00

themes

add dark themed images to the dark theme

2021-10-28 14:12:15 +02:00

variants

Merge branch 'master' into libArachne_rebased

2021-11-12 15:08:29 +01:00

public_key.pem

…

README_resources.txt

Fix various typos

2021-09-07 11:33:54 -04:00