Aleksei S
4a26cf0cbd
Merge branch 'master' of github.com:Ultimaker/cura
2018-05-04 10:30:03 +02:00
Aleksei S
dfd9283ed5
Project name after importing
...
CURA-5323
2018-05-04 10:29:09 +02:00
Diego Prado Gesto
61a6a176b9
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-04 09:09:20 +02:00
Jaime van Kessel
7c80bc203c
Fixed bunch of wrong / missing typing
2018-05-03 21:14:06 +02:00
Jaime van Kessel
7d2257838b
Added missing typing
2018-05-03 20:42:06 +02:00
Jaime van Kessel
34483b4b34
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-03 20:27:35 +02:00
Jaime van Kessel
21e2fcbcf6
Also added missing context usage of archive
2018-05-03 20:27:02 +02:00
Ruben D
f3be394080
Properly get the application
...
Why are we getting this passed via parent???
2018-05-03 20:26:20 +02:00
Jaime van Kessel
7665f8a7cb
Reading packages from archive now uses With context
2018-05-03 20:22:38 +02:00
Aleksei S
defb22dc07
Keep 'dot' in file name for type *.gcode.gz
...
CURA-5323
2018-05-03 18:11:45 +02:00
Diego Prado Gesto
a1e6792664
Set the LocalContainerProvider as a required plugin.
2018-05-03 18:03:30 +02:00
Diego Prado Gesto
5b8f426ea2
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-03 16:14:34 +02:00
Diego Prado Gesto
0d56d72760
CURA-5234 Make use of the function to add wrong containers to the set.
2018-05-03 16:14:08 +02:00
Mark
ce7f64d8e3
ignore empty directories in plugin folder
2018-05-03 14:36:08 +02:00
ChrisTerBeke
80d7dc18cb
Fix is_dir for Python 3.5
2018-05-03 13:37:33 +02:00
Aleksei S
b1c9b04a7a
Fix: filenames cut by first dot, remove only file extension because file might have dot in name
...
CURA-5323
2018-05-02 17:17:45 +02:00
Diego Prado Gesto
24684d5d9c
CURA-5234 When adding a material node, first check if the variant exists, otherwise do not create the node.
2018-05-02 16:37:56 +02:00
Lipu Fei
49649e3d4a
Add final so the management JSON is always saved
...
CURA-5035
2018-05-02 12:57:26 +02:00
Lipu Fei
09af97634d
Simplify code
...
CURA-5035
2018-05-02 12:53:33 +02:00
Lipu Fei
5cc5f32a73
Remove unnecessary is_bundled modifications
...
CURA-5035
2018-05-02 12:52:29 +02:00
Lipu Fei
d4cf944e11
Simplify code
...
CURA-5035
2018-05-02 12:51:13 +02:00
Lipu Fei
8250ea8366
Add version for cura package management JSON
...
CIRA-5035
2018-05-02 12:50:50 +02:00
Ian Paschal
87e1f98156
Merge pull request #3663 from Ultimaker/feature_material_marketplace
...
Feature material toolbox; all changes made
2018-05-02 12:23:13 +02:00
Ian Paschal
62aeb6c954
CURA-5035 Review feedback
2018-05-02 12:01:29 +02:00
Ruben D
91faf884fe
Enable backface culling for origin mesh
...
It won't matter a whole lot for those 36 triangles in the origin mesh. It reduces the number of triangles to render by 18. But you know, the little bits help.
2018-05-02 09:21:51 +02:00
Diego Prado Gesto
e79324c448
Remove duplicate line
2018-05-01 15:53:16 +02:00
Lipu Fei
9a5fb47a6e
Merge master into material marketplace
2018-05-01 11:56:34 +02:00
Lipu Fei
cc207a3f92
Clean up unused variables
2018-05-01 11:53:52 +02:00
Lipu Fei
863d67ae64
Use Resources.Plugins for finding plugin storage path
2018-05-01 11:16:21 +02:00
Lipu Fei
7ee085fe50
Check all subdirs in data storage dir for package removal
2018-05-01 10:48:03 +02:00
Ian Paschal
096f304aef
CURA-5035 Crash because old packages don't have 'author_id'
2018-05-01 10:45:22 +02:00
Lipu Fei
51abd32328
Use dict get fallback to prevent errors
2018-05-01 10:33:48 +02:00
Lipu Fei
1fb2edace5
Use ContainerRegistry.lockFile in Cura package management
...
Prevent concurrent I/O issues.
2018-05-01 10:31:56 +02:00
Lipu Fei
cff4dc8a0c
Use json.load() directly
2018-05-01 10:28:42 +02:00
Ian Paschal
01007946b4
CURA-5035 Separate API calls!
2018-04-30 16:42:11 +02:00
Diego Prado Gesto
d91dabb087
Merge branch 'master' of github.com:Ultimaker/Cura
2018-04-30 15:16:23 +02:00
Diego Prado Gesto
b582ac7526
CURA-5253 Initialize UI elements right after the qml files were loaded.
2018-04-30 15:09:52 +02:00
Lipu Fei
00dbf2c694
Change a logging line to an error
...
CURA-5301
2018-04-30 10:23:43 +02:00
Diego Prado Gesto
27b1e2cdd6
Fix format and add error message to log. Contributes to CURA-5301
2018-04-26 15:49:18 +02:00
Ian Paschal
679f87ebb3
CURA-5035 Don't show required plugins
...
Also renamed folder of UserAgreementPlugin to UserAgreement
2018-04-26 15:11:32 +02:00
Ian Paschal
332b7fb497
CURA-5035 Remove uncessary VersionTools
2018-04-26 13:17:00 +02:00
Lipu Fei
d393316a27
Merge pull request #3638 from fieldOfView/fix_variant_hardware_type_crash
...
Fix a crash when a variant has no hardware_type
2018-04-26 09:35:33 +02:00
Jack Ha
efdccb593f
Merge branch '3.3'
2018-04-25 16:35:20 +02:00
Lipu Fei
df1e15b1e5
Move the definition_changes fix to CuraContainerStack
...
CURA-5281
2018-04-25 16:12:47 +02:00
Ghostkeeper
4aec316b48
Prevent homing twice on printers that don't support X/Y specialisation
...
If the X Y is ignored and it just executes G28, it still executes it only once now.
2018-04-25 13:29:07 +02:00
Lipu Fei
ec9be7a103
Merge remote-tracking branch 'origin/3.3'
2018-04-25 12:55:21 +02:00
Lipu Fei
1d8c2bea98
Do not reset quality if the current custom quality is based on not supported
...
CURA-5285
2018-04-25 12:40:10 +02:00
Lipu Fei
c4994918c8
Make sure all stacks in a loaded machine have non-empty definition_changes container
...
CURA-5281
2018-04-25 11:16:02 +02:00
Diego Prado Gesto
3b499edac5
Add back the setAcceptsCommands function with a deprecated decorator.
2018-04-25 10:20:48 +02:00
Ghostkeeper
4fc29554ef
Don't process inheritance before there is an active global container
...
This could be called after an extruder was disabled by a broken configuration.
Fixes #3570 .
2018-04-25 09:59:25 +02:00