Commit graph

1787 commits

Author SHA1 Message Date
Jack Ha
892140150a Fix group models bounds check. CURA-3640 2017-04-03 15:06:40 +02:00
Jaime van Kessel
786a4565b7 Added a few plugins to required list 2017-03-31 10:30:13 +02:00
Jaime van Kessel
e0c77231e0 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-30 20:04:18 +02:00
Jaime van Kessel
891aebc366 Removed getBackend from Cura (and onto Uranium) 2017-03-30 20:03:21 +02:00
Lipu Fei
c74ff4b204 Catch exceptions when checking if a file is a project 2017-03-30 19:08:19 +02:00
Jaime van Kessel
0c6d0a0abb Moved recent files into Uranium
USL-41
2017-03-30 18:35:41 +02:00
Jaime van Kessel
dbfa5873ce Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-30 17:03:01 +02:00
Jack Ha
76c1c31cf4 Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-30 16:27:19 +02:00
Jack Ha
1164805a68 WIP Solved stash apply. CURA-3610 2017-03-30 16:26:39 +02:00
Jack Ha
3135dc7d77 Solved MC 2017-03-30 16:20:08 +02:00
Jaime van Kessel
6314d872e1 If we find multiple materials for a new extruder, prefer a read only material
CURA-3147
2017-03-30 16:07:26 +02:00
Jack Ha
fa7a026efe Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-30 16:05:07 +02:00
Jack Ha
da5288ea78 Fix updating allowed areas. CURA-3610 2017-03-30 16:04:57 +02:00
Jaime van Kessel
cd5e883010 Build volume now uses IsSlicable decorator to check for scene changes
CURA-3608 Fixes #1598
2017-03-30 11:24:01 +02:00
Jaime van Kessel
13561bdb46 material_amounts is now defined in init
Somehow this was forgotten, which could cause issues in certain cases.

CURA-3617
2017-03-30 10:47:11 +02:00
jack
3a255b341f Merge pull request #1586 from fieldOfView/fix_radius0
Fix crash when editing material diameter
2017-03-29 10:43:41 +02:00
jack
f50c3f430a Merge pull request #1586 from fieldOfView/fix_radius0
Fix crash when editing material diameter
2017-03-29 10:37:13 +02:00
fieldOfView
ba06f06cd0 Optimize code 2017-03-28 20:17:51 +02:00
Tim Kuipers
7a67ab4e66 Merge branch '2.5' 2017-03-28 12:55:18 +02:00
Jaime van Kessel
6367755875 Disabled center_on_select for windows, as pyqt has a bug with it 2017-03-28 10:21:52 +02:00
fieldOfView
67d66905ba Fix crash when editing material diameter
While editing the diameter value in the materials pane, it can happen that the radius evaluates to 0. This led to a division by zero.

Fixes https://github.com/Ultimaker/Cura/issues/1582
2017-03-26 14:08:07 +02:00
Jaime van Kessel
8023341090 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-23 15:15:08 +01:00
Jaime van Kessel
ecbf0e1e28 Only add center to list for merge if there is one 2017-03-23 15:14:34 +01:00
Jaime van Kessel
94c6b23418 Codestyle & removal unused imports 2017-03-22 11:38:55 +01:00
Jack Ha
72db7772f5 Merge branch '2.5' 2017-03-22 09:44:47 +01:00
Jack Ha
3d6e378289 Revert accidently added test-code. 2017-03-22 09:44:21 +01:00
Jack Ha
8275c419c1 Merge branch '2.5' 2017-03-22 09:34:06 +01:00
Jack Ha
40a7d2fecc Added not supported quality profiles. CURA-3555 2017-03-22 09:33:17 +01:00
Lipu Fei
622ff4e662 Add default for preference "view/invert_zoom" 2017-03-21 13:56:12 +01:00
Lipu Fei
9e5513ade6 Use QUrl to parse fileUrl
CURA-3495
2017-03-21 13:56:11 +01:00
Lipu Fei
f3167bb84b Add dialog for opening a project file
CURA-3495
2017-03-21 13:56:09 +01:00
Jaime van Kessel
70dbeaf256 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-21 13:24:06 +01:00
Jaime van Kessel
90a92dce19 If a container_changes can not be found, handle it more gracefully
CURA-3560
2017-03-21 13:23:50 +01:00
Jaime van Kessel
00258e570f If a container_changes can not be found, handle it more gracefully
CURA-3560
2017-03-21 11:13:10 +01:00
Lipu Fei
555cd58f5e Save with code names for profile override preference
CURA-3561
2017-03-21 09:09:17 +01:00
Jack Ha
df09d49217 Merge branch '2.5' 2017-03-20 14:10:07 +01:00
Jack Ha
2b17f9665f Fix prime tower location/visualization on buildplate. CURA-3525 2017-03-20 14:09:55 +01:00
jack
42e7a0defa Merge pull request #1535 from LipuFei/feature_CURA-3495_open_in_one
CURA-3495 Open project/models menu item
2017-03-20 10:59:40 +01:00
Jack Ha
7604ae62f3 Merge branch '2.5' 2017-03-16 16:04:59 +01:00
Jack Ha
7d62a699fb Capitalize Not Supported. CURA-3390 2017-03-16 16:04:47 +01:00
Jaime van Kessel
f736e74f77 Moved setting of color for convex hull to constructor
This should result in less color changes so should make it slightly faster
CURA-3419
2017-03-16 15:08:06 +01:00
Jaime van Kessel
36b5c369cf Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-16 13:44:26 +01:00
Jaime van Kessel
de02d331c7 Selection tool operation stoped no longer triggers platform physics
CURA-3465
2017-03-16 13:42:29 +01:00
Lipu Fei
e00c68344a CURA-3495 open project/models in one dialog 2017-03-16 13:37:06 +01:00
Jaime van Kessel
e2045b2805 Starting Cura when no machines added but with a model no longer causes exceptions 2017-03-15 10:00:11 +01:00
Jaime van Kessel
138c3db26f Preferred mimetype is now used when saving to local or removable drive
CURA-3496
2017-03-15 09:23:47 +01:00
Jaime van Kessel
c0cdddd098 Cura no longer crashes when NaN is recieved for printtime from engine
CURA-3516
2017-03-14 09:59:55 +01:00
Jack Ha
32d5fbe557 Fixed choosing a quality that is compatible with multiple extruders as fallback. CURA-3510 2017-03-13 17:17:56 +01:00
Lipu Fei
55727f20e5 CURA-3507 Make quality lookup more robust 2017-03-13 09:45:23 +01:00
Lipu Fei
2ac4a7aca9 CURA-3482 _onMaterialMetaDataChanged() should take argument(s) 2017-03-09 14:17:25 +01:00