mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-22 06:03:57 -06:00
289399825b
Conflicts: plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict. resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side. resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups. resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict. resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
14 lines
No EOL
518 B
Text
14 lines
No EOL
518 B
Text
module Cura
|
|
|
|
MachineSelector 1.0 MachineSelector.qml
|
|
CustomConfigurationSelector 1.0 CustomConfigurationSelector.qml
|
|
PrintSetupSelector 1.0 PrintSetupSelector.qml
|
|
ActionButton 1.0 ActionButton.qml
|
|
MaterialMenu 1.0 MaterialMenu.qml
|
|
NozzleMenu 1.0 NozzleMenu.qml
|
|
ActionPanelWidget 1.0 ActionPanelWidget.qml
|
|
IconLabel 1.0 IconLabel.qml
|
|
OutputDevicesActionButton 1.0 OutputDevicesActionButton.qml
|
|
ExpandableComponent 1.0 ExpandableComponent.qml
|
|
PrinterTypeLabel 1.0 PrinterTypeLabel.qml
|
|
ViewsSelector 1.0 ViewsSelector.qml |