GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,514 Commits 293 Branches 266 Tags
Commit Graph

4063 Commits

Author SHA1 Message Date
ChrisTerBeke
41aa31cb2d Merge branch 'master' into feature-backup-manager 2018-05-23 11:07:02 +02:00
Lipu Fei
92fa725ad6 Application.saveSettings() should save everything 2018-05-23 10:00:21 +02:00
Diego Prado Gesto
ba234f5c8a Remove debug prints 2018-05-23 09:38:16 +02:00
Diego Prado Gesto
b8417bcccb If the label tag exists in the xml material file, but without any string 
in it, the label.text return None and then it makes Cura crashing when
creating the models.
This is intended to fix the issue #3750
 2018-05-23 09:34:21 +02:00
ChrisTerBeke
a91916cc1d
Merge branch 'master' into feature-backup-manager 
* master:
  Adds release notes link in version upgrade messagebox CURA-5348
  CURA-5385 Project summary should use scroll view
  CURA-5296 Small QML bug fix
  Enabled drag-n-drop for curapackages
  CURA-5296 Added "canDowngrade" functionality
  Fix CURA_PACKAGES_VERSION
  CURA-5254 Keep track of the latest manual entry key, so it is then selected in the list.
  CURA-5296 Improve button styling
  Add CURA_PACKAGES_VERSION to CMakeLists.txt
  Add CuraPackageVersion
  Remove extra "if" statement and unused code
  Fix support blocker on older (legacy) opengl
  Correct the test to hide bed temperature when no heated bed is present.
 2018-05-22 19:03:09 +02:00
Ian Paschal
7861840886 CURA-5296 Small QML bug fix 2018-05-22 16:04:38 +02:00
Ian Paschal
0b0fb4cd2f CURA-5296 Added "canDowngrade" functionality 
Shows "Downgrade" instead of "Uninstall" for bundled packages with an upgrade installed.
 2018-05-22 14:52:22 +02:00
Diego Prado Gesto
1262d47b15 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-22 12:06:11 +02:00
Diego Prado Gesto
eea9b7ab46 CURA-5254 Keep track of the latest manual entry key, so it is then 
selected in the list.
 2018-05-22 12:05:33 +02:00
Ian Paschal
95a4edb8de CURA-5296 Improve button styling 2018-05-22 11:34:41 +02:00
ChrisTerBeke
15ef3d1d10 Merge branch 'master' into feature-backup-manager 2018-05-18 17:27:05 +02:00
Aleksei S
fc01811792 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-18 17:22:54 +02:00
Aleksei S
314f913510 Remove extra "if" statement and unused code 2018-05-18 17:21:59 +02:00
ChrisTerBeke
e7f70d68c7 Focus on IP address field when adding networked printer 2018-05-18 17:19:14 +02:00
Mark
850f6f9b15 Change name to Community materials 2018-05-17 16:46:32 +02:00
ChrisTerBeke
ddc9da63b8
Still raise exception when loading incorrect material file 2018-05-16 19:22:02 +02:00
ChrisTerBeke
c13b77d8a1
Do not load material when no GUID is present instead of crashing Cura 2018-05-16 19:18:09 +02:00
ChrisTerBeke
419d521e09 Merge branch 'master' into feature-backup-manager 2018-05-16 13:41:57 +02:00
Ghostkeeper
310aee07ac
Code style: Brackets on new line 
As per our code style regulation.

Contributes to issue CURA-5296.
 2018-05-16 13:39:43 +02:00
ChrisTerBeke
d27ac3cf31 Merge branch 'master' into feature-backup-manager 2018-05-15 16:50:25 +02:00
Jack Ha
9281c23555 Fix uninstallable user package which was also bundled; make update package somewhat better by not trying to uninstall builtin package 2018-05-15 16:23:54 +02:00
Jack Ha
fd73751b91 Make the ToolboxProgressButton labels actually overrideable 2018-05-15 16:10:01 +02:00
ChrisTerBeke
4e90e6c2e3 Merge branch 'master' into feature-backup-manager 2018-05-15 14:05:58 +02:00
ChrisTerBeke
bb94ad904a fix 2018-05-15 14:05:40 +02:00
ChrisTerBeke
b7f26ddcc7 Small code improvements 2018-05-15 13:29:01 +02:00
ChrisTerBeke
c9145c6661 Small code improvements 2018-05-15 13:28:33 +02:00
ChrisTerBeke
82a1c95d98 Merge branch 'master' into feature-backup-manager 2018-05-15 12:56:19 +02:00
Ian Paschal
d30bbd48fb CURA-5296 
- Changed API to not use staging
- Fixed crash when pressing cancel
- Added loading icon
 2018-05-15 12:53:05 +02:00
Aleksei S
50dabdbac8 Merge branch 'bugfix-toolbox-update' 2018-05-15 11:51:45 +02:00
ChrisTerBeke
8707d12bf3 Show package version in installed tab 2018-05-15 11:28:00 +02:00
ChrisTerBeke
abcf7bd187 Show package version in installed tab 2018-05-15 11:25:56 +02:00
ChrisTerBeke
0617a95cd0 Add API root as cura version variable 2018-05-15 11:13:27 +02:00
ChrisTerBeke
95c9062913 Merge branch 'master' into feature-backup-manager 2018-05-15 11:05:07 +02:00
Jack Ha
c54957540b Merge branch 'master' into bugfix-toolbox-update 2018-05-15 09:45:14 +02:00
Jack Ha
fccfff14bc Now using api.ultimaker.com instead of api-staging.ultimaker.com 2018-05-15 09:44:58 +02:00
ChrisTerBeke
e14f57892a Merge branch 'master' into feature-backup-manager 2018-05-14 17:16:36 +02:00
Jack Ha
1f088aabc4 Cleanup and simplify toolbox plugin update 2018-05-14 16:11:44 +02:00
Jack Ha
0f0b6a9712 Fix/Implement update in toolbox 2018-05-14 16:01:59 +02:00
Diego Prado Gesto
04534936c3 CURA-5358 Change the name in the dict to search for the 'qualities' that 
are inside a curapackage.
 2018-05-14 11:36:19 +02:00
Diego Prado Gesto
0bb82f144b Make the toolbox window not resizable. 2018-05-14 10:16:18 +02:00
ChrisTerBeke
aa73b88975
Merge branch 'master' into feature-backup-manager 
* master:
  Fix an issue that kept the plugins in the "installed" list despite of already being removed from the data folder.
  Fix some crashes and issues in the Toolbox when working with no internet connection.
  Use the application language for the dates
  Small fixes and change the "plugins" text to "packages"
  Change layout of the installed plugins tab. - There were some alignment problems when there were more than 2 buttons in a column (disable, uninstall and update) - Now the progress bar shows on top of the "Update" button.
  Don't correct bed origin any more
  Clean up the package manager a bit: - Remove an unused method. - Safely check if the plugin info exist
  Improve translation of short time format
  Adding some love
  Updating changelog about engine icon
 2018-05-13 01:21:20 +02:00
ChrisTerBeke
0e0492327c
Fix missing argument in application stopped signal callback 2018-05-11 18:15:50 +02:00
Diego Prado Gesto
527f269b5d Fix an issue that kept the plugins in the "installed" list despite of 
already being removed from the data folder.
 2018-05-11 16:32:31 +02:00
Diego Prado Gesto
fa97d5830b Fix some crashes and issues in the Toolbox when working with no 
internet connection.
 2018-05-11 15:23:40 +02:00
Diego Prado Gesto
675b5b1997 Use the application language for the dates 2018-05-11 14:47:56 +02:00
Diego Prado Gesto
418bedc8f0 Small fixes and change the "plugins" text to "packages" 2018-05-11 14:10:53 +02:00
Diego Prado Gesto
1ecc52e920 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-11 14:10:20 +02:00
Diego Prado Gesto
806b1f707f Change layout of the installed plugins tab. 
- There were some alignment problems when there were more than 2 buttons
in a column (disable, uninstall and update)
- Now the progress bar shows on top of the "Update" button.
 2018-05-11 14:03:28 +02:00
Ghostkeeper
9c010076bb
Merge branch 'patch-2' of https://github.com/thopiekar/Cura into thopiekar-patch-2 2018-05-11 13:56:32 +02:00
Ian Paschal
3dda3f04fb CURA-5296 Improvement to using CuraVersion 2018-05-10 08:42:14 +02:00