mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 22:47:29 -06: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. |
||
---|---|---|
.. | ||
resources | ||
__init__.py | ||
layers.shader | ||
layers3d.shader | ||
layers3d_shadow.shader | ||
layers_shadow.shader | ||
LayerSlider.qml | ||
NozzleNode.py | ||
PathSlider.qml | ||
plugin.json | ||
SimulationPass.py | ||
SimulationSliderLabel.qml | ||
SimulationView.py | ||
simulationview_composite.shader | ||
SimulationViewMainComponent.qml | ||
SimulationViewMenuComponent.qml | ||
SimulationViewProxy.py |