Commit History

Author SHA1 Message Date
  Lipu Fei e00c68344a CURA-3495 open project/models in one dialog 7 years ago
  Jaime van Kessel bae7af1ea0 Dots in the ID no longer confuse workspace reader 7 years ago
  fieldOfView 9229027001 Refactor properties that start with 'get' to avoid confusion between slots & properties 7 years ago
  Jaime van Kessel fa3f473b61 Changed order of buttons 7 years ago
  Jaime van Kessel a7135a0f5f Added machine type to load menu 7 years ago
  Jaime van Kessel 2be773c9a3 Added num user settings to workspace loading 7 years ago
  Jaime van Kessel 0d9355daab All added containers are now set as dirty, so they are saved 7 years ago
  Jaime van Kessel 1752c56272 Merge branch 'master' of github.com:Ultimaker/Cura 7 years ago
  Jaime van Kessel 7ed5a7768a Use logException instead of just log for project loading 7 years ago
  Arjen Hiemstra 3449108d59 Update 3MFWorkspaceReader to handle the new format of ContainerStack 7 years ago
  Jaime van Kessel bc8a9c30cf Use right type for logging 7 years ago
  Jaime van Kessel 535250e714 Loading a project no longer destroys authentication 7 years ago
  Jaime van Kessel db18635049 Instead of emitting signals for all containers, only emit them for top 7 years ago
  Jaime van Kessel a0813b3af3 Added warning when trying to load project with objects on buildplate 7 years ago
  Jaime van Kessel f782a76324 Material labels are now also displayed in the open project dialog 7 years ago
  Jaime van Kessel 04d268b1fb Machine name is now also displayed in open project dialog 7 years ago
  Jaime van Kessel b3f1f6b4db Project load dialog now also gives information about the quality & quality changes 7 years ago
  Jaime van Kessel 6bb1b7ec80 Number of settings & mode are now displayed in open Project 7 years ago
  Jaime van Kessel 5119ee9a93 Use correct descriptor for project open 7 years ago
  Jaime van Kessel 61db5b42b7 Moved loading of meshdata in workspace to after machine has changed 7 years ago
  Jaime van Kessel dcdfe612e7 Added more robust fault handling for preferences while loading workspace 7 years ago
  Jaime van Kessel 484c7df5bc Added a bunch of thread yields 7 years ago
  Jaime van Kessel ef7004fb72 User changes are deserialized by workspacereader if there is no machine conflict 7 years ago
  Jaime van Kessel fa174763cf The 3mf workspace reader no longer locks application if it is accedently called from main 7 years ago
  Jaime van Kessel 60d2d0d092 Workspace reader is now a lot more transactional; 7 years ago
  Jaime van Kessel e3eb75ab6e We now get material container by mimetype 7 years ago
  Jaime van Kessel cba31d95ec Workspace reader now loads from prefered suffix 7 years ago
  Jaime van Kessel 42caf57993 Added "material" to default resolve strategies 7 years ago
  Jaime van Kessel 92a4fd7239 Materials are now also handled in conflict resolvement 7 years ago
  Jaime van Kessel 9f27e7861f Workspace reader now does a pre-check to see if it's a workspace in the first place 7 years ago
  Jaime van Kessel 42be3c7472 Conflict checker for machine now also checks if there is an actual difference 7 years ago
  Jaime van Kessel 053f0ca031 Replaced hack for setting extruders with more robust setter 7 years ago
  Jaime van Kessel b175e6876f Added material conflict option 7 years ago
  Jaime van Kessel b59be4c88b Moved result checking to the Dialog 7 years ago
  Jaime van Kessel 100e1f4f40 Conflict in quality changes is now handled less naive 7 years ago
  Jaime van Kessel fcd4fb86f5 removed debug prints 7 years ago
  Jaime van Kessel f0eb5e0da3 User can now select what strategy to use per conflict 7 years ago
  Jaime van Kessel 47d0e95e53 Loading single extrusion machine from file no longer gives exception 7 years ago
  Jaime van Kessel bade9e1bff Resolve strategy is now always set 7 years ago
  Jaime van Kessel 1db2d06e06 Fixed "new" resolve if only the machine was double. 7 years ago
  Jaime van Kessel 3245c2fe32 Extruder stacks are no longer renamed when loading from workspace 7 years ago
  Jaime van Kessel 2e4b430cf8 User changes are now also updated correctly when resolving to new machine in workspace loading 7 years ago
  Jaime van Kessel b8746aee30 Added hack so the new extruders are added to extruder manager 7 years ago
  Jaime van Kessel c919883178 Extruder stacks now properly get global stack set as next 7 years ago
  Jaime van Kessel 4dc14a72ab Added conversion table for old to new ID's 7 years ago
  Jaime van Kessel 0d4f28b310 MachineStacks & user containers are now also renamed if so required 7 years ago
  Jaime van Kessel 990736b5c6 Implemented quality_changes resolve strategy 7 years ago
  Jaime van Kessel 377752397f Made it possible for machine & quality changes to have different resolve strategies 7 years ago
  Jaime van Kessel 8ae0cfd848 Loading workspace now activates the machine and notifies everyone that it was changed 7 years ago
  Jaime van Kessel d5229992df Override resolve strategy is now handled 7 years ago