mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-16 03:07:53 -06:00
9140b71b19
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. |
||
|---|---|---|
| .. | ||
| cartesio_0.4_hips_high.inst.cfg | ||
| cartesio_0.4_hips_normal.inst.cfg | ||
| cartesio_0.8_hips_coarse.inst.cfg | ||
| cartesio_0.8_hips_extra_coarse.inst.cfg | ||
| cartesio_0.8_hips_high.inst.cfg | ||
| cartesio_0.8_hips_normal.inst.cfg | ||
| cartesio_0.25_hips_high.inst.cfg | ||
| cartesio_0.25_hips_normal.inst.cfg | ||