Ghostkeeper 3c9ebfab8f Merge branch '2.3' ... Conflicts: resources/definitions/fdmprinter.def.json resources/materials/generic_abs.xml.fdm_material resources/materials/generic_cpe.xml.fdm_material resources/materials/generic_nylon.xml.fdm_material resources/materials/generic_pla.xml.fdm_material resources/materials/ultimaker_abs_black.xml.fdm_material resources/materials/ultimaker_abs_blue.xml.fdm_material resources/materials/ultimaker_abs_green.xml.fdm_material resources/materials/ultimaker_abs_grey.xml.fdm_material resources/materials/ultimaker_abs_orange.xml.fdm_material resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material resources/materials/ultimaker_abs_red.xml.fdm_material resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material resources/materials/ultimaker_abs_white.xml.fdm_material resources/materials/ultimaker_abs_yellow.xml.fdm_material resources/materials/ultimaker_cpe_black.xml.fdm_material resources/materials/ultimaker_cpe_blue.xml.fdm_material resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material resources/materials/ultimaker_cpe_green.xml.fdm_material resources/materials/ultimaker_cpe_light-grey.xml.fdm_material resources/materials/ultimaker_cpe_red.xml.fdm_material resources/materials/ultimaker_cpe_transparent.xml.fdm_material resources/materials/ultimaker_cpe_white.xml.fdm_material resources/materials/ultimaker_cpe_yellow.xml.fdm_material resources/materials/ultimaker_nylon_black.xml.fdm_material resources/materials/ultimaker_nylon_transparent.xml.fdm_material resources/materials/ultimaker_pla_black.xml.fdm_material resources/materials/ultimaker_pla_blue.xml.fdm_material resources/materials/ultimaker_pla_green.xml.fdm_material resources/materials/ultimaker_pla_magenta.xml.fdm_material resources/materials/ultimaker_pla_orange.xml.fdm_material resources/materials/ultimaker_pla_pearl-white.xml.fdm_material resources/materials/ultimaker_pla_red.xml.fdm_material resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material resources/materials/ultimaker_pla_transparent.xml.fdm_material resources/materials/ultimaker_pla_white.xml.fdm_material resources/materials/ultimaker_pla_yellow.xml.fdm_material Contributes to issue CURA-2737.		2016-10-20 12:41:31 +02:00
..
3MFReader	Apply transformation again	2016-10-07 14:31:48 +02:00
AutoSave	Update AutoSave plugin to work with the new settings API	2016-05-30 15:29:10 +02:00
ChangeLogPlugin	fix: changelog clarity improvements suggested by nickthetait (CURA-2000)	2016-10-11 11:35:20 +02:00
CuraEngineBackend	Fix typo in incompatibility warning message	2016-10-12 16:18:54 +02:00
CuraProfileReader	Upgrade profile function now returns empty list if something went wrong.	2016-09-09 13:23:22 +02:00
CuraProfileWriter	Exporting a profile now exports all profiles in a zipped container	2016-08-26 12:55:31 +02:00
GCodeProfileReader	Store the Quality profile for the 'global' and extruders in the gcode. Read in all of the quality profile during import.	2016-07-12 12:41:49 +02:00
GCodeWriter	Merge branch '2.3'	2016-10-20 12:41:31 +02:00
ImageReader	Merge branch 'master' into simple_convex_hull	2016-06-21 14:47:10 +02:00
LayerView	Fix layerview shade for single extrusion printers	2016-09-22 17:16:08 +02:00
LegacyProfileReader	We now throw an exception when trying to read legacy profile when multi extrusion machine is selected	2016-09-21 09:45:05 +02:00
MachineSettingsAction	Show correct selected gcode flavor now there are more than 2 options	2016-09-19 14:35:54 +02:00
PerObjectSettingsTool	Keep per object extruder when switching machines. CURA-2533	2016-10-12 13:58:09 +02:00
RemovableDriveOutputDevice	Allow for saving multiple scene nodes at the same time	2016-10-17 15:53:33 +02:00
SliceInfoPlugin	Merge remote-tracking branch 'refs/remotes/origin/master-CURA-1445' into master-CURA-1445	2016-09-27 15:40:16 +02:00
SolidView	Increased difference between display color for active/inactive extruder	2016-09-22 11:41:52 +02:00
UltimakerMachineActions	Fix setting heated bed upgrade option	2016-09-07 15:38:27 +02:00
USBPrinting	Allow for saving multiple scene nodes at the same time	2016-10-17 15:53:33 +02:00
VersionUpgrade/VersionUpgrade21to22	Remove splitting profiles for each material	2016-10-06 11:41:39 +02:00
X3DReader	X3D reader no longer creates critical exceptions in the rest of cura	2016-09-21 17:28:38 +02:00
XmlMaterialProfile	Fix exporting materials for machines other than those in the product_id_map	2016-10-10 14:34:53 +02:00
XRayView	Remove unused uniforms from composite shaders	2016-09-19 17:15:22 +02:00