3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 17:57:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17030 commits 302 branches 270 tags 770 MiB
Commit graph

17030 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jack Ha
0f0b6a9712 Fix/Implement update in toolbox 2018-05-14 16:01:59 +02:00
Diego Prado Gesto
8ad409ff55
Merge branch 'master' into WIP_improve_initialization 2018-05-14 15:15:02 +02:00
Aleksei S
8718ee34c9 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-14 15:04:54 +02:00
Aleksei S
d946733357 Project update after undo click 
CURA-5323
 2018-05-14 15:04:01 +02:00
Ian Paschal
dd14a8e685 CURA-5296 Better finding for packages.json 2018-05-14 14:44:40 +02:00
fieldOfView
7a25841816 Fix support blocker on older (legacy) opengl 2018-05-14 14:29:41 +02:00
Ghostkeeper
757824ae93
Move deleteAll to Uranium 
Because it's used by WorkspaceFileHandler.

Contributes to issue CURA-5330.
 2018-05-14 13:52:31 +02:00
Diego Prado Gesto
4e4dc800a7
Merge pull request #3762 from Ultimaker/Optimization 
PP formula based temperature fixes S5
 2018-05-14 13:39:19 +02:00
Nicolas Graziano
9080e75634 Correct the test to hide bed temperature when no heated bed is present. 2018-05-14 12:13:23 +02:00
Kristel88
1dadc7d1b2 S5 global settings fixes 
Fixes as suggested by Diego
 2018-05-14 12:09:40 +02:00
Diego Prado Gesto
ab0e643481 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-14 11:37:45 +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
Kristel88
cf84adfb73 S5 dimensions were incorrect 
See Jira: CURA-5331
 2018-05-14 11:25:55 +02:00
Aleksei S
c60dad6a4a Merge branch 'master' of github.com:Ultimaker/cura 2018-05-14 11:21:01 +02:00
Aleksei S
83482c0826 remove Malyan printer's quality files, they are duplicated 
CURA-5217
 2018-05-14 11:20:43 +02:00
Diego Prado Gesto
0bb82f144b Make the toolbox window not resizable. 2018-05-14 10:16:18 +02:00
ChrisTerBeke
2ed4b1b014 Fixes for restoring preferences on Linux 2018-05-14 10:16:14 +02:00
ChrisTerBeke
30d66fb8de Copy preferences under Linux to add them to backup, notification messages 2018-05-14 09:47:44 +02:00
ChrisTerBeke
0723a6a63f Merge branch 'feature-backup-manager' of https://github.com/Ultimaker/Cura into feature-backup-manager 2018-05-14 09:00:05 +02:00
ChrisTerBeke
0a75a2b332 Merge branch 'master' into feature-backup-manager 2018-05-14 09:00:00 +02:00
ChrisTerBeke
c43007ca8e
Update git ignore 2018-05-13 15:47:35 +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
2742d61f9b
Add TODO for later 2018-05-13 01:20:42 +02:00
ChrisTerBeke
4429b5b5c1
Count backup items for meta data, small fixes 2018-05-12 23:35:01 +02:00
ChrisTerBeke
0e0492327c
Fix missing argument in application stopped signal callback 2018-05-11 18:15:50 +02:00
ChrisTerBeke
c678b401e3
Merge branch 'feature-backup-manager' of https://github.com/Ultimaker/Cura into feature-backup-manager 
* 'feature-backup-manager' of https://github.com/Ultimaker/Cura:
  Do not safe data after restoring backup
  Rudimentary restore functionality
  Fix pre-installed Ultimaker PC material
 2018-05-11 18:08:11 +02:00
ChrisTerBeke
a7342f4619 Do not safe data after restoring backup 2018-05-11 17:13:40 +02:00
ChrisTerBeke
79cebca9f0 Rudimentary restore functionality 2018-05-11 16:45:32 +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
ab4fea9f73
Merge branch 'thopiekar-patch-2' 2018-05-11 13:57:30 +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
Ghostkeeper
16c9c4a388
Don't correct bed origin any more 
It's not needed with current versions of the Printrbot Simple version of Marlin, or even the version that the printers are shipped with. Thanks to tenten8401 for the debugging.

Fixes #3711.
 2018-05-11 11:47:35 +02:00
Diego Prado Gesto
99622e69bf Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-11 11:45:46 +02:00
Diego Prado Gesto
7d725936ef Clean up the package manager a bit: 
- Remove an unused method.
- Safely check if the plugin info exist
 2018-05-11 11:43:34 +02:00
Ghostkeeper
8e3e5f50b4
Improve translation of short time format 
It wasn't short enough.

Fixes #3692.
 2018-05-11 09:32:52 +02:00
ChrisTerBeke
a394448dee Merge branch 'master' into feature-backup-manager 2018-05-11 09:01:36 +02:00
ChrisTerBeke
6f402c9ea9 Fix pre-installed Ultimaker PC material 2018-05-11 09:00:24 +02:00
Diego Prado Gesto
43657010ba CURA-5164 The Preferences is not a singleton class anymore since in some point 
several instances need to be created.

- In the ThreeMFWorkspaceReader we need to create some temporal
instances of Preferences that makes it not singleton anymore.

- The current preferences are kept in the Application class and so all
the calls to the preferences are changed to get the preferences from
Application.

- The method getInstance in Preferences is kept as deprecated since some
external plugins.
 2018-05-11 08:50:42 +02:00
ChrisTerBeke
84baa30fcc
Merge branch 'master' into feature-backup-manager 
* master:
  CURA-5296 Improvement to using CuraVersion
 2018-05-10 13:48:19 +02:00
Ian Paschal
3dda3f04fb CURA-5296 Improvement to using CuraVersion 2018-05-10 08:42:14 +02:00
ChrisTerBeke
5b8f5e7e08 Merge branch 'master' into feature-backup-manager 2018-05-09 17:58:33 +02:00
ChrisTerBeke
bc424509d9 Fix docstring 2018-05-09 17:58:14 +02:00
Ian Paschal
20a2ea4f2c CURA-5296 Don't crash if no CuraVersion 2018-05-09 17:09:21 +02:00
Jack Ha
dff36da895 CURA-5296 set correct package_id for version upgrades in packages.json 2018-05-09 14:33:43 +02:00
Jack Ha
6b44ec8e4a CURA-5296 undo add version upgrade to required plugins 2018-05-09 14:24:10 +02:00