3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
Cura/resources/qml/PrinterOutput
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
..
ExtruderBox.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
HeatedBedBox.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
ManualPrinterControl.qml Move monitor_checkable_button_style out to styles.qml 2018-11-26 13:21:55 +01:00
MonitorItem.qml Add connectedPrinter to MonitorItem 2018-11-22 14:06:43 +01:00
MonitorSection.qml Update MonitorSection 2018-11-22 14:03:03 +01:00
OutputDeviceHeader.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00