Commit History

Author SHA1 Message Date
  Lipu Fei cbd8c8739d Merge from master 6 years ago
  Lipu Fei afa3e62dc1 Merge pull request #4615 from Ultimaker/CURA-5814_Material_cost_now_always_shown 6 years ago
  Lipu Fei 9b94db8957 Directly use empty containers in MachineManager 6 years ago
  Lipu Fei e5efd1e41f Move constant definition into constructor 6 years ago
  Diego Prado Gesto 54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 6 years ago
  Diego Prado Gesto b670cd82c4 Merge branch 'master' into cura4.0_header 6 years ago
  Jaime van Kessel 3ad113f70f Added some missing typing. 6 years ago
  Jaime van Kessel 45da5b9130 Added more specific overrides for get/set globalContainerStack 6 years ago
  Jaime van Kessel 4c5bf3297c Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset 6 years ago
  Diego Prado Gesto 193f113851 Clean up Cura.qml: 6 years ago
  Lipu Fei 18cb21186c Merge remote-tracking branch 'origin/master' into WIP_kill_extruder_manager 6 years ago
  Jaime van Kessel f3fdb46dba Add missing types 6 years ago
  Jaime van Kessel dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 6 years ago
  Jaime van Kessel edb5de9954 Added unit test for settingvisibility presets 6 years ago
  Jaime van Kessel fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class 6 years ago
  Lipu Fei f69005fef9 Rename to CuraFormulaFunctions 6 years ago
  Lipu Fei 8584af415a Merge remote-tracking branch 'origin/CURA-5744-move-oauth-login' into resolve_dependencies_oauth 6 years ago
  Lipu Fei 7ae6800a14 Fix imports in QualityManager 6 years ago
  Lipu Fei dd150bbab9 Resolve circular imports for CuraAPI 6 years ago
  Jaime van Kessel 3b70e5eb6b Fix typing 6 years ago
  ChrisTerBeke 185a1707b2 Merge branch 'master' into CURA-5744-move-oauth-login 6 years ago
  Lipu Fei 7a681a2ae4 Move Cura custom setting functions to a separate file 6 years ago
  Cherubim c29d38361b Fix initial start-up when providing model parameter 6 years ago
  Jaime van Kessel 081b2a28fe Expose Account API to QML 6 years ago
  Lipu Fei a80fde1495 Merge remote-tracking branch 'origin/3.5' 6 years ago
  Lipu Fei 1bf78c086d Remove import plugins which is not a module 6 years ago
  Diego Prado Gesto 8352fd1ae0 Merge branch '3.5' 6 years ago
  Diego Prado Gesto 4bd5d29970 Don't crash if the plugin is not found (maybe some error while loading). 6 years ago
  Diego Prado Gesto 2d300ab395 Revert "Fix plugins import in CuraApplication" 6 years ago
  Ghostkeeper c6fa9474d6 Merge branch '3.5' 6 years ago
  Diego Prado Gesto 7e1a833e9c Merge branch '3.5' into CURA-5682_material_manager_leftovers 6 years ago
  Jaime van Kessel 729d78e14a Updated another set of typing 6 years ago
  Jaime van Kessel e7d9f0ce45 Added typing for various setting classes 6 years ago
  Jaime van Kessel 67bc45e37d Added 3MF writer as required plugin 6 years ago
  Ian Paschal 9e56d6d29f Improved expansion behavior 6 years ago
  Jaime van Kessel 49aeb60e7d Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 6 years ago
  Ian Paschal f6b43bd9ab Merge branch 'master' into feature_favorite_materials 6 years ago
  Ian Paschal 8da7773600 Remove unused code 6 years ago
  Jaime van Kessel 8c2cd510d8 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 6 years ago
  alekseisasin ff38ee2bed Merge pull request #4245 from Ultimaker/CURA-5649_hide_gcodegz_in_save_dialog 6 years ago
  Ian Paschal 08b325ee04 Correctly load material favorites from preferences 6 years ago
  Lipu Fei edc4e2824d Merge pull request #4237 from Ultimaker/fix_unit_tests 6 years ago
  Ghostkeeper 284f90f3ff Fix camera position before adding a printer 6 years ago
  Lipu Fei f42dc24d95 Do not show gcode.gz as an option in save file dialog 6 years ago
  Jaime van Kessel 28dc918e03 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 6 years ago
  Ian Paschal 57d41216e1 Remove dummy favorites 6 years ago
  Ian Paschal 8493948ba1 Add a favorite materials model 6 years ago
  Diego Prado Gesto 3d9c7f7eb5 Merge pull request #4216 from Ultimaker/feature_adjust_zoom_to_printer_size 6 years ago
  Lipu Fei c20274e356 Move constant instance containers to a separate file 6 years ago
  Ghostkeeper f1a7b23a5c Adjust default position of camera based on diagonal size 6 years ago