mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 07:27:29 -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_dc20_fbe025.inst.cfg | ||
| deltacomb_dc20_fbe040.inst.cfg | ||
| deltacomb_dc20_fbe060.inst.cfg | ||
| deltacomb_dc20_vfbe080.inst.cfg | ||
| deltacomb_dc20dual_dbe025.inst.cfg | ||
| deltacomb_dc20dual_dbe040.inst.cfg | ||
| deltacomb_dc20dual_dbe060.inst.cfg | ||
| deltacomb_dc20dual_vdbe080.inst.cfg | ||
| deltacomb_dc20flux_fbe025.inst.cfg | ||
| deltacomb_dc20flux_fbe040.inst.cfg | ||
| deltacomb_dc20flux_fbe060.inst.cfg | ||
| deltacomb_dc21_fbe025.inst.cfg | ||
| deltacomb_dc21_fbe040.inst.cfg | ||
| deltacomb_dc21_fbe060.inst.cfg | ||
| deltacomb_dc21_vfbe080.inst.cfg | ||
| deltacomb_dc21dual_dbe025.inst.cfg | ||
| deltacomb_dc21dual_dbe040.inst.cfg | ||
| deltacomb_dc21dual_dbe060.inst.cfg | ||
| deltacomb_dc21dual_vdbe080.inst.cfg | ||
| deltacomb_dc21flux_fbe025.inst.cfg | ||
| deltacomb_dc21flux_fbe040.inst.cfg | ||
| deltacomb_dc21flux_fbe060.inst.cfg | ||
| deltacomb_dc30_fbe025.inst.cfg | ||
| deltacomb_dc30_fbe040.inst.cfg | ||
| deltacomb_dc30_fbe060.inst.cfg | ||
| deltacomb_dc30_vfbe080.inst.cfg | ||
| deltacomb_dc30dual_dbe025.inst.cfg | ||
| deltacomb_dc30dual_dbe040.inst.cfg | ||
| deltacomb_dc30dual_dbe060.inst.cfg | ||
| deltacomb_dc30dual_vdbe080.inst.cfg | ||
| deltacomb_dc30flux_fbe025.inst.cfg | ||
| deltacomb_dc30flux_fbe040.inst.cfg | ||
| deltacomb_dc30flux_fbe060.inst.cfg | ||