Commit History

Author SHA1 Message Date
  Ghostkeeper 9ea418c0a1 Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"" 4 years ago
  Ghostkeeper 28f4d8513d Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7" 4 years ago
  Ghostkeeper 23ba40e54f Clarify replacement key in translated text 4 years ago
  Nino van Hooff 58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 4 years ago
  Kostas Karmas f677be14c2 Fix spacing 4 years ago
  Kostas Karmas 4e930b4d52 Remove unused "has_cloud_connection" variable 4 years ago
  Nino van Hooff 252b993169 Refactor removal warning message to CloudOutputDeviceManager 4 years ago
  Nino van Hooff c61f5a162e Update remote and local printer labels in Machines page 4 years ago
  Nino van Hooff 3d19e75c82 Notify user of proper way to remove cloud printer 4 years ago
  Jelle Spijker 120541a8db Updated comments in Models 4 years ago
  Lipu Fei 71e32d94f7 Resolve merge conflicts 5 years ago
  Ghostkeeper ab0cef95e8 Sort secondarily by printer name 5 years ago
  Lipu Fei d6f4ddc322 Simplify GlobalStacksModel 5 years ago
  Lipu Fei 4a171eebf6 Move models around again 5 years ago