Jaime van Kessel
|
92a4fd7239
Materials are now also handled in conflict resolvement
|
8 лет назад |
Jaime van Kessel
|
053f0ca031
Replaced hack for setting extruders with more robust setter
|
8 лет назад |
Jaime van Kessel
|
b175e6876f
Added material conflict option
|
8 лет назад |
Jaime van Kessel
|
bbf5c73dae
Quality_changes user option is now set correctly
|
8 лет назад |
Jaime van Kessel
|
f0eb5e0da3
User can now select what strategy to use per conflict
|
8 лет назад |
Jaime van Kessel
|
cbcc48ff33
Pre-read now checks for conflicts and asks the user what strategy for resolvement to use
|
8 лет назад |