5 commits

Author	SHA1	Message	Date
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	b59be4c88b	Moved result checking to the Dialog ... CURA-1263	2016-11-16 13:15:15 +01:00
Jaime van Kessel	100e1f4f40	Conflict in quality changes is now handled less naive ... Instead of only checking ID, we also check values of the QC CURA-1263	2016-11-16 13:10:42 +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