Ghostkeeper 98a5321b2b

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

Conflicts:
	resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg -> Setting version was updated at the same time.
	resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg -> Deleted while we updated setting version.

2020-05-11 14:03:54 +02:00

..

bundled_packages

Update sdk version to 7.2.0

2020-04-21 11:00:06 +02:00

definitions

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

2020-05-11 14:03:54 +02:00

extruders

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

2020-05-11 14:03:54 +02:00

i18n

Improve translation of 'tree support' in German

2020-04-29 02:08:09 +02:00

images

Merge pull request #7418 from Evg33/UNI_3D_profiles

2020-04-29 17:24:24 +02:00

intent

Upgrade containers that were forgotten to upgrade from setting_version 13

2020-05-08 11:13:15 +02:00

meshes

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

2020-05-11 09:16:01 +02:00

qml

Merge pull request #7624 from Ultimaker/CURA-7022_Add_cloud_printer_within_add_a_connected_printer

2020-05-06 11:13:27 +02:00

quality

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

2020-05-11 14:03:54 +02:00

setting_visibility

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

2020-02-13 09:05:18 +01:00

shaders

Fix x-ray error color.

2020-04-29 12:06:20 +02:00

texts

Updated change log for 4.6.1

2020-04-29 10:58:11 +02:00

themes

Size the Welcome Wizard using the theme

2020-04-28 17:44:35 +02:00

variants

Update to setting_version 15

2020-05-11 11:43:37 +02:00

public_key.pem

Move the package signature pem file to the Resources folder

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