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
..
cura-dark	Change background of Premium plugins and materials	2021-08-24 13:32:25 +02:00
cura-dark-colorblind	Unrevert new icon set for all of Cura's interface	2021-06-28 17:16:56 +02:00
cura-light	Merge branch 'master' into CURA-8609_sync_materials_to_printer	2021-10-06 14:22:18 +02:00
cura-light-colorblind	Unrevert new icon set for all of Cura's interface	2021-06-28 17:16:56 +02:00