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

plugins/3MFReader/WorkspaceDialog.qml

@@ -27,6 +27,7 @@ UM.Dialog
         {
             machineResolveComboBox.currentIndex = 0
             qualityChangesResolveComboBox.currentIndex = 0
+            materialConflictComboBox.currentIndex = 0
         }
     }
     Item
@@ -121,6 +122,35 @@ UM.Dialog
                     }
                 }
             }
+            UM.TooltipArea
+            {
+                id: materialResolveTooltip
+                width: parent.width
+                height: visible ? 25 : 0
+                text: catalog.i18nc("@info:tooltip", "How should the conflict in the material(s) be resolved?")
+                visible: false #manager.materialConflict
+                Row
+                {
+                    width: parent.width
+                    height: childrenRect.height
+                    Label
+                    {
+                        text: catalog.i18nc("@action:label","Material")
+                        width: 150
+                    }
+
+                    ComboBox
+                    {
+                        model: resolveStrategiesModel
+                        textRole: "label"
+                        id: materialResolveComboBox
+                        onActivated:
+                        {
+                            manager.setResolveStrategy("material", resolveStrategiesModel.get(index).key)
+                        }
+                    }
+                }
+            }
         }
     }
     rightButtons: [