3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 05:07:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
Cura/resources/qml/Preferences
History
Ghostkeeper c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade 
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
2022-02-21 11:52:28 +01:00
..
Materials Qt5->Qt6: Even more renaming stuff. 2021-12-29 12:43:56 +01:00
GeneralPage.qml Bump UM version for CheckBox 2022-01-26 09:53:17 +01:00
MachinesPage.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ProfilesPage.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ProfileTab.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ReadOnlySpinBox.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ReadOnlyTextArea.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
ReadOnlyTextField.qml Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
SettingVisibilityPage.qml Bump UM version for CheckBox 2022-01-26 09:53:17 +01:00