casper 411252bcef Merge branch 'master' into CURA-8081_shrinkage_plate_duplicate ...

# Conflicts:
#	resources/definitions/fdmprinter.def.json

2021-12-16 23:14:20 +01:00

..

bundled_packages

Update SDK version to 7.9.0

2021-12-16 17:15:59 +01:00

definitions

Merge branch 'master' into CURA-8081_shrinkage_plate_duplicate

2021-12-16 23:14:20 +01:00

extruders

Update extruder files for Magna 2 230 and 300 (#10695)

2021-12-15 18:55:38 +01:00

i18n

Update version number in header files

2021-12-10 16:15:34 +01:00

images

Add new Hellbot 3D printer Magna SE (#10614)

2021-12-15 18:53:08 +01:00

intent

Remove Cura 4 settings

2021-12-15 10:09:42 +01:00

meshes

Add new Hellbot 3D printer Magna SE (#10614)

2021-12-15 18:53:08 +01:00

qml

Merge pull request #10989 from Ultimaker/CURA-8671_dont_send_materials_to_um2c

2021-12-06 09:48:18 +01:00

quality

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

2021-12-14 18:46:22 +01:00

setting_visibility

Merge branch 'master' into CURA-8081_shrinkage_plate_duplicate

2021-12-16 23:14:20 +01:00

shaders

…

texts

Merge branch 'libArachne_rebased'

2021-12-14 11:48:58 +01:00

themes

Use badge icons

2021-11-18 10:53:35 +01:00

variants

Merge branch 'libArachne_rebased'

2021-12-14 11:48:58 +01:00

public_key.pem

…

README_resources.txt

…