Commit History

Author SHA1 Message Date
  Ghostkeeper 1d25f52df6 Merge branch '4.0' 6 years ago
  Ghostkeeper d72a8581bf Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 6 years ago
  Ghostkeeper 380d8ce0c2 Merge branch 'afinkle-master' 6 years ago
  Lipu Fei 4979b401b3 Disable prime blob by default for CFFF 6 years ago
  Ghostkeeper cf2fcc57ee Merge branch 'CURA-6237_fix_remove_materials' into 4.0 6 years ago
  Ghostkeeper 76d9503777 Replace travel_speed with speed_travel 6 years ago
  Ghostkeeper 0fe9e660b1 Don't show Silicone for UM printers that are incompatible with it anyway 6 years ago
  Ghostkeeper 943503cac7 Fix iterating over 'hardware compatible' keys 6 years ago
  Ghostkeeper c7e5ac31a1 Merge branch 'master' of https://github.com/afinkle/Cura into afinkle-master 6 years ago
  Ghostkeeper df8d060a00 Increment setting_version 6 years ago
  Ghostkeeper a7f9fc5f6b Add contribution guidelines 6 years ago
  Ghostkeeper c665a481dd Show settings that influence draft/ooze shields if enabled 6 years ago
  Simon Edwards eff6b58e18 Merge pull request #5375 from Ultimaker/CL-1274_dont_use___file__ 6 years ago
  Jaime van Kessel 6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 6 years ago
  Ian Paschal 88fc7d0fba Don't try to get the plugin path when there's no plugin registry 6 years ago
  Ian Paschal a74717ca3c Get plugin path like most other plugins do 6 years ago
  Ian Paschal 87d4a68c0e Merge remote-tracking branch 'origin/4.0' into CL-1274_dont_use___file__ 6 years ago
  Ian Paschal 3889570697 K.I.S.S. 6 years ago
  Ian Paschal 11ea568d0b Merge pull request #5370 from Ultimaker/CL-1247_hide_view_prints_button_on_cloud 6 years ago
  Ian Paschal c8580cf417 Prevent circular dependencies 6 years ago
  Ian Paschal a1e0ddd9df Don't hardcode plugin directory 6 years ago
  Diego Prado Gesto 3fd0561aca Update the ExtruderModel 6 years ago
  Diego Prado Gesto 0e7127f80b Merge branch 'master' of github.com:Ultimaker/Cura 6 years ago
  Satish c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 6 years ago
  Ghostkeeper ad83cff065 Merge branch 'master' of https://github.com/afinkle/Cura into afinkle-master 6 years ago
  Ghostkeeper 180156da78 Correct whitespace 6 years ago
  Diego Prado Gesto 3f8f363836 Fix the installed checkmark in Marketplace 6 years ago
  Jaime van Kessel 2af3ae8efb Ensure that the materials get removed in order 6 years ago
  Ian cac8c85489 Don't use __file__ 6 years ago
  Ian cf9a1c0248 Sort UM imports alphabetically for easy scanning 6 years ago
  Simon Edwards 4590fae9b2 Hide the "View print history" button when connecting via cloud 6 years ago
  Jaime van Kessel 91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues 6 years ago
  Mark eccfebf39d Update material packages for 4.0 release 6 years ago
  Jaime van Kessel 38a9206898 Merge branch '4.0' of github.com:Ultimaker/Cura 6 years ago
  Jaime van Kessel a8128556f3 Don't drop refresh token if request failed 6 years ago
  Jaime van Kessel 62f913802f Prevent crash if the connection was lost for auth token 6 years ago
  Andrew Finkle 5581cd5c2c Added definition, extruder, material, and variants for Discov3ry Complete 6 years ago
  Andrew Finkle 3f765a9ca2 Revert "Create structur3d_discov3ry1_complete_um2plus.json" 6 years ago
  Andrew Finkle 05e889621e Create structur3d_discov3ry1_complete_um2plus.json 6 years ago
  Ghostkeeper b723beb435 Pre-heat to initial layer temperature instead of normal temperature 6 years ago
  Ghostkeeper 970fa69166 Merge branch 'patch-2' of https://github.com/h0x91b/Cura into h0x91b-patch-2 6 years ago
  Ghostkeeper 470871a0d2 Merge branch 'master' of https://github.com/radfahrer/Cura into radfahrer-master 6 years ago
  Ghostkeeper 1c6cce316a Merge branch '4.0' 6 years ago
  Ghostkeeper 9fba8f5381 Update metadata of translation templates 6 years ago
  Jaime van Kessel 7ed1ee4365 Merge pull request #5365 from Ultimaker/fix-token-expiry 6 years ago
  ChrisTerBeke 9ba342c541 Fix codestyle failure on float conversion 6 years ago
  ChrisTerBeke 365f67cbf8 Have some overlap in token expiry to prevent unauthorized issues 6 years ago
  Ghostkeeper c44a207744 Remove duplicate property 6 years ago
  Ghostkeeper e2adc1791f Merge branch '4.0' 6 years ago
  Ghostkeeper bedb52fb60 Update translation templates for every language 6 years ago