Cura/cura/Machines/Models
Jelle Spijker 3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
..
__init__.py Move models around again 2019-03-26 08:29:22 +01: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
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 Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership 2021-12-28 14:54:56 +01:00
IntentCategoryModel.py Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership 2021-12-28 14:54:56 +01:00
IntentModel.py Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership 2021-12-28 14:54:56 +01: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 Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership 2021-12-28 14:54:56 +01:00
MaterialManagementModel.py Merge branch 'master' into PyQt6_upgrade 2022-02-21 11:52:28 +01: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 Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership 2021-12-28 14:54:56 +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 Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership 2021-12-28 14:54:56 +01:00