Jack Ha 0bf037a160 Solved merge conflict

2016-07-19 10:27:59 +02:00

..

__init__.py

Update API version of two required plugins

2016-05-09 12:06:35 +02:00

Cura.proto

We now recieve material estimation per extruder

2016-07-04 17:11:03 +02:00

CuraEngineBackend.py

Merge pull request #843 from thopiekar/master-CURA-1775

2016-07-18 16:51:18 +02:00

ProcessGCodeJob.py

Added documentation

2015-09-17 14:50:52 +02:00

ProcessSlicedLayersJob.py

Raft thickness lowers the build volume.

2016-07-18 16:02:24 +02:00

StartSliceJob.py

material_guid is now also a setting in fdmprinter

2016-07-18 11:46:12 +02:00