Jaime van Kessel
ea3acd6c35
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-14 10:00:32 +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
Jaime van Kessel
746d8053f7
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-14 09:43:51 +01:00
Ghostkeeper
7a30b29458
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-13 17:24:17 +01:00
Ghostkeeper
9b7f054d32
Merge branch '2.5'
2017-03-13 17:23:59 +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
Jaime van Kessel
1c7c5545b5
Comment checking now uses startswith
2017-03-13 15:52:42 +01:00
Jaime van Kessel
ae97e60ee4
Added logging if unknown feature type was encountered
2017-03-13 15:48:30 +01:00
Jaime van Kessel
b57c5af348
Added documentation
2017-03-13 15:45:59 +01:00
Jaime van Kessel
412b8bcb41
Moved check to inside if statement to prevent undeeded parsing
2017-03-13 15:34:30 +01:00
Jaime van Kessel
69b8a06eca
Added documentation why gcode0 was defined to be the same as gcode1
2017-03-13 15:33:04 +01:00
Jaime van Kessel
3c9010fde4
Minor refactor to improve readability
...
CURA-3390
2017-03-13 15:29:25 +01:00
Jack Ha
d7e35fa480
Added global qualities for Superdraft and Verydraft. CURA-3510
2017-03-13 14:32:45 +01:00
Jaime van Kessel
6167dc2350
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-13 13:31:53 +01:00
Ghostkeeper
b29ccdc659
Add Uranium to PYTHONPATH for testing
...
This 'assumes' you have Uranium as a sister-directory next to Cura. This is how it's always been. We should probably change that to a CMake variable some day.
2017-03-13 12:41:59 +01:00
Ghostkeeper
e83fd3a321
Remove old adding of tests
...
No longer needed.
2017-03-13 12:40:47 +01:00
Ghostkeeper
1d22d87ae0
Ignore .cache directory created by unit tests
...
CTest creates this directory for its test results.
2017-03-13 12:40:10 +01:00
Ghostkeeper
ecc973951e
Support running unit tests for plug-ins
2017-03-13 12:30:47 +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
8becc9b119
Merge branch '2.5'
2017-03-13 09:34:47 +01:00
Ghostkeeper
41e3336ea9
Merge branch 'feature_omp_writeGcode' into 2.5
2017-03-13 09:34:37 +01:00
Ghostkeeper
5d0f7f9042
Merge branch '2.5'
2017-03-10 18:20:58 +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
Tim Kuipers
f321417d9e
Merge branch '2.5'
2017-03-10 16:03:38 +01:00
Tim Kuipers
5e782ae85b
fix: type fix for last commit (CURA-3440)
2017-03-10 16:03:23 +01:00
Tim Kuipers
0f6c47f467
Merge branch '2.5'
2017-03-10 16:00:57 +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
Jaime van Kessel
370f90db68
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-10 14:24:05 +01:00
Jaime van Kessel
1d7bf51152
Added confirmation message for starting new project
...
CURA-3494
2017-03-10 14:10:24 +01:00
Lipu Fei
c9d223acd4
CURA-3452 Save spool cost and weight upon change
2017-03-10 12:41:28 +01:00
Jaime van Kessel
66afc2a391
Added new project option
...
CURA-3494
2017-03-10 11:02:27 +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
