mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Conflicts: plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne. resources/definitions -> Bunch of conflicts with profile updates. resources/quality -> Bunch of conflicts with profile updates. resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable. |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| AddPrinterPagesModel.py | ||
| CuraSplashScreen.py | ||
| MachineActionManager.py | ||
| MachineSettingsManager.py | ||
| ObjectsModel.py | ||
| PrintInformation.py | ||
| RecommendedMode.py | ||
| TextManager.py | ||
| WelcomePagesModel.py | ||
| WhatsNewPagesModel.py | ||