Diego Prado Gesto 554a3fd908 Merge branch 'master' into mypy_fixes ...

Conflicts:
cura/Backups/Backup.py
cura/Settings/ExtruderManager.py
cura/Settings/MachineManager.py

2018-06-13 11:53:02 +02:00

..

Settings

Remove unused target_container parameter

2018-06-01 14:53:54 +02:00

TestArrange.py

CURA-5370 The minimum offset between objects in the Arranger is now determined by the brim/skirt/... setting

2018-05-23 12:54:18 +02:00

TestMachineAction.py

Fix unit test

2017-10-02 15:12:56 +02:00

TestProfileRequirements.py

Set encoding correctly when opening files everywhere

2018-06-11 11:09:07 +02:00