7364 Commits

Author SHA1 Message Date
Jaime van Kessel
ecbf0e1e28 Only add center to list for merge if there is one 2017-03-23 15:14:34 +01:00
Lipu Fei
a0f841e8eb Prevent MachineSettings dialog go beyond the top of screen 2017-03-23 13:46:01 +01:00
Lipu Fei
96e9780273 Fix typo in changelog 2.5.0 2017-03-23 08:53:57 +01:00
Lipu Fei
fa7dc3a708 Use onActivated for profile override combobox 2017-03-22 16:01:50 +01:00
Lipu Fei
e35d276e25 Complete Changelog for 2.5.0
CURA-3467
2017-03-22 15:20:57 +01:00
Jack Ha
33d16f8601 Added Not Supported profiles when second extruder is a 0.8 nozzle. CURA-3555 2017-03-22 14:51:53 +01:00
Jack Ha
79ea09d616 Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-22 13:24:21 +01:00
Jack Ha
6dcd4d13e4 Removed quality profile aa0.8 PLA Not Supported. CURA-3555 2017-03-22 13:24:13 +01:00
Lipu Fei
f9e377ec43 Enable/disable Keep/Discard buttons according to selection 2017-03-22 13:07:58 +01:00
Lipu Fei
c6df3adddb Update 2.5.0 BETA ChangeLog
CURA-3467
2017-03-22 10:26:01 +01:00
Jack Ha
3d6e378289 Revert accidently added test-code. 2017-03-22 09:44:21 +01:00
Jack Ha
40a7d2fecc Added not supported quality profiles. CURA-3555 2017-03-22 09:33:17 +01:00
Jaime van Kessel
0752c4440c Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-21 14:43:30 +01:00
Jaime van Kessel
5489fc8caf Added number of missing quality profiles
CURA-3555
2017-03-21 14:43:01 +01:00
jack
6d1a99ff33 Merge pull request #1556 from Ultimaker/feature_more_spacing_override_profile_combobox
Add more spacing between the label and combobox for override profile option
2017-03-21 14:12:40 +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
Lipu Fei
8dbb1d47e1 Shrink the widht of profile override combobox 2017-03-21 11:14:55 +01:00
Lipu Fei
8f3e7c6fa5 More spacing for override profile combobox 2017-03-21 11:05:37 +01:00
jack
07cfe76edb Merge pull request #1553 from Ultimaker/feature_CURA-3561_save_profile_override_with_codes
CURA-3561 Save with code names for profile override preference
2017-03-21 09:31:21 +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
b8d8e4fac3 Updated changelog. CURA-3467 2017-03-20 15:17:18 +01:00
Jack Ha
48c6c523ec Only 3mf nodes with mesh data are getting the sliceable object decorator. CURA-3559 2017-03-20 14:43:46 +01:00
Jack Ha
2b17f9665f Fix prime tower location/visualization on buildplate. CURA-3525 2017-03-20 14:09:55 +01:00
Jack Ha
b21a87b25b Fix not slicing refreshing after deleting last object from loaded project file. CURA-3559 2017-03-20 13:41:47 +01:00
Lipu Fei
8d6ea7bb97 Adjust Discard/Keep Profile Dialog size for high DPI 2017-03-20 11:30:05 +01:00
Tim Kuipers
35516ccc45 JSON fix: tetrehedral infill line distance was wrong (CURA-3474)
the infill line distance in the frontend is the average line distance, not the line distance between two lines which are equidistant
2017-03-17 15:05:01 +01:00
Jack Ha
7d62a699fb Capitalize Not Supported. CURA-3390 2017-03-16 16:04:47 +01:00
Jack Ha
aa691033e0 Added Not Supported profiles for incompatible materials. CURA-3510 2017-03-16 16:01:18 +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
Jaime van Kessel
efce0696bd Recently activated material can no longer be removed
CURA-3147
2017-03-16 13:11:51 +01:00
Jaime van Kessel
36bcd90e08 Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-16 11:27:10 +01:00
Jaime van Kessel
a170624ff1 Disabled the 2.5 upgrader 2017-03-16 11:26:50 +01:00
Jaime van Kessel
1f734d5245 Disabled the start_layers_at_same_position setting 2017-03-16 11:21:08 +01:00
Jaime van Kessel
6da6ae1b9e start_x and start_y are now settable per extruder 2017-03-16 11:19:44 +01:00
Jaime van Kessel
5bcfba0f17 Revert "removal: remove start_layers_at_same_position; it is now mandatory to start each layer near the given position (CURA-3339)"
This reverts commit 1482c27b21fb45819d2a400ede937662f34870ed.
2017-03-16 11:16:55 +01:00
Jaime van Kessel
ad7752bb16 Revert "Updated version of superdraft and verydraft. CURA-3479"
This reverts commit 62de4f9ec6d65c3224c57a9cfcb6b9ec888d6487.
2017-03-16 11:16:02 +01:00
Jaime van Kessel
0c1829af1e Revert "Upgrade built-in instance containers"
This reverts commit b162be4df8c12c89112ba558136e87b63e67e713.
2017-03-16 11:15:20 +01:00
Jack Ha
72f8a349cf Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-15 14:37:13 +01:00
Jack Ha
6731d00ad7 Removed some lines from changelog. 2017-03-15 14:37:06 +01:00
Jaime van Kessel
cb40ae45e8 Added contribution of the g-code plugin to the changelog
CURA-3467
2017-03-15 14:23:09 +01:00
Lipu Fei
18cf9e3172 CURA-3500 Make sure that material XMLs have utf-8 encoding 2017-03-15 11:47:33 +01:00
jack
284e620da2 Merge pull request #1531 from Ultimaker/feature_version_upgrade_2.5
Version Upgrade 2.4 to 2.5
2017-03-14 16:05:43 +01:00
Jack Ha
62de4f9ec6 Updated version of superdraft and verydraft. CURA-3479 2017-03-14 13:09:07 +01:00
Lipu Fei
97b943736b Use translation for text in keep/discard profile dialog 2017-03-14 11:59:51 +01:00
Jack Ha
0a398738b7 Merge branch '2.5' into feature_version_upgrade_2.5 2017-03-14 11:18:14 +01:00
Jack Ha
357f99f77a Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-14 10:43:13 +01:00
Jack Ha
b08249b3a0 Added changelogs. CURA-3467 2017-03-14 10:43:03 +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
Jack Ha
d7e35fa480 Added global qualities for Superdraft and Verydraft. CURA-3510 2017-03-13 14:32:45 +01:00