3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 12:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
Cura/resources/qml/ActionPanel
History
Ghostkeeper 7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +01:00
..
ActionPanelWidget.qml Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
OutputDevicesActionButton.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-11-27 15:01:48 +01:00
OutputProcessWidget.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
PrintInformationWidget.qml Add soft animation to the entire popup and not only in the background. 2018-11-11 13:17:59 +01:00
PrintJobInformation.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
SliceProcessWidget.qml Use normal font size for Auto slicing... message 2018-12-03 11:37:22 +01:00