GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 01:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,585 Commits 289 Branches 260 Tags
Commit Graph

53 Commits

Author SHA1 Message Date
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