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
..
3MFReader	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
AutoSave	Properly save setting visibility when auto saving	2016-02-17 14:38:38 +01:00
ChangeLogPlugin	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
CuraEngineBackend	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
CuraProfileReader	Import of Logger missing here	2016-03-15 12:34:43 +01:00
CuraProfileWriter	Removing unused imports	2016-03-15 12:50:29 +01:00
GCodeProfileReader	Fix comment	2016-03-02 17:31:58 +01:00
GCodeWriter	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
ImageReader	Cleanup in plugins/ImageReader/ImageReader.py	2016-03-15 12:50:46 +01:00
LayerView	Increased size of the label for layerview a bit more.	2016-04-04 14:42:42 +02:00
LegacyProfileReader	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
PerObjectSettingsTool	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
RemovableDriveOutputDevice	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
SliceInfoPlugin	Using PyDev compatible tag	2016-03-15 12:54:41 +01:00
SolidView	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
USBPrinting	Remove exception logging in USBPrinterManager because it caused an error every 5 seconds.	2016-03-17 16:59:41 +01:00
XRayView	Added weight to viewmode plugins for sorting in the viewmode	2015-12-30 09:53:25 +01:00