Mark Burton
3584703039
Merge remote-tracking branch 'upstream/master' into mb-group-walls
2017-06-08 10:15:16 +01: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
Jaime van Kessel
b18b1d3cd0
Only disable timer of backend if it's initialised
...
Fixes #1939
2017-06-06 15:42:49 +02:00
Ghostkeeper
1c1f21289c
Update location of log files
...
Grossly outdated...
2017-06-06 15:04:38 +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
Ghostkeeper
707f261503
Merge branch 'halfakop-2.6' into 2.6
2017-06-06 09:02:45 +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
Mark Burton
c02f981f16
Merge branch 'master' into mb-group-walls
2017-06-02 08:27:45 +01:00
Ghostkeeper
3d8c932bcc
Clarify context of Print Selected Model With button description
2017-06-01 16:20:40 +02:00
Lipu Fei
6bcc1c296d
Do not override filter_by_material if no material is found
...
CURA-3884
We rely on the machine to decide whether it needs machine specific
materials, so we don't override the filter_by_material flag when
looking for quality profiles for a material.
2017-06-01 13:26:45 +02:00
Ghostkeeper
29f57f1565
Merge branch 'maukcc-master'
2017-05-31 22:36:52 +02: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
654b9cfa1c
Fix global container stack variable
...
The definition changes are only on the global container stack. That's the one that was meant here.
Contributes to issue CURA-3875.
2017-05-31 17:17:11 +02:00
fieldOfView
163707df01
Fix definition changes for UMO upgrade options
2017-05-31 17:03:42 +02:00
Mark Burton
d267b60534
Add warning that enabling optimization can produce slower prints in some cases.
2017-05-31 15:07:42 +01: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
Jaime van Kessel
c76a91fbb4
added curaplugin to list of plugin extensions
...
CURA-3712
2017-05-31 13:21:44 +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
daa51bcfb9
Merge branch 'fix_dialog_sizes' of github.com:Ultimaker/Cura into fix_dialog_sizes
2017-05-31 12:47:14 +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
Mark
a934cc4182
Make the icon a litle bit smaller
...
CURA-3810
2017-05-31 10:50:49 +02:00
Mark
6311563909
Realign the selectboxes
...
CURA-3810
2017-05-31 10:50:49 +02:00
Mark
c0321a9d83
Merge branch 'fix_dialog_sizes' of github.com:Ultimaker/Cura into fix_dialog_sizes
2017-05-31 10:41:59 +02:00
Mark
f630f9c464
Give text in labels specific width so icons stay aligned
2017-05-31 10:41:36 +02:00
Mark
df3425e9e6
resize the rename-dialog
2017-05-31 10:41:36 +02:00
Mark
f0c130c593
fixed too big dialogs and hidden checkboxes
2017-05-31 10:41:36 +02:00
Mark
7676975fcb
Make the icon a litle bit smaller
...
CURA-3810
2017-05-31 09:37:20 +02:00
Mark
4c88b82b99
Realign the selectboxes
...
CURA-3810
2017-05-31 09:35:22 +02:00
Ghostkeeper
fc7a32ca7f
Merge branch '2.6'
2017-05-31 09:23:01 +02:00
Ghostkeeper
5392b8f65c
Remove commented-out temperature commands from start g-code
...
Even though it was commented-out, it was still being detected and made Cura think that the start g-code was heating up the nozzles by itself. I've removed the lines so that the normal temperature commands get inserted by Cura automatically.
2017-05-31 09:22:49 +02:00
Ghostkeeper
9acef70b31
Merge branch '2.6'
2017-05-31 09:18:41 +02:00
Ghostkeeper
1a1266404b
Include old translations of Japanese and Korean
...
Because of the missing files for fdmextruder and fdmprinter, I re-generated these translations from the POT template. But that erased them, so I put the old translations back and then updated them properly with the new keys.
Contributes to issues CURA-3885 and CURA-3817.
2017-05-30 17:44:43 +02:00
Ghostkeeper
4d61664d09
Make translation file metadata consistent and complete
...
It was absent or wrong in many cases, and very inconsistent in how the metadata fields were used.
Contributes to issue CURA-3885.
2017-05-30 17:13:26 +02:00
Tim Kuipers
aa3379fd7e
fix: limit_to_extruder got merged into the wrong place
2017-05-30 15:57:58 +02:00
