 Jaime van Kessel
|
92a4fd7239
Materials are now also handled in conflict resolvement
|
8 years ago |
|
Jaime van Kessel
|
9f27e7861f
Workspace reader now does a pre-check to see if it's a workspace in the first place
|
8 years ago |
|
Jaime van Kessel
|
42be3c7472
Conflict checker for machine now also checks if there is an actual difference
|
8 years ago |
|
Jaime van Kessel
|
053f0ca031
Replaced hack for setting extruders with more robust setter
|
8 years ago |
|
Jaime van Kessel
|
b175e6876f
Added material conflict option
|
8 years ago |
|
Jaime van Kessel
|
b59be4c88b
Moved result checking to the Dialog
|
8 years ago |
|
Jaime van Kessel
|
100e1f4f40
Conflict in quality changes is now handled less naive
|
8 years ago |
|
Jaime van Kessel
|
fcd4fb86f5
removed debug prints
|
8 years ago |
|
Jaime van Kessel
|
f0eb5e0da3
User can now select what strategy to use per conflict
|
8 years ago |
|
Jaime van Kessel
|
47d0e95e53
Loading single extrusion machine from file no longer gives exception
|
8 years ago |
|
Jaime van Kessel
|
bade9e1bff
Resolve strategy is now always set
|
8 years ago |
|
Jaime van Kessel
|
1db2d06e06
Fixed "new" resolve if only the machine was double.
|
8 years ago |
|
Jaime van Kessel
|
3245c2fe32
Extruder stacks are no longer renamed when loading from workspace
|
8 years ago |
|
Jaime van Kessel
|
2e4b430cf8
User changes are now also updated correctly when resolving to new machine in workspace loading
|
8 years ago |
|
Jaime van Kessel
|
b8746aee30
Added hack so the new extruders are added to extruder manager
|
8 years ago |
|
Jaime van Kessel
|
c919883178
Extruder stacks now properly get global stack set as next
|
8 years ago |
|
Jaime van Kessel
|
4dc14a72ab
Added conversion table for old to new ID's
|
8 years ago |
|
Jaime van Kessel
|
0d4f28b310
MachineStacks & user containers are now also renamed if so required
|
8 years ago |
|
Jaime van Kessel
|
990736b5c6
Implemented quality_changes resolve strategy
|
8 years ago |
|
Jaime van Kessel
|
377752397f
Made it possible for machine & quality changes to have different resolve strategies
|
8 years ago |
|
Jaime van Kessel
|
8ae0cfd848
Loading workspace now activates the machine and notifies everyone that it was changed
|
8 years ago |
|
Jaime van Kessel
|
d5229992df
Override resolve strategy is now handled
|
8 years ago |
|
Jaime van Kessel
|
cbcc48ff33
Pre-read now checks for conflicts and asks the user what strategy for resolvement to use
|
8 years ago |
|
Jaime van Kessel
|
99e753d3be
Added loading of preferences form workspace
|
8 years ago |
|
Jaime van Kessel
|
413d788c0c
Fixed copypaste mistake
|
8 years ago |
|
Jaime van Kessel
|
4a2f07c363
Definitions & materials are now loaded from workspace
|
8 years ago |
|
Jaime van Kessel
|
b92ca508bb
Stacks are now loaded from workspace file
|
8 years ago |
|
Jaime van Kessel
|
e30038435c
Added pre-read check for 3mf Reader
|
8 years ago |
|
Jaime van Kessel
|
164f378dd4
Added supported Extensions to workspace reader
|
8 years ago |
|
Jaime van Kessel
|
efc9719ff0
Added stub workspace reader
|
8 years ago |
