Ghostkeeper b98da6b538

Merge branch 'master' into CURA-8609_sync_materials_to_printer ...

Conflicts:
	cura/Machines/Models/MaterialManagementModel.py -> Both master and my branch added an __init__ function. I merged the two __init__s to do both things that need to be done.

2021-10-06 14:22:18 +02:00

..

bundled_packages

Merge branch 'master' into CURA-8510_version_upgrade

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

definitions

Adding 3DI D300 (#9863)

2021-10-05 16:38:50 +02:00

extruders

Adding 3DI D300 (#9863)

2021-10-05 16:38:50 +02:00

i18n

Fix translations of log-in page and sync message

2021-09-07 14:26:43 +02:00

images

Squashed commit of the following:

2021-10-01 16:55:26 +02:00

intent

Change the setting version to 19

2021-09-15 16:25:04 +02:00

meshes

Adding 3DI D300 (#9863)

2021-10-05 16:38:50 +02:00

qml

Merge branch 'master' into CURA-8609_sync_materials_to_printer

2021-10-06 14:22:18 +02:00

quality

Update setting_version of eryone profile

2021-09-27 10:21:04 +02:00

setting_visibility

Add monotonic settings to advanced and expert visibility

2021-08-05 14:10:52 +02:00

shaders

Add missing type to lowestPrintableHeight variable

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

texts

Fix typo in changelog

2021-09-22 13:00:45 +02:00

themes

Merge branch 'master' into CURA-8609_sync_materials_to_printer

2021-10-06 14:22:18 +02:00

variants

Update setting_version of newest resources to 19

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

public_key.pem

…

README_resources.txt

Fix various typos

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