mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-05-06 20:18:59 +08:00
7df4c01814
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.
15 lines
554 B
Plaintext
15 lines
554 B
Plaintext
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
|
|
ToolbarButton 1.0 ToolbarButton.qml |