14661 Commits

Author SHA1 Message Date
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
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
Jack Ha
9daf85b632 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-09 14:19:40 +02:00
Jack Ha
cf61059449 CURA-5296 added version upgrades to required plugins 2018-05-09 14:19:30 +02:00
Jack Ha
b17685d075 CURA-5296 fix model property mismatch 2018-05-09 13:59:45 +02:00
Ruben D
6772dc9ea7
Show g-code in position it would print
Rather than trying to retrieve from the g-code what the position was that it was originally sliced. It was trying to find whether it was sliced for a printer with center_is_zero by seeing if there are any negative coordinates in the g-code, which was faulty. Now we don't even try to do that any more. We just find where the print would end up if it were printed with the currently selected printer.

Contributes to issue CURA-5068 and fixes #3634.
2018-05-09 13:25:41 +02:00
Ruben D
fb2a8c8d57
Fix typing of paths
There is still something up with the E values. Most probably an actual bug. We'll investigate.

Contributes to issue CURA-5330.
2018-05-09 13:25:41 +02:00
Ruben D
af06096e08
Add typing
As per code style.

Contributes to issue CURA-5330.
2018-05-09 13:25:41 +02:00
Jack Ha
45fc8480a1 CURA-5296 fix first startup not loading bundled packages 2018-05-09 13:18:02 +02:00
ChrisTerBeke
703e52c0c7 Ignore cura.cfg in the backups as it might contain secret data from plugins 2018-05-09 11:25:19 +02:00
ChrisTerBeke
c90a958eaf Merge branch 'master' into feature-backup-manager 2018-05-08 17:27:54 +02:00
Ian Paschal
7ac7f91d5d
Merge pull request #3790 from Ultimaker/CURA-5296_bundled_packages
Cura-5296 Make bundled resources visible to CuraPackageManager
2018-05-08 17:03:55 +02:00
Ian Paschal
4a78825f55 CURA-5296 Delete package info individually 2018-05-08 17:03:09 +02:00
Ian Paschal
d6ad8ed09e CURA-5296 Move installed plugins to "installed" dict 2018-05-08 16:52:09 +02:00
Ian Paschal
db15b1c2a1 CURA-5296 Fix packages.json path 2018-05-08 16:28:28 +02:00
Ian Paschal
0561c66e47 CURA-5096 Remove unused leftovers 2018-05-08 15:38:18 +02:00