jspijker f9d4628b95 Merge branch 'main' into CURA-9365 ... # Conflicts: # .github/workflows/ci.yml # .github/workflows/cura-installer.yml # .github/workflows/requirements-conan-package.txt # resources/definitions/Mark2_for_Ultimaker2.def.json # resources/definitions/elegoo_neptune_2.def.json # resources/definitions/elegoo_neptune_2D.def.json		2022-07-08 12:37:32 +02:00
..
AboutDialog.qml	Merge branch 'main' into CURA-9365	2022-07-08 12:37:32 +02:00
AskOpenAsProjectOrModelsDialog.qml	Set proper background color for open project dialogs.	2022-07-01 14:22:27 +02:00
DiscardOrKeepProfileChangesDialog.qml	Add the "clear" hack to the tableModel for discardOrkeepchanges	2022-06-29 13:34:41 +02:00
MessageDialog.qml	Replace UM.MessageDialog with newly added Cura.MessageDialog	2022-02-23 14:09:38 +01:00
OpenFilesIncludingProjectsDialog.qml	Fix few more instances of old usage of fileUrl vs selectedFile	2022-04-19 17:12:58 +02:00
WorkspaceSummaryDialog.qml	Add missing background color to WorkspaceSummaryDialog.qml	2022-07-07 15:06:53 +02:00