Jelle Spijker 22134f2d3c

Merge branch '5.4' into CURA-9709_custom_icons_with_profiles ...

# Conflicts:
#	cura/Machines/Models/IntentSelectionModel.py

2023-06-07 16:20:48 +02:00

..

__init__.py

Move models around again

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

ActiveIntentQualitiesModel.py

Remove todos that are no longer applicable

2022-06-16 15:32:33 +02:00

BaseMaterialsModel.py

Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

2021-12-28 14:54:56 +01:00

BuildPlateModel.py

Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

2021-12-28 14:54:56 +01:00

CompatibleMachineModel.py

Continue if a printer has no active materials. This was causing a crash when loading the material combinations for a printer with two empty material slots.

2023-02-22 13:43:06 +01:00

CustomQualityProfilesDropDownMenuModel.py

Search/replace Qt5->Qt6.

2021-12-28 14:46:02 +01:00

DiscoveredCloudPrintersModel.py

Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

2021-12-28 14:54:56 +01:00

DiscoveredPrintersModel.py

Search/replace Qt5->Qt6.

2021-12-28 14:46:02 +01:00

ExtrudersModel.py

Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

2021-12-28 14:54:56 +01:00

FavoriteMaterialsModel.py

Updated comments in Models

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

FirstStartMachineActionsModel.py

Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

2021-12-28 14:54:56 +01:00

GenericMaterialsModel.py

Merge branch 'master' into CURA-6793_performance

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

GlobalStacksModel.py

Revert "Prevent abstract machines from being deleted in the config menu"

2022-09-05 17:32:23 +02:00

IntentCategoryModel.py

Add anealing description and icon

2023-06-06 12:42:09 +02:00

IntentModel.py

Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

2021-12-28 14:54:56 +01:00

IntentSelectionModel.py

Merge branch '5.4' into CURA-9709_custom_icons_with_profiles

2023-06-07 16:20:48 +02:00

IntentTranslations.py

Merge remote-tracking branch 'origin/4.4'

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

MachineListModel.py

Check before removing

2023-01-13 13:30:09 +01:00

MachineModelUtils.py

Round layer height for display in quality menu

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

MaterialBrandsModel.py

Remove unneeded clear

2022-04-08 09:16:22 +02:00

MaterialManagementModel.py

Remove duplicated code

2022-06-17 15:21:30 +02:00

MultiBuildPlateModel.py

Search/replace Qt5->Qt6.

2021-12-28 14:46:02 +01:00

NozzleModel.py

Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

2021-12-28 14:54:56 +01:00

QualityManagementModel.py

Connect compare-and-safe profile dialog buttons to actions.

2022-11-30 18:48:07 +01:00

QualityProfilesDropDownMenuModel.py

Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership

2021-12-28 14:54:56 +01:00

QualitySettingsModel.py

Merge branch 'master' into CURA-8640_PyQt6

2022-03-24 11:53:44 +01:00

SettingVisibilityPresetsModel.py

Search/replace Qt5->Qt6.

2021-12-28 14:46:02 +01:00

UserChangesModel.py

Resolve formula in Keep or Discard dialog

2023-01-04 13:17:56 +01:00