Lipu Fei
eecbe20830
Enabled drag-n-drop for curapackages
2018-05-22 15:06:27 +02:00
Ian Paschal
0b0fb4cd2f
CURA-5296 Added "canDowngrade" functionality
...
Shows "Downgrade" instead of "Uninstall" for bundled packages with an upgrade installed.
2018-05-22 14:52:22 +02:00
ChrisTerBeke
c2ff2a3832
Merge branch 'master' into feature-backup-manager
2018-05-22 14:52:12 +02:00
Lipu Fei
fea37b52be
Fix CURA_PACKAGES_VERSION
2018-05-22 12:07:44 +02:00
Diego Prado Gesto
1262d47b15
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-22 12:06:11 +02:00
Diego Prado Gesto
eea9b7ab46
CURA-5254 Keep track of the latest manual entry key, so it is then
...
selected in the list.
2018-05-22 12:05:33 +02:00
Ian Paschal
95a4edb8de
CURA-5296 Improve button styling
2018-05-22 11:34:41 +02:00
Lipu Fei
ea421204f3
Add CURA_PACKAGES_VERSION to CMakeLists.txt
2018-05-22 11:02:12 +02:00
Lipu Fei
9f21c2bd86
Add CuraPackageVersion
2018-05-22 10:15:20 +02:00
ChrisTerBeke
efe41a536d
Merge branch 'master' into feature-backup-manager
2018-05-22 09:11:31 +02:00
Mark
74a7452333
Merge pull request #3811 from ngraziano/monitor-no-heating-bed
...
Correct the test to hide bed temperature when no heated bed is present.
2018-05-19 08:24:47 +02:00
Mark
cbf34d64e1
Merge pull request #3813 from fieldOfView/fix_depth_picking_legacy_gl
...
Fix support blocker on older (legacy) opengl
2018-05-19 08:20:56 +02:00
ChrisTerBeke
5b5a8f77b7
Rename Api to API
2018-05-18 17:29:01 +02:00
ChrisTerBeke
2fab1aef33
Rename Api to API
2018-05-18 17:28:54 +02:00
ChrisTerBeke
15ef3d1d10
Merge branch 'master' into feature-backup-manager
2018-05-18 17:27:05 +02:00
Aleksei S
fc01811792
Merge branch 'master' of github.com:Ultimaker/cura
2018-05-18 17:22:54 +02:00
Aleksei S
314f913510
Remove extra "if" statement and unused code
2018-05-18 17:21:59 +02:00
ChrisTerBeke
e7f70d68c7
Focus on IP address field when adding networked printer
2018-05-18 17:19:14 +02:00
Aleksei S
36dbc70813
Remove unnecessary code for taking snapshot for UFP file
...
CURA-5373
2018-05-18 14:01:31 +02:00
Aleksei S
ac0bb2a06b
Merge branch 'master' of github.com:Ultimaker/cura
2018-05-18 10:53:13 +02:00
Aleksei S
1f149b2821
Do not show not printed models on snapshot for UFP files
...
CURA-5373
2018-05-18 10:50:54 +02:00
ChrisTerBeke
a20de3581a
Add info message when failed because of version mismatch
2018-05-18 10:08:00 +02:00
ChrisTerBeke
a0d3dae920
Do not allow restore different version
2018-05-18 10:07:20 +02:00
Mark
850f6f9b15
Change name to Community materials
2018-05-17 16:46:32 +02:00
ChrisTerBeke
7b3f334678
Fix ignored files for Windows
2018-05-17 15:07:28 +02:00
Diego Prado Gesto
8eea60bada
CURA-5358 Fix typos
2018-05-17 14:28:10 +02:00
Diego Prado Gesto
aa07de45ed
Start fixing restore on Windows
2018-05-17 12:13:01 +02:00
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
