Commit History

Author SHA1 Message Date
  Simon Edwards fb70eb6813 Merge branch 'master' into python_type_hinting 7 years ago
  Simon Edwards a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 7 years ago
  Jaime van Kessel ff18a314ef Added extruder information to workspace summary dialog 7 years ago
  Jaime van Kessel 8391a7971b Added machine type to workspace summary dialog 7 years ago
  Jaime van Kessel 0e09de195b Added num user settings to save project dialog 7 years ago
  Ghostkeeper c7a8ffb3c0 Set quality to empty if no profiles for current material type 7 years ago
  Simon Edwards d4619da358 Merge branch 'master' into python_type_hinting 7 years ago
  Jack Ha 6e8e7d090d Fix for Not Supported when adding a new machine. CURA-3042 7 years ago
  Jaime van Kessel 0229fd8676 Fixed issue with first startup 7 years ago
  Jaime van Kessel 36d743384c Initial work for adding a save dialog for project saving 7 years ago
  Jack Ha be5a6e421b Merge branch 'master' of github.com:Ultimaker/Cura 7 years ago
  Jack Ha 601d3fa554 Added blurSettings when switching machine to prevent taking values from old machine. CURA-3065 7 years ago
  Jaime van Kessel e0168aac11 Improved logging for _replaceQualityChangesInStack 7 years ago
  Jaime van Kessel 5d1ba828bc Closing load project screen cancels loading of workspace 7 years ago
  Jaime van Kessel a5c38e0591 Assign the empty containers before handling the globalcontainer changed signal 7 years ago
  Jack Ha e888603dd5 Cura startup with setting errors now also results in Unable to slice. 7 years ago
  Jaime van Kessel bde1e05273 Changing an instanceContainer now re-checks the error state of the stacks 7 years ago
  Jaime van Kessel 7a4deb725a Clarified switching message 7 years ago
  Jack Ha b88ed76b7c Solve merge conflict PrinterOutputDevice. CURA-1263 7 years ago
  Jaime van Kessel b6df2b90dd Merge branch 'master' of github.com:Ultimaker/Cura 7 years ago
  Jaime van Kessel a8887406ac ValidationState checking in MachineManager now properly takes functions into account 7 years ago
  Jack Ha c3320bb1a4 Change settings to settings/overrides in selected messages. CURA-2898 7 years ago
  Simon Edwards 98a6568313 Merge branch 'master' into python_type_hinting 7 years ago
  Simon Edwards 14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking). 7 years ago
  Jaime van Kessel 8ae0cfd848 Loading workspace now activates the machine and notifies everyone that it was changed 7 years ago
  Simon Edwards cadf2115ac Merge pull request #1058 from Ultimaker/cura-2730 7 years ago
  Ghostkeeper 6999a14821 Merge branch '2.3' 8 years ago
  Jaime van Kessel af10438277 Fixed blurSetting 8 years ago
  Jaime van Kessel a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 8 years ago
  Ghostkeeper 6c3b4b7f29 Prevent race condition before global container stack is made 8 years ago
  Arjen Hiemstra aed23ca17e Merge branch '2.3' 8 years ago
  Jaime van Kessel 53f360ca1c Merge branch 'global_quality_profiles' of github.com:Ultimaker/Cura into 2.3 8 years ago
  fieldOfView df78bc47af Fix "critical" error when starting with no active machine 8 years ago
  Arjen Hiemstra 2c2bf7823f Account for empty material when switching quality changes 8 years ago
  Arjen Hiemstra 78ac4ef999 Set the global variant and material to empty for multi-extrusion machines 8 years ago
  Arjen Hiemstra e1dafc8288 Also properly set global profile when changing quality_changes profiles 8 years ago
  Arjen Hiemstra e82b2c0f80 Add support for global quality profiles 8 years ago
  fieldOfView 5ce237502c Fix "critical" error when starting with no active machine 8 years ago
  Tim Kuipers 86d682daae Merge branch '2.3' 8 years ago
  Ghostkeeper e02284b1f0 Expose determineQualityAndQualityChangesForQualityType 8 years ago
  Ghostkeeper 16491d8d23 Robustly get layer height even if quality has none 8 years ago
  Ghostkeeper 021023a932 Add property to get the current profile's layer height 8 years ago
  Jack Ha d308cd45bc Moved function out of MachineManager, changed "Valid" to "HaveErrors". 8 years ago
  Jack Ha 98688bf013 Changed MachineManager.isActiveStackValid to MachineManager.areStacksValid. CURA-2730 8 years ago
  Jaime van Kessel 9c73c248ed Merge branch '2.3' of github.com:Ultimaker/Cura 8 years ago
  Jaime van Kessel cda8fd5827 Revert buttons now work for single extrusion machines again 8 years ago
  Jaime van Kessel 87fc0db543 Merge branch '2.3' of github.com:Ultimaker/Cura 8 years ago
  Jaime van Kessel ff24def63c Use globalProfileId to check if we need to show changed settings 8 years ago
  Simon Edwards e2a66b33e0 Merge branch '2.3' 8 years ago
  Simon Edwards 8b487130d2 Take 'linked' settings into account when reverting. 8 years ago