Ghostkeeper
2974c4d7ab
Merge branch 'cura/Cura/master' of https://github.com/maukcc/Cura into maukcc-cura/Cura/master
2017-11-20 13:04:34 +01:00
orel Windows
565574a183
Replace the print temperature setting used in gstart code as layer 0 print temperature seems more relevant.
2017-11-20 10:59:57 +01:00
orel Windows
05b4689bd6
Improve discoeasy200 profile, especially the machine gcode start as it uses 'print_temperature' which is an invalid Cura setting.
2017-11-20 10:40:25 +01:00
Diego Prado Gesto
41d0df5b5b
Merge branch 'master' into print_simulation_view
2017-11-20 09:29:18 +01:00
fieldOfView
1924946b59
Merge branch 'master' into feature_mesh_types
...
# Conflicts:
# plugins/SolidView/SolidView.py
2017-11-18 11:28:15 +01:00
Ghostkeeper
7a42c5bcce
Fix technical mistakes of Japanese translation
...
There's a lot of keys that weren't added to the Japanese translation. Our program crashes on these because it can't find where it needs to fill in the argument.
2017-11-17 16:49:56 +01:00
Ghostkeeper
568e18f664
Add Japanese translation of cura.po
...
It's quite bad though so let's see what improvements we can make.
2017-11-17 16:49:47 +01:00
Ghostkeeper
91621497f0
Fix technical mistakes of Japanese translation
...
There's a lot of keys that weren't added to the Japanese translation. Our program crashes on these because it can't find where it needs to fill in the argument.
2017-11-17 16:38:02 +01:00
Ghostkeeper
37163ec0b4
Add Japanese translation of cura.po
...
It's quite bad though so let's see what improvements we can make.
2017-11-17 16:30:57 +01:00
Diego Prado Gesto
0f6d65950a
CURA-4526 Add colors to themes for selected handles
2017-11-17 13:18:44 +01:00
ChrisTerBeke
f48539cc93
Merge pull request #2685 from Ultimaker/container_stack_improvements
...
Container stack improvements
2017-11-17 13:09:54 +01:00
Ghostkeeper
94dd524785
Add setting to determine whether to use firmware retraction
...
This allows printers to determine this for themselves. By default it's based on the g-code flavour in the same way as it is now implemented in the engine.
Fixes #1097 .
2017-11-17 11:13:15 +01:00
Ghostkeeper
f27494d60a
Move ironing into shell category
...
It is no longer considered experimental.
2017-11-17 10:59:14 +01:00
Ghostkeeper
15a50511b7
Don't crash if support density is 0
...
Found while working on CURA-4523.
2017-11-17 10:57:23 +01:00
Jaime van Kessel
7d28b26ff2
Merge branch 'master' of github.com:Ultimaker/Cura into qtquick-controls-2.0
2017-11-16 16:48:22 +01:00
Jack Ha
228039545b
CURA-4525 send active build plate to legacy UM3 with Print over network
2017-11-16 09:58:53 +01:00
Jack Ha
e2a663992c
CURA-4525 Added an option to turn on the UI elements of multi build plate
2017-11-15 17:00:19 +01:00
Aleksei S
ce0510cee3
Hide icons if they overlap monitor button
...
CURA-4527
2017-11-15 16:34:22 +01:00
Jack Ha
864f417723
CURA-4525 Fix load and save projects. Not storing build plates or object names yet.
2017-11-15 16:03:32 +01:00
Ghostkeeper
fc187d100a
Add setting to tweak collision area sampling resolution
...
Because this can make a lot of difference for the slice time and the stability of the support.
Contributes to issue CURA-4523.
2017-11-15 16:00:42 +01:00
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
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
Ghostkeeper
7c85b222b2
Don't use support infill by default when printing tree support
...
Only when using area support really.
Contributes to issue CURA-4523.
2017-11-14 17:45:45 +01:00
Jack Ha
bd8aa8d989
CURA-4525 automatic build plate menu items using BuildPlateModel
2017-11-14 14:27:46 +01:00
MaukCC
b081b686a8
Merge branch 'master' into cura/Cura/master
2017-11-14 11:59:35 +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
Ghostkeeper
bb4cb1eb7d
Make support infill related settings visible if support tree enabled
...
Because the areas generated by support trees are also filled in as normal.
Contributes to issue CURA-4523.
2017-11-13 17:58:50 +01:00
Jack Ha
97f61366a8
CURA-4525 fix accidently remove all scenenodes when deleteAll
2017-11-13 16:51:07 +01:00
Ghostkeeper
57a2bf7c5f
Move tree support to the top of the support category
...
Because it's logical to have it before all of the settings that are enabled/disabled by it.
Contributes to issue CURA-4523.
2017-11-13 16:33:46 +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
ChrisTerBeke
88cf40e2d7
Merge branch 'master' into container_stack_improvements
2017-11-10 14:35:13 +01:00
Ghostkeeper
4cc895b54b
Use 1 wall for tree support by default
...
Contributes to issue CURA-4523.
2017-11-10 13:06:29 +01:00
Ghostkeeper
cd6b1aca29
Add branch diameter angle setting
...
It's a bit obscure. Could we devise a better setting name?
Contributes to issue CURA-4523.
2017-11-10 13:05:32 +01:00
fieldOfView
e00ac591bf
Use material color for cutting_mesh and infill_mesh
2017-11-10 12:24:32 +01:00
Jack Ha
e21acd1a07
CURA-4525 first multi slice + multi layer data, added filter on build plate, added option arrange on load, visuals like convex hull are now correct
2017-11-09 17:03:20 +01:00
fieldOfView
8f8bdc059a
Render non-printing objects as semi transparent objects in Solid View
2017-11-09 12:55:03 +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
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
Ruben D
b660b2ca86
Rename support_tree_wall_line_count to support_tree_wall_count
...
Wall line is double. Just name it wall.
Contributes to issue CURA-4523.
2017-11-09 00:47:20 +01:00
