mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 23:46:22 -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. |
||
|---|---|---|
| .. | ||
| deltacomb_DBE0.25_PLA_A.inst.cfg | ||
| deltacomb_DBE0.25_PLA_B.inst.cfg | ||
| deltacomb_DBE0.25_PLA_C.inst.cfg | ||
| deltacomb_DBE0.40_PLA_A.inst.cfg | ||
| deltacomb_DBE0.40_PLA_B.inst.cfg | ||
| deltacomb_DBE0.40_PLA_C.inst.cfg | ||
| deltacomb_DBE0.40_PLA_D.inst.cfg | ||
| deltacomb_DBE0.40_PLA_E.inst.cfg | ||
| deltacomb_DBE0.60_PLA_C.inst.cfg | ||
| deltacomb_DBE0.60_PLA_D.inst.cfg | ||
| deltacomb_DBE0.60_PLA_E.inst.cfg | ||
| deltacomb_DBE0.60_PLA_F.inst.cfg | ||
| deltacomb_FBE0.25_PLA_A.inst.cfg | ||
| deltacomb_FBE0.25_PLA_B.inst.cfg | ||
| deltacomb_FBE0.25_PLA_C.inst.cfg | ||
| deltacomb_FBE0.40_PLA_A.inst.cfg | ||
| deltacomb_FBE0.40_PLA_B.inst.cfg | ||
| deltacomb_FBE0.40_PLA_C.inst.cfg | ||
| deltacomb_FBE0.40_PLA_D.inst.cfg | ||
| deltacomb_FBE0.40_PLA_E.inst.cfg | ||
| deltacomb_FBE0.60_PLA_C.inst.cfg | ||
| deltacomb_FBE0.60_PLA_D.inst.cfg | ||
| deltacomb_FBE0.60_PLA_E.inst.cfg | ||
| deltacomb_FBE0.60_PLA_F.inst.cfg | ||
| deltacomb_VDBE0.80_PLA_D.inst.cfg | ||
| deltacomb_VDBE0.80_PLA_E.inst.cfg | ||
| deltacomb_VDBE0.80_PLA_F.inst.cfg | ||
| deltacomb_VDBE0.80_PLA_G.inst.cfg | ||
| deltacomb_VFBE0.80_PLA_D.inst.cfg | ||
| deltacomb_VFBE0.80_PLA_E.inst.cfg | ||
| deltacomb_VFBE0.80_PLA_F.inst.cfg | ||
| deltacomb_VFBE0.80_PLA_G.inst.cfg | ||