GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,471 Commits 295 Branches 268 Tags
Commit Graph

14471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisTerBeke
9410f93dbf Remove unused import 2018-05-17 10:16:13 +02:00
ChrisTerBeke
8b0346e11b For now just ignore locked files on windows 2018-05-17 10:15:11 +02:00
ChrisTerBeke
f00459e4cc revert 2018-05-17 09:32:18 +02:00
ChrisTerBeke
fb40ea13cc Try onerror 2018-05-17 09:25:03 +02:00
ChrisTerBeke
eb436a8b0e Ignore permission error on Windows when trying to remove log file 2018-05-17 09:13:55 +02:00
ChrisTerBeke
8ce05a5831 Merge branch 'feature-backup-manager' of https://github.com/Ultimaker/Cura into feature-backup-manager 2018-05-17 08:52:22 +02:00
ChrisTerBeke
72bc199db8 Merge branch 'master' into feature-backup-manager 2018-05-17 08:52:13 +02:00
ChrisTerBeke
21889130b4
Code cleanup 2018-05-16 19:25:19 +02:00
ChrisTerBeke
cb11608f98
Merge branch 'master' into feature-backup-manager 
* master:
  Still raise exception when loading incorrect material file
 2018-05-16 19:22:19 +02:00
ChrisTerBeke
ddc9da63b8
Still raise exception when loading incorrect material file 2018-05-16 19:22:02 +02:00
ChrisTerBeke
82207e2f6a
Merge branch 'master' into feature-backup-manager 
* master:
  Do not load material when no GUID is present instead of crashing Cura
 2018-05-16 19:19:18 +02:00
ChrisTerBeke
c13b77d8a1
Do not load material when no GUID is present instead of crashing Cura 2018-05-16 19:18:09 +02:00
ChrisTerBeke
da94a5afb1 Merge branch 'master' into feature-backup-manager 2018-05-16 17:55:56 +02:00
Ghostkeeper
e9d2623237
Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-16 17:01:46 +02:00
Ghostkeeper
a74b6047e7
Merge branch 'cross_fractal_infill_reimplementation' 2018-05-16 16:25:38 +02:00
Ian Paschal
1d8a405e86 CURA-5357 Search for license files 
The old code had the problem that by definition it skipped the `files/` folder and any other dir which of course is where the licenses are.

Now, so long as the license is always just called `LICENSE` (which is the convention in open source software), it can be located anywhere.
 2018-05-16 15:16:16 +02:00
ChrisTerBeke
419d521e09 Merge branch 'master' into feature-backup-manager 2018-05-16 13:41:57 +02:00
Ghostkeeper
310aee07ac
Code style: Brackets on new line 
As per our code style regulation.

Contributes to issue CURA-5296.
 2018-05-16 13:39:43 +02:00
jack
4a816d5cd2
Merge pull request #3817 from Ultimaker/settings-search-keystroke-timeout 
Only trigger settings filter on enter or after 500ms timeout
 2018-05-16 13:27:50 +02:00
ChrisTerBeke
c866009df2 Merge branch 'master' into feature-backup-manager 2018-05-16 13:16:37 +02:00
Ghostkeeper
1174f0fa3b
Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-16 10:46:42 +02:00
Ghostkeeper
a59d57d01d
Merge branch 'master' of https://github.com/jbkim/Cura into jbkim-master 2018-05-16 10:46:08 +02:00
Jack Ha
60a21b3d7d 3DMaker Starter 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:42:34 +02:00
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