Ghostkeeper 0684cee681 Merge branch '2.1' ... Conflicts: resources/machines/fdmprinter.json resources/machines/innovo-inventor.json resources/profiles/general/High+Quality.cfg resources/profiles/general/Low+Quality.cfg resources/profiles/general/Normal+Quality.cfg resources/profiles/general/Ulti+Quality.cfg resources/profiles/ultimaker2+/pla_0.4_high.curaprofile		2016-04-04 18:49:09 +02:00
..
__init__.py	Add period at end for consistency	2016-03-22 13:35:28 +01:00
Cura.proto	Fixed merge issues & updated proto files	2016-02-02 11:25:10 +01:00
CuraEngineBackend.py	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
ProcessGCodeJob.py	Added documentation	2015-09-17 14:50:52 +02:00
ProcessSlicedObjectListJob.py	Corrections in plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py	2016-03-15 12:32:40 +01:00
StartSliceJob.py	Merge branch '2.1'	2016-03-17 15:24:00 +01:00