Commit graph

7336 commits

Author SHA1 Message Date
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 1482c27b21.
2017-03-16 11:16:55 +01:00
Jaime van Kessel
ad7752bb16 Revert "Updated version of superdraft and verydraft. CURA-3479"
This reverts commit 62de4f9ec6.
2017-03-16 11:16:02 +01:00
Jaime van Kessel
0c1829af1e Revert "Upgrade built-in instance containers"
This reverts commit b162be4df8.
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
jack
7b9ea1073c Merge pull request #1530 from Ultimaker/bugfix_CURA-3507_more-robust-quality-lookup
CURA-3507 Make quality lookup more robust
2017-03-13 10:26:15 +01:00
Lipu Fei
55727f20e5 CURA-3507 Make quality lookup more robust 2017-03-13 09:45:23 +01:00
Ghostkeeper
41e3336ea9
Merge branch 'feature_omp_writeGcode' into 2.5 2017-03-13 09:34:37 +01:00
Ghostkeeper
137de23221
Always prefer 0.4mm nozzles at initial loading
Otherwise we might end up with 0.8mm AA cores, and those don't have a normal quality profile so that gives all sorts of trouble.
2017-03-10 18:20:42 +01:00
Ghostkeeper
74d6d879f7
Implement version upgrade from 2.4 to 2.5
The version upgrade currently only removes the setting start_layers_at_same_position.

Contributes to issue CURA-3479.
2017-03-10 16:58:58 +01:00
Ghostkeeper
b162be4df8
Upgrade built-in instance containers
These are now upgraded to version 3, meaning that they will have to increase their version numbers and remove any start_layers_at_same_position settings they define. None of these profiles define any start_layers_at_same_position so it's just the version number then.

Contributes to issue CURA-3479.
2017-03-10 16:49:57 +01:00
Tim Kuipers
5e782ae85b fix: type fix for last commit (CURA-3440) 2017-03-10 16:03:23 +01:00
Tim Kuipers
b03ac3ea78 JSON fix: skin angle for expansion is max angle; better description (CURA-3440) 2017-03-10 15:59:47 +01:00
Jaime van Kessel
d93b137c95 No longer add nodes that don't have children or MeshData
CURA-3493
2017-03-10 15:48:29 +01:00
Lipu Fei
c9d223acd4 CURA-3452 Save spool cost and weight upon change 2017-03-10 12:41:28 +01:00
Ghostkeeper
039c1b92de
Add profiles for 0.8mm nozzle sizes 2017-03-09 18:11:06 +01:00
Jaime van Kessel
fc929428d4 Merge branch 'bugfix_CURA-3480' of github.com:Ultimaker/Cura 2017-03-09 14:25:39 +01:00
Lipu Fei
2ac4a7aca9 CURA-3482 _onMaterialMetaDataChanged() should take argument(s) 2017-03-09 14:17:25 +01:00
Lipu Fei
fa71f22bf6 CURA-3480 Fix boolean values for Cartesio config files 2017-03-09 14:14:05 +01:00
Lipu Fei
e67aecb041 CURA-3221 Translate column name "Default" 2017-03-08 15:36:11 +01:00
Lipu Fei
8b8fb8db95 Coding style fixes 2017-03-08 15:09:02 +01:00
Lipu Fei
5724ee71d0 CURA-3221 Group items into categories for the profile change summary 2017-03-08 15:08:45 +01:00
Tim Kuipers
3be6a0966b Merge branch 'smartavionics-mb-combing-retract-before-outer-wall' 2017-03-08 13:11:57 +01:00
Jack Ha
af6506e4bb Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-08 12:56:58 +01:00
Jack Ha
fc8bd75ffe Added changelog line for layerview slider. 2017-03-08 12:56:47 +01:00
Tim Kuipers
e20b4ef179 Merge branch 'mb-combing-retract-before-outer-wall' of https://github.com/smartavionics/Cura into smartavionics-mb-combing-retract-before-outer-wall 2017-03-08 11:35:07 +01:00
Tim Kuipers
0f5f163fdf fix: prime tower thickness has rounding (CURA-3180) 2017-03-08 11:05:37 +01:00
jack
c154ce07f8 Merge pull request #1499 from LipuFei/feature_CURA-3397-override-profile-dialog
CURA-3397 Set override profile preference option upon visibility change
2017-03-08 10:32:14 +01:00
Mark Burton
5a7812b4b7 Rename combing_retract_before_outer_wall setting to travel_retract_before_outer_wall.
The forced retraction can now occur irrespective of whether combing is in use or not.
2017-03-08 09:30:58 +00:00
jack
4a68f25769 Merge pull request #1502 from LipuFei/feature_CURA-3221-improve-override-profile-dialog
CURA-3221 improve override profile dialog
2017-03-08 09:52:32 +01:00
jack
2a6ae17514 Merge pull request #1504 from LipuFei/bugfix_CURA-3470-crash-qvariantlist-set
CURA-3470 Return list instead of set for QVariantList
2017-03-08 09:29:28 +01:00
jack
3c8a6a6691 Merge pull request #1505 from LipuFei/bugfix_CURA-3471-crash-on-drag-stl
CURA-3471 Crash on drag and drop STL
2017-03-08 09:23:33 +01:00
Lipu Fei
a20fb7a479 Fix some coding style 2017-03-07 20:18:31 +01:00