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

..

__init__.py

Move models around again

2019-03-26 08:29:22 +01:00

BaseMaterialsModel.py

Allow the machine manager to set an empty active machine

2020-06-09 15:33:22 +02:00

BuildPlateModel.py

Remove a bunch of unused imports

2019-11-08 13:38:42 +01:00

CustomQualityProfilesDropDownMenuModel.py

Updated comments in Models

2020-05-08 18:59:38 +02:00

DiscoveredCloudPrintersModel.py

Updated comments in Models

2020-05-08 18:59:38 +02:00

DiscoveredPrintersModel.py

Remove trailing whitespace from Python files

2020-05-29 14:30:33 +02:00

ExtrudersModel.py

Set the "Not overridden" extruder color as transparetn

2021-07-02 12:13:28 +02:00

FavoriteMaterialsModel.py

Updated comments in Models

2020-05-08 18:59:38 +02:00

FirstStartMachineActionsModel.py

Updated comments in Models

2020-05-08 18:59:38 +02:00

GenericMaterialsModel.py

Merge branch 'master' into CURA-6793_performance

2019-10-23 09:58:08 +02:00

GlobalStacksModel.py

Implement filter for printer list to only show printers with certain configured connections

2021-10-05 17:44:15 +02:00

IntentCategoryModel.py

Remove trailing whitespace from Python files

2020-05-29 14:30:33 +02:00

IntentModel.py

Updated comments in Models

2020-05-08 18:59:38 +02:00

IntentTranslations.py

Merge remote-tracking branch 'origin/4.4'

2019-11-11 08:13:53 +01:00

MachineModelUtils.py

Round layer height for display in quality menu

2021-06-04 14:03:59 +02:00

MaterialBrandsModel.py

Fix typo in comment

2020-01-13 13:44:36 +01:00

MaterialManagementModel.py

Merge branch 'master' into CURA-8609_sync_materials_to_printer

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

MultiBuildPlateModel.py

Updated comments in Models

2020-05-08 18:59:38 +02:00

NozzleModel.py

Don't cache machine manager and application

2019-10-08 14:16:19 +02:00

QualityManagementModel.py

Code style: Spaces around binary operators

2020-08-27 14:38:40 +02:00

QualityProfilesDropDownMenuModel.py

Updated comments in Models

2020-05-08 18:59:38 +02:00

QualitySettingsModel.py

Fix reference before assignment

2021-06-21 16:34:01 +02:00

SettingVisibilityPresetsModel.py

Fix various typos

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

UserChangesModel.py

Prevent crash when a setting is not in any setting category

2020-04-14 21:06:10 +02:00