Jack Ha
5852a36d94
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-16 09:35:13 +02:00
Jack Ha
e53d4aaab6
101Hero definition: Set the preferred quality to draft (0.2mm) and remove default layer_height so normal profile is back to 0.1. CURA-5217
2018-05-16 09:35:03 +02:00
Ghostkeeper
eab150d7ee
Only look for user package management path in storage dirs
...
If we happen to find it in the installation (or some other place we can't write to) then it's going to crash. So don't do that.
Contributes to issue CURA-5364.
2018-05-16 09:29:03 +02:00
ChrisTerBeke
d27ac3cf31
Merge branch 'master' into feature-backup-manager
2018-05-15 16:50:25 +02:00
Diego Prado Gesto
ed6b63b41b
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-15 16:47:42 +02:00
Diego Prado Gesto
bc965bacfc
CURA-5358 Not use the prefix for installing packages and so no need to
...
rename directories for the packaged files
2018-05-15 16:46:07 +02:00
Aleksei S
27c8b43133
Added setting "support_wall_count" to the expert setting's visibility list
2018-05-15 16:43:02 +02:00
alekseisasin
1756a952ae
Merge pull request #3412 from BagelOrb/support_wall_count
...
support_wall_count setting
2018-05-15 16:35:40 +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
Diego Prado Gesto
5345bc2867
CURA-5358 Fill the dictionaries also if it's a custom material. But
...
making difference between those materials that depend on a built-in
material and those that don't depend on others.
2018-05-15 16:08:19 +02:00
ChrisTerBeke
409b905045
Only trigger settings filter on enter or after 500ms timeout
2018-05-15 15:43:02 +02:00
Diego Prado Gesto
70ca053832
CURA-5358 Add the quality folder to the scope of the VersionUpgrade
2018-05-15 15:32:02 +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
4dd62265b6
Merge branch 'master' into feature-backup-manager
2018-05-15 13:30:27 +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
Diego Prado Gesto
de36be0546
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-15 11:44:34 +02:00
Jack Ha
ed1ba41aa6
Undo setting wrong name in PrintInformation. CURA-5323
2018-05-15 11:42:17 +02:00
Diego Prado Gesto
5d7976c302
Add the aluminum build plate variant to avoid crashes when synching to
...
a S5 with that build plate selected.
2018-05-15 11:41:58 +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
Ghostkeeper
0aa1aaf11b
Fix loading packages.json when file doesn't exist yet
...
Contributes to issue CURA-5364.
2018-05-15 11:23:26 +02:00
Ghostkeeper
0a9f389396
Search for bundled packages file in all search paths
...
For this we need to rename bundled_packages to disambiguate between that and the other packages.json file for user-installed packages.
Contributes to issue CURA-5364.
2018-05-15 11:14:17 +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
49c4f66d95
Ugly fix for uninstalling installed packages, but not uninstalling bundled packages.
2018-05-15 10:50:33 +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
Maxim Kulkin
9cb3960690
Add travel_avoid_supports setting support
2018-05-14 23:43:05 -07:00
alekseisasin
d433c54a0a
If the file type is not registered still show it's name in project field CURA-5323
2018-05-14 17:42:54 +02:00
ChrisTerBeke
e14f57892a
Merge branch 'master' into feature-backup-manager
2018-05-14 17:16:36 +02:00
Jack Ha
0547ad38bd
Undo setting testing version
2018-05-14 16:17:14 +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
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
