Andreea Scorojitu
9bcc4da4a1
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-15 13:40:56 +01:00
Andreea Scorojitu
7aeaf661ae
Change_Color_UI_elements_CURA-4548
2017-11-15 13:40:46 +01:00
Diego Prado Gesto
50308c6e39
CURA-4526 Calculate the line width from the GCode
2017-11-15 13:03:36 +01:00
Thomas Karl Pietrowski
b2da4894b1
CuraApplication: Rename file --> file_name
...
'file' is a built-in function!
2017-11-15 01:21:08 +01:00
Ruben D
8dd91519a6
Move Support Chunk Size out of children of skip_some_zags
...
The rule is that leaf settings are the ones that are used by the engine. The support_skip_some_zags setting is used by the engine.
2017-11-15 00:54:08 +01:00
Aleksei S
3d2868c336
Added icons
...
CURA-4527
2017-11-15 00:43:17 +01:00
Diego Prado Gesto
99319b223c
CURA-4526 GCodeReader now reads the feedrate and layer thickness
2017-11-14 15:28:31 +01:00
MaukCC
b081b686a8
Merge branch 'master' into cura/Cura/master
2017-11-14 11:59:35 +01:00
Mark
913bcf45b1
Add stderr to send errors to
2017-11-14 11:53:24 +01:00
MaukCC
38882c6d13
Update cartesio.def.json
2017-11-14 10:53:51 +01:00
maukcc
ef2d9b0468
Cartesio profiles
...
updated prime tower
update PC profiles
2017-11-14 10:30:10 +01:00
Diego Prado Gesto
1008789364
Merge branch 'master' into print_simulation_view
2017-11-13 11:28:27 +01:00
Diego Prado Gesto
720b9ebdfa
CURA-4556 Add profiles for AA0.25 and BAM material
2017-11-13 11:06:27 +01:00
Ruben D
6d05c320a8
Remove disfunctional initial layer z offset settings
...
The pull request for the engine wasn't merged. It looks like the pull request for the front-end settings wasn't merged either, but here they are. They shouldn't be here.
Fixes #2744 .
2017-11-11 17:51:33 +01:00
Diego Prado Gesto
aa9f9d5b88
Add line thickness and feedrate to the data sent from the backend
2017-11-10 16:59:06 +01:00
ChrisTerBeke
88cf40e2d7
Merge branch 'master' into container_stack_improvements
2017-11-10 14:35:13 +01:00
ChrisTerBeke
6f298d1602
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-10 14:34:28 +01:00
Jaime van Kessel
41acedd4c1
Merge branch 'master' of github.com:Ultimaker/Cura
2017-11-09 13:52:20 +01:00
Jaime van Kessel
f2e7fef747
Update PreviewPass so that only slicable objects are rendered
2017-11-09 13:51:47 +01:00
Andreea Scorojitu
723d593827
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-09 12:02:13 +01:00
Andreea Scorojitu
477e295e70
Change_Color_UI_elements_CURA-4548
2017-11-09 12:02:01 +01:00
Lipu Fei
637d1a1da3
Fix Vertex Delta K8800 definition file
2017-11-09 10:37:51 +01:00
Diego Prado Gesto
1ff2541947
Add nozzle color to the default themes
2017-11-09 10:34:35 +01:00
Lipu Fei
b0144c7f10
Merge pull request #2740 from kaleidoscopeit/master
...
New machine definition : Deltacomb 3D
2017-11-09 10:33:53 +01:00
kaleidoscopeit
714c0f25da
Set all "setting_version" in qualitites to 4
2017-11-09 10:25:30 +01:00
Lipu Fei
78456d5bc3
Fix clusterSize property check in QML
2017-11-09 09:06:46 +01:00
Andreea Scorojitu
d6f856e900
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-09 08:47:09 +01:00
Lipu Fei
183c63f765
Merge pull request #2720 from Ultimaker/Update_Infill_Patern_Description
...
Add_tri-hexagon_and_cross_to_pattern_description
2017-11-09 08:14:35 +01:00
Lipu Fei
cb6c6d51b4
Merge pull request #2751 from Ultimaker/fix_clustersize_null
...
Also check if base.selectedPrinter is null
2017-11-09 08:05:31 +01:00
Lipu Fei
a4f6af900b
Merge pull request #2747 from Velleman/master
...
Update Definiton for K8800 Vertex Delta
2017-11-09 08:03:19 +01:00
Mark
1468c3aae5
move undefined/null check
2017-11-09 07:37:09 +01:00
Mark
fdcce1780e
Also check if base.selectedPrinter is null
2017-11-08 19:24:09 +01:00
Andreea Scorojitu
d8d738be25
Change_Color_UI_elements_CURA-4548
2017-11-08 17:02:49 +01:00
Jaime van Kessel
06045f036e
Added previewPass
2017-11-08 16:37:24 +01:00
Mark
303cf33de1
Made the message more clear
2017-11-08 10:23:19 +01:00
Diego Prado Gesto
b7172ad9e3
Add return values to some functions that cause some crashes
2017-11-07 17:43:27 +01:00
Brecht Nuyttens
873862efd7
Fixed Vertex Delta Definition
2017-11-07 16:54:18 +01:00
Brecht Nuyttens
6c734e15c5
Merge branch 'master' of https://github.com/Velleman/Cura
2017-11-07 16:52:04 +01:00
Lipu Fei
2be529668e
Fix download for firmware upgrade notification
...
Same issue as the download for Cura version upgrade in CURA-4464.
2017-11-07 13:04:18 +01:00
Lipu Fei
d65ae62876
Merge pull request #2743 from Ultimaker/headless_cura
...
Headless cura
2017-11-07 11:07:43 +01:00
Aleksei S
6e7e859a0a
Introduced Lock Position functionality
...
CURA-4527
2017-11-07 10:59:23 +01:00
Aleksei S
7722e438c9
Changed orientation button location, adjusted call functins
...
CURA-4527
2017-11-06 10:28:07 +01:00
kaleidoscopeit
5008d63cfe
New machine definition : Deltacomb 3D
2017-11-06 10:01:57 +01:00
ChrisTerBeke
d32b7f0091
Merge branch 'master' into container_stack_improvements
2017-11-06 09:49:44 +01:00
ChrisTerBeke
2f0e81a819
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-06 09:49:33 +01:00
ChrisTerBeke
28ce2b1dc6
Ignore VariSlice plugin
2017-11-06 09:49:13 +01:00
Ruben D
c61b9c41ab
Fix translation of Unable to slice message
...
Previously the {0} would be filled in at runtime, causing the translation to no longer be found in the catalogue.
Contributes to issue CURA-4091.
2017-11-06 03:55:49 +01:00
Ruben D
0d71443bd2
Move 'Remove Empty First Layers' setting to mesh fixes category
...
It used to be in 'support' since it's something you may want to decide on depending on whether you have support or not. It could also go in 'Special Modes', but I think this is more specified.
2017-11-05 23:24:07 +01:00
Diego Prado Gesto
97fd926654
CURA-4526 Add to SimulationView the same behavior than LayerView
2017-11-03 17:46:12 +01:00
Aleksei S
fb8bde6f76
Added view rotation for each click
...
CURA-4527
2017-11-03 15:29:33 +01:00
