Cura/Dialogs at 60b12b9247676de84248d35a1db81a3d45b75a07 - Cura

mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00

History

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