mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-10 16:27:51 -06:00
![]() 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. |
||
---|---|---|
.. | ||
__init__.py | ||
Cura.proto | ||
CuraEngineBackend.py | ||
plugin.json | ||
ProcessGCodeJob.py | ||
ProcessSlicedLayersJob.py | ||
StartSliceJob.py |