6 Commits

Author	SHA1	Message	Date
Jaime van Kessel	92a4fd7239	Materials are now also handled in conflict resolvement ... CURA-1263	2016-11-17 11:16:15 +01:00
Jaime van Kessel	053f0ca031	Replaced hack for setting extruders with more robust setter ... CURA-1263	2016-11-16 14:54:48 +01:00
Jaime van Kessel	b175e6876f	Added material conflict option ... This is still desabled by default due to some architecture issues (so this is temporarily left as it is) CURA-1263	2016-11-16 14:45:34 +01:00
Jaime van Kessel	bbf5c73dae	Quality_changes user option is now set correctly ... CURA-1263	2016-11-15 15:11:32 +01:00
Jaime van Kessel	f0eb5e0da3	User can now select what strategy to use per conflict ... CURA-1263	2016-11-15 15:10:10 +01:00
Jaime van Kessel	cbcc48ff33	Pre-read now checks for conflicts and asks the user what strategy for resolvement to use ... CURA-1263	2016-11-11 17:17:23 +01:00