Commit graph

3945 commits

Author SHA1 Message Date
Ghostkeeper
d6baf98632
Merge branch 'Rigid3D-master' 2017-06-16 11:54:09 +02:00
Ghostkeeper
a488bbe392
Merge branch 'master' of https://github.com/Rigid3D/Cura into Rigid3D-master 2017-06-16 11:53:26 +02:00
Ghostkeeper
3240338f6d
Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-16 09:25:50 +02:00
Ghostkeeper
6c02c46168
Merge branch 'patch-1' of https://github.com/nliaudat/Cura into nliaudat-patch-1 2017-06-16 09:23:19 +02:00
Jaime van Kessel
f7fd28b656 Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-15 21:18:06 +02:00
Jaime van Kessel
856a490acc Removed unneeded shader duplication.
The work done for USL-43 ensures that all this duplication is no longer needed.
2017-06-15 21:17:21 +02:00
Ghostkeeper
29b90d26b8
Re-enable centre camera on selection
With Qt 5.8 it works again on Windows.
2017-06-15 16:16:56 +02:00
Ghostkeeper
66f5b236d6
Merge branch '2.6' 2017-06-15 09:54:19 +02:00
Ghostkeeper
4c8d65a2f4
Re-enable Brazillian Portuguese translation
It's complete again. Thanks Patola.

Contributes to issue CURA-3885.
2017-06-15 09:42:30 +02:00
Cláudio Sampaio (Patola)
24e4aa59ad updated strings for cura 2.6 2017-06-14 10:47:40 -03:00
Ghostkeeper
8bce6e060c
Merge branch '2.6' 2017-06-14 10:58:11 +02:00
fieldOfView
49f2fb2cea
Fix filtering maerials after editing materials
NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.
2017-06-14 10:42:04 +02:00
fieldOfView
ed6f4d851c
Update documentation 2017-06-14 10:41:39 +02:00
fieldOfView
1f49a87acb
Update material_diameter when editing the material in MaterialView.qml 2017-06-14 10:41:02 +02:00
Ghostkeeper
baef713f50
Disable incomplete languages
These translations are incomplete for the 2.6 release.

Contributes to issue CURA-3885.
2017-06-14 09:37:55 +02:00
Mark
8ab5c7e4cd Merge pull request #1910 from Ultimaker/fix_dialog_sizes
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
2017-06-13 13:14:44 +02:00
Ghostkeeper
8302819310
Merge branch '2.6' 2017-06-12 09:23:41 +02:00
Ghostkeeper
38a2685681
Take the maximum of line widths for minimising prime tower thickness
Otherwise you get layers where the prime tower isn't printed because it is less than twice the line width, and then the prime tower falls away. I'm sure this was the whole intent of this 'max()' clause but it was executed wrongly.
2017-06-12 09:23:23 +02:00
Ghostkeeper
0d0ae1efc2
More consistent capital letter usage
The machine settings aren't visible, but sometimes we make some of them visible for an issue or just for a colleague. Anyway it's best to stay consistent even under water.
2017-06-09 11:54:28 +02:00
Ghostkeeper
ab3d6a79ae
Merge branch '2.6' 2017-06-09 10:41:17 +02:00
Ghostkeeper
e87f4d2100
Set PLA 0.8mm infill back to normal 20%
Now that users have gradual infill available as option in recommended mode, it was deemed better to let the user choose when he wants it. I left the step height intact, in case the user chooses it anyway.
2017-06-09 10:40:22 +02:00
Ghostkeeper
734b5cc442
Enable prime tower for PLA 0.8
This was deemed necessary by the materials tests.
2017-06-09 10:36:30 +02:00
Ghostkeeper
2e88716f5f
Limit Raft Interface Thickness to a minimum of 0.225mm
If it's less, the layer doesn't get properly filled, according to the materials team. They requested that the thickness should be set to 0.225mm for just the Fine and Extra Fine profiles, but I opted for a formula that would still let it scale with the layer height up to a point.
2017-06-09 10:29:58 +02:00
Ghostkeeper
edcde8f916
Set Horizontal Expansion to 0mm
This was deemed better by the materials team.
2017-06-09 10:23:34 +02:00
Ghostkeeper
45e16e464e
Enable prime tower for Nylon
This was deemed necessary by the materials team.
2017-06-09 10:20:14 +02:00
Mark
9f66bc8090 Merge pull request #1910 from Ultimaker/fix_dialog_sizes
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
2017-06-08 11:08:56 +02:00
Ghostkeeper
2ede856dd7
Merge branch '2.6' 2017-06-07 17:30:40 +02:00
Ghostkeeper
8f60e52e2b
Update translations for DE, ES, FI, FR, IT, NL and TR
These are the translations we got from Bothof. They are unabridged, no edits are made. They are not checked yet. I'm going to do that afterwards.

Contributes to issue CURA-3885.
2017-06-07 17:20:14 +02:00
Ghostkeeper
e7c49fa1af
Remove non-existing setting
This was giving warnings in the log.
2017-06-06 10:33:15 +02:00
Ghostkeeper
a739973939
Fix indenting
Some tab usage here and erroneous spaces.
2017-06-06 10:32:52 +02:00
Ghostkeeper
5999b2addd
Merge branch '2.6' 2017-06-06 09:41:32 +02:00
Ruslan Popov
0e3b03795d Update russian translation. 2017-06-05 08:55:57 +03:00
Ghostkeeper
afb5dd7582
Merge branch '2.6' 2017-06-02 10:27:51 +02:00
Ghostkeeper
e57a39b028
Move prime tower 1mm down again
Otherwise the combination of 0.8mm PVA and 0.8mm CPE causes the prime tower brim to be placed off the build plate.
2017-06-02 10:25:58 +02:00
Ghostkeeper
3d8c932bcc
Clarify context of Print Selected Model With button description 2017-06-01 16:20:40 +02:00
Mehmet Sutas
4244c60665 Update rigid3d_zero2.def.json
Updated start_gcode
2017-06-01 15:06:26 +03:00
Ghostkeeper
107eeed8f4
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2017-05-31 22:36:02 +02:00
Ghostkeeper
2fb7821972
Merge branch '2.6' 2017-05-31 17:17:32 +02:00
Ghostkeeper
c57fa72e3b
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-31 15:22:37 +02:00
Ghostkeeper
d3ebb95734
Merge remote-tracking branch 'origin/master' 2017-05-31 15:22:19 +02:00
Jaime van Kessel
ccec148243 Plugins can now also be installed by dropping them onto the application
CURA-3712
2017-05-31 14:40:17 +02:00
Tim Kuipers
384fd45d7f JSON fix: only enable feature extruder nr settings for multi-extrusion printers (CURA-292) 2017-05-31 13:00:44 +02:00
Mark
4398960264 Give text in labels specific width so icons stay aligned 2017-05-31 12:46:07 +02:00
Mark
a66f0d4781 resize the rename-dialog 2017-05-31 12:46:07 +02:00
Mark
7bc715a9bd fixed too big dialogs and hidden checkboxes 2017-05-31 12:46:07 +02:00
Mark
4e03eeca8e Anchor the i-button to materialVariantContainer
CURA-3810
2017-05-31 12:00:44 +02:00
Mark
3177d99bcf Anchor the i-button to materialVariantContainer
CURA-3810
2017-05-31 11:59:05 +02:00
Mark
4fe4c759bd Anchor the i-button to materialVariantContainer
CURA-3810
2017-05-31 11:57:48 +02:00
maukcc
a5f46d2ff2 quality updates
deleted speed_slowdown_layers from individual qualities as it is a
global setting
2017-05-31 11:11:19 +02:00
Ghostkeeper
2ad68f6ebd
Clarify description of wall thickness
There was some confusion about whether this was the thickness of the outer walls or just the thickness of walls in general. I've removed 'outside' from the description, because hopefully that is implicit enough.
2017-05-31 11:02:53 +02:00