Commit History

Author SHA1 Message Date
  j.spijker@ultimaker.com 1e4fe93d64 Output to log if no conan_install_info.json was found 2 years ago
  j.spijker@ultimaker.com 7f27058a6b Output the Conan Info to the logs 2 years ago
  j.spijker@ultimaker.com 8500e34f25 Use the app_root to obtain the resources 2 years ago
  j.spijker@ultimaker.com ed3f342e7f Search unsecure when not frozen 2 years ago
  j.spijker@ultimaker.com 2cee093d0b Map new conan local cache resources 2 years ago
  c.lamboo a967462038 Add res folder to resource folder 2 years ago
  j.delarago a87695cd8d Added new intent selection buttons and resolution drop down to replace the matrix. 2 years ago
  j.delarago be25029aca This fix will stop enterprise versions from searching the user config folder for non storage type resources. 2 years ago
  Remco Burema 050a731663 In secure version: disable loading themes from unbundled folders. 2 years ago
  Ghostkeeper 4fd0d34b1c Remove extra resource path from Python file 2 years ago
  Remco Burema 5a43e5945c Fix Cura not closing properly on Windows. 2 years ago
  Jelle Spijker fb22a04d4d Add search path for the pyinstaller locations 2 years ago
  j.delarago b2b1961b57 Merge branch 'master' into qt6_beyond_the_splash 2 years ago
  Ghostkeeper d9d90ab4b6 Increment setting_version to 20 2 years ago
  Jelle Spijker 12ee57e4ad Merge branch 'master' into CURA-8640_PyQt6 2 years ago
  Jaime van Kessel e925f07aad Remove old arranger code 2 years ago
  Jelle Spijker 3f8907d02a Merge branch 'master' into CURA-8640_PyQt6 2 years ago
  Jaime van Kessel daa4c20df4 Use intConversion instead of Str for extruder & optionalExtruder 2 years ago
  Ghostkeeper c7d7dd11d1 Merge branch 'master' into PyQt6_upgrade 2 years ago
  Jaime van Kessel f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2 years ago
  Ghostkeeper 7f8591718d Remove central messageBox in favour of local box 2 years ago
  Ghostkeeper efcd00e2f3 Merge branch 'master' into marketplace_redesign 2 years ago
  Jaime van Kessel 6e4143ba59 Merge branch '4.13' of github.com:Ultimaker/Cura 2 years ago
  Jaime van Kessel 3bfea5b970 Ensure that stored log lines are sent to sentry if they haven't already been logged 2 years ago
  Jaime van Kessel 7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2 years ago
  Ghostkeeper a878cfae7a Merge branch 'master' into marketplace_redesign 2 years ago
  Remco Burema b794ad6ed2 Delete old 'Toolbox' in favour of new Marketplace. 2 years ago
  Remco Burema 448fbf7408 Qt5->Qt6: Register QML enums as (uncreatable) meta object not type. 2 years ago
  Remco Burema 20b435af76 Qt5->Qt6: More renamed stuff. 2 years ago
  Remco Burema 97da0b9183 Qt5->Qt6: Fix another stack-overflow error for newer Python/Qt. 2 years ago
  Remco Burema 6dc6020217 Qt5->Qt6: GUI-attributes and flips params register singletons. 2 years ago
  Remco Burema b62e708b87 Qt5->Qt6: (Until) attempted fix Python 3.10 'stack overflow' issue. 2 years ago
  Remco Burema 7021ff0b67 Qt5->Qt6: Replace QT_ENUMS with pyqtEnum. 2 years ago
  Remco Burema abe7c1bf7f Search/replace Qt5->Qt6. 2 years ago
  Ghostkeeper 9140b71b19 Merge branch 'libArachne_rebased' 2 years ago
  casper e5c8d5456d Directly use bindings in banner pages 2 years ago
  casper 3ddfa6486b Remove banners when clicking close button 2 years ago
  Ghostkeeper b8ccb32836 Merge branch 'master' into libArachne_rebased 3 years ago
  Jaime van Kessel c1a839ccaa Also ensure that extruder settings are correct when discarding unsaved changes 3 years ago
  Remco Burema 112f61e32f Fix URL's for the update checker for Beta's. 3 years ago
  Remco Burema 8c8ec5391f Revert settings-version to the one for Arachne-builds. 3 years ago
  Remco Burema 86046a32b3 Merge branch 'master' into merge_main_20211019 3 years ago
  Remco Burema 2ed837ba71 Merge pull request #10486 from Ultimaker/use_empty_qurl_if_path_doesnt_exist 3 years ago
  Konstantinos Karmas ad6a8d828e Merge branch 'master' into CURA-8510_version_upgrade 3 years ago
  Jaime van Kessel ee96080540 Only return the path if the folder actually exist 3 years ago
  Konstantinos Karmas 3e143a012a Change the setting version to 19 3 years ago
  Jaime van Kessel 11b1998156 Fix single instance 3 years ago
  Ghostkeeper 453b666b1d Increment setting_version to 18 3 years ago
  Jaime van Kessel cfb147853e Merge branch 'master' of github.com:Ultimaker/Cura into libArachne_rebased 3 years ago
  luz paz d68f375e38 Fix various typos 3 years ago