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
|
fcd4fb86f5
|
removed debug prints
CURA-1263
|
2016-11-15 15:12:04 +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
|
47d0e95e53
|
Loading single extrusion machine from file no longer gives exception
CURA-1263
|
2016-11-14 17:55:30 +01:00 |
|
Jaime van Kessel
|
bade9e1bff
|
Resolve strategy is now always set
CURA-1263
|
2016-11-14 17:50:54 +01:00 |
|
Jaime van Kessel
|
1db2d06e06
|
Fixed "new" resolve if only the machine was double.
CURA-1263
|
2016-11-14 17:15:29 +01:00 |
|
Jaime van Kessel
|
3245c2fe32
|
Extruder stacks are no longer renamed when loading from workspace
CURA-1263
|
2016-11-14 17:08:43 +01:00 |
|
Jaime van Kessel
|
2e4b430cf8
|
User changes are now also updated correctly when resolving to new machine in workspace loading
CURA-1263
|
2016-11-14 17:04:58 +01:00 |
|
Jaime van Kessel
|
b8746aee30
|
Added hack so the new extruders are added to extruder manager
CURA-1263
|
2016-11-14 15:59:14 +01:00 |
|
Jaime van Kessel
|
c919883178
|
Extruder stacks now properly get global stack set as next
CURA-1263
|
2016-11-14 15:50:07 +01:00 |
|
Jaime van Kessel
|
4dc14a72ab
|
Added conversion table for old to new ID's
CURA-1263
|
2016-11-14 15:32:08 +01:00 |
|
Jaime van Kessel
|
0d4f28b310
|
MachineStacks & user containers are now also renamed if so required
CURA-1263
|
2016-11-14 15:16:17 +01:00 |
|
Jaime van Kessel
|
990736b5c6
|
Implemented quality_changes resolve strategy
This enables the creation of a new quality_changes profile if the user chose to do this
CURA-1263
|
2016-11-14 14:51:10 +01:00 |
|
Jaime van Kessel
|
377752397f
|
Made it possible for machine & quality changes to have different resolve strategies
CURA-1263
|
2016-11-14 13:48:49 +01:00 |
|
Jaime van Kessel
|
8ae0cfd848
|
Loading workspace now activates the machine and notifies everyone that it was changed
CURA-1263
|
2016-11-14 13:30:28 +01:00 |
|
Jaime van Kessel
|
d5229992df
|
Override resolve strategy is now handled
CURA-1263
|
2016-11-14 12:37:26 +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 |
|
Jaime van Kessel
|
99e753d3be
|
Added loading of preferences form workspace
CURA-1263
|
2016-11-11 13:31:36 +01:00 |
|
Jaime van Kessel
|
413d788c0c
|
Fixed copypaste mistake
CURA-1263
|
2016-11-11 10:46:54 +01:00 |
|
Jaime van Kessel
|
4a2f07c363
|
Definitions & materials are now loaded from workspace
CURA-1263
|
2016-11-11 10:39:54 +01:00 |
|
Jaime van Kessel
|
b92ca508bb
|
Stacks are now loaded from workspace file
CURA-1263
|
2016-11-10 15:42:20 +01:00 |
|
Jaime van Kessel
|
e30038435c
|
Added pre-read check for 3mf Reader
CURA-1263
|
2016-11-08 17:36:41 +01:00 |
|
Jaime van Kessel
|
164f378dd4
|
Added supported Extensions to workspace reader
CURA-1263
|
2016-11-08 17:26:01 +01:00 |
|
Jaime van Kessel
|
efc9719ff0
|
Added stub workspace reader
CURA-1263
|
2016-11-08 10:00:00 +01:00 |
|