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
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
Ian Paschal
4b931326fd
CURA-5296 Set packages version with super secret method
2018-05-08 15:04:19 +02:00
ChrisTerBeke
c827703417
Fix ignoring files
2018-05-08 13:47:02 +02:00
ChrisTerBeke
1b1d99c4bc
Ignore cura.log in backups
2018-05-08 13:22:17 +02:00
ChrisTerBeke
62c4a88168
Merge branch 'master' into feature-backup-manager
2018-05-08 12:50:31 +02:00
Ian Paschal
0accdc6320
Cura-5296 Use separate packages.json files in app and user data
2018-05-08 11:54:19 +02:00
ChrisTerBeke
a4882d8f83
Fixes for archiving paths in backup, fake meta data
2018-05-08 11:46:09 +02:00
Aleksei S
d083426497
Added MimeTypeDatabase for UFP extension
...
CURA-5323
2018-05-08 10:59:05 +02:00
Aleksei S
9779c41071
Use MimeTypeDatabase to find loaded file extension and set proper project name
...
CURA-5323
2018-05-08 10:47:59 +02:00
Ghostkeeper
304c23b87e
Fix check for existence of gcode_dict variable
...
getattr raises an error if it doesn't exist. It doesn't make the variable None or anything.
2018-05-08 10:44:19 +02:00
ChrisTerBeke
ce0c14451f
Fix spelling in API docs
2018-05-07 17:31:10 +02:00
Ian Paschal
6dbbfe91db
Merge remote-tracking branch 'origin/master' into CURA-5296_bundled_packages
2018-05-07 15:47:28 +02:00
Ian Paschal
4cfd047b11
CURA-5296 Simplifications to CuraPackageManager
2018-05-07 15:47:03 +02:00
ChrisTerBeke
936de402ec
use bytes to pass backup file around, generate in memory, small fixes
2018-05-07 15:40:47 +02:00
ChrisTerBeke
64819d517e
Start implementing backups functionality
2018-05-07 15:09:08 +02:00
Diego Prado Gesto
a6676fb477
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-07 12:57:33 +02:00
Diego Prado Gesto
b576423747
Adapt ovewritten method signature
2018-05-07 11:49:30 +02:00
ChrisTerBeke
32e2723c26
Start class layouts for backups and plugins API
2018-05-07 10:55:24 +02:00
Jack Ha
467e814f88
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-07 10:30:50 +02:00
Jack Ha
00d8427e42
Add sanity check for GlobalStack CURA-5045
2018-05-07 10:30:45 +02:00
Diego Prado Gesto
58289a7b45
Remove useful comment
2018-05-04 17:28:39 +02:00
Ghostkeeper
551cfa9d71
Ignore Mypy cache
...
Don't want to commit that accidentally after running tests.
Contributes to issue CURA-5330.
2018-05-04 15:57:06 +02:00
Ghostkeeper
651f2ffbc9
Return proper exit value if test failed
...
Return 1 then.
Contributes to issue CURA-5330.
2018-05-04 15:57:06 +02:00
Ghostkeeper
ffd1c5cc09
Run Mypy as normal automated test
...
This tests all code for good style.
Contributes to issue CURA-5330.
2018-05-04 15:57:06 +02:00
Diego Prado Gesto
7eda915471
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-04 15:50:47 +02:00
Diego Prado Gesto
2283bb530d
CURA-4644 Fix unselectable item in the Toolbox
2018-05-04 15:49:37 +02:00
Diego Prado Gesto
b8d442a1ac
Merge pull request #3760 from fieldOfView/fix_missing_units
...
Add some missing units to machine settings
2018-05-04 15:07:09 +02:00
Diego Prado Gesto
be81d4c4cc
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-04 15:01:16 +02:00
Ian Paschal
4a2e36978e
Merge remote-tracking branch 'origin/master' into CURA-5296_bundled_packages
2018-05-04 15:00:40 +02:00