Ghostkeeper 20201c65e6

Merge branch 'master' into feature_intent ...

Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties

2019-08-13 14:43:28 +02:00

..

ConfigurationMenu

Remove usage of some deprecated functions

2019-05-16 14:49:53 +02:00

BuildplateMenu.qml

Made some changes so the code also works with lower versions of Qt & pyQt

2018-03-05 15:32:46 +01:00

ContextMenu.qml

Reduce the creations of ExtrudersModels

2018-12-13 14:12:23 +01:00

FileMenu.qml

Add save shortcut to save

2019-08-07 10:46:51 +02:00

IntentMenu.qml

Disable intent category headers

2019-07-05 12:05:44 +02:00

LocalPrinterMenu.qml

Remove usage of some deprecated functions

2019-05-16 14:49:53 +02:00

MaterialMenu.qml

Add a property to temporarily disable the material models from updating.

2019-02-21 20:50:44 +01:00

NetworkPrinterMenu.qml

Rename 'connect_group_name' to 'group_name'. [CURA-6153]

2019-01-31 20:21:42 +01:00

NozzleMenu.qml

Fix the settings menu not reacting to onTriggered signals

2019-08-01 11:51:58 +02:00

PrinterMenu.qml

CURA-4870 Modify printer menu visibility of the items. Show local or network submenu only when there is local or network printers respectively

2018-03-04 12:53:16 +01:00

PrinterTypeMenu.qml

Remove usage of deprecated functions

2019-05-03 13:52:45 +02:00

ProfileMenu.qml

Add 'Experimental' tag for quality profiles in the header.

2019-01-16 15:50:40 +01:00

RecentFilesMenu.qml

Store the dialogs in a folder called Dialogs.

2018-10-09 17:11:01 +02:00

SettingsMenu.qml

Fix the settings menu not reacting to onTriggered signals

2019-08-01 11:51:58 +02:00

SettingVisibilityPresetsMenu.qml

Fix review comments

2018-10-17 10:47:34 +02:00

ViewMenu.qml

Rename Orthogonal to Orthographic everywhere

2019-07-30 17:35:40 +02:00