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	Remove unnecessary import and declaration of i18n in plugins	2018-10-03 22:00:24 +02:00
MachineSettingsAction.py	Search/replace Qt5->Qt6.	2021-12-28 14:46:02 +01:00
MachineSettingsAction.qml	Fix styling for Machine Settings	2022-02-28 13:19:56 +01:00
MachineSettingsExtruderTab.qml	Fix validator for floats in Machine Settings dialog	2020-12-07 16:04:21 +01:00
MachineSettingsPrinterTab.qml	Qt5->Qt6: Even more renaming stuff.	2021-12-29 12:43:56 +01:00
plugin.json	Now unused API field only took integers originally.	2021-06-17 11:15:33 +02:00