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
..
__init__.py	Filter the list of quality changes taking into account the quality(-type) profile they depend on.	2016-10-05 09:32:18 +02:00
ContainerManager.py	Merge current quality_changes values into newly created profiles	2016-10-06 14:47:35 +02:00
ContainerSettingsModel.py	Use ListModel.setItems() instead of appending one item at a time	2016-08-29 13:43:02 +02:00
CuraContainerRegistry.py	Bugfix in logging when trying to import broken profile. CURA-787	2016-10-20 11:39:01 +02:00
ExtruderManager.py	Extruder manager now uses right definition for material selection	2016-10-07 17:42:56 +02:00
ExtrudersModel.py	Fix showing profile values for extruders	2016-10-03 17:04:46 +02:00
MachineManager.py	Merge branch '2.3' of github.com:Ultimaker/Cura	2016-10-16 16:14:47 +02:00
MaterialSettingsVisibilityHandler.py	Introduce a MaterialSettingsVisibilityHandler that will only show those settings relevant for materials	2016-06-28 17:30:46 +02:00
ProfilesModel.py	A small fix for the case when Cura is starting up and there is no printer.	2016-10-13 11:12:43 +02:00
QualityAndUserProfilesModel.py	A small fix for the case when Cura is starting up and there is no printer.	2016-10-13 11:12:43 +02:00
QualitySettingsModel.py	Quality_changes are now taken into account for UM3Extended	2016-10-15 18:36:05 +02:00
SettingInheritanceManager.py	Fixed for the inheritance icon and custom profiles.	2016-10-18 13:18:56 +02:00
SettingOverrideDecorator.py	Keep per object extruder when switching machines. CURA-2533	2016-10-12 13:58:09 +02:00
UserProfilesModel.py	Filter the list of quality changes taking into account the quality(-type) profile they depend on.	2016-10-05 09:32:18 +02:00