Commit graph

8977 commits

Author SHA1 Message Date
fieldOfView
944318d44a
Fix loading material diameter and GUID from XML file 2017-06-14 10:40:43 +02:00
Jaime van Kessel
932a9d23f0 Merge branch '2.6' of github.com:Ultimaker/Cura into 2.6 2017-06-14 09:44:05 +02:00
Jaime van Kessel
a7a2740690 No longer add material to qualityChanges
QualityChanges are never supposed to have Material.

CURA-3929
2017-06-14 09:41:33 +02:00
Jaime van Kessel
1020b0a2f3 Finding all qualities no longer does silly things with materials
The fetchContainer function also did magical material filtering, which caused it to go haywire.

CURA-3929
2017-06-14 09:40:11 +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
Lipu Fei
dd65248968 Only set metadata/material for quality_changes if material is not None
CURA-3929
2017-06-13 14:35:27 +02:00
Jaime van Kessel
ec73abecb5 Custom material now defaults to PLA.
This is not an ideal solution, but it bandaids a problem for the moment.

CURA-3911
2017-06-13 13:48:34 +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
Arjen Hiemstra
d44caa281b Fix ordering of merged PlatformPhysicsOperation
This makes sure we undo the PP operation before the other operation, so
the ordering of operations is still correct.

Contributes to CURA-3912
2017-06-13 13:10:59 +02:00
Jaime van Kessel
9a54ff426b FindAllQualitiesForMachineMaterial only looks with basic materials if it found them
CURA-3911
2017-06-12 15:14:25 +02:00
Jaime van Kessel
a306b4dada We now properly fall back if no basic material is found
CURA-3911
2017-06-12 13:53:35 +02:00
Lipu Fei
82224c0ed0 Copy material into metadata if machine has specific material profiles when duplicating a quality profile
CURA-3929
2017-06-12 10:56:01 +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
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
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
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
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
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
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
4e03eeca8e Anchor the i-button to materialVariantContainer
CURA-3810
2017-05-31 12:00:44 +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
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
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
Ghostkeeper
f42f323d64
Update translation po files for each language
These were generated using 'make i18n-update-po' on the 2.6 branch at commit 37fccecce7e5f81d3b5bf70ad981602c97120669. This should add all new strings to all .po files for Cura and retain any old translations that we had.

Contributes to issue CURA-3885.
2017-05-30 15:39:02 +02:00
Ghostkeeper
21575d6998
Update translation templates
These templates were generated using 'make extract-messages' on the 2.6 branch at commit 3be6526be3.

Contributes to issue CURA-3885.
2017-05-30 15:39:02 +02:00
Tim Kuipers
14e85d7b6b refactor: move spaghetti infill options to experimental category 2017-05-30 15:22:03 +02:00
Ghostkeeper
3be6526be3
Merge branch 'LipuFei-feature_CURA-3810_material_info_button' into 2.6 2017-05-30 13:34:24 +02:00
Ghostkeeper
9132a025d6
Merge branch 'feature_CURA-3810_material_info_button' of https://github.com/LipuFei/Cura into LipuFei-feature_CURA-3810_material_info_button 2017-05-30 13:32:03 +02:00
Lipu Fei
8af1cc886f Use .definition to access DefinitionContainer in qml
CURA-3810
2017-05-30 12:49:12 +02:00
Lipu Fei
7be05229d8 Fix material info button tooltip position
CURA-3810
2017-05-30 11:47:49 +02:00
Lipu Fei
9333ed1e35 Update copyright in comments
CURA-3810
2017-05-30 09:16:58 +02:00
Lipu Fei
68bd5a6e37 Use Item and anchors to set material row layout
CURA-3810
2017-05-30 09:16:28 +02:00
Lipu Fei
3a3d9afc24 Use "button" style for material info button
CURA-3810
2017-05-29 18:06:42 +02:00
Lipu Fei
c80e1b67a5 Only show material info button for multi-extrusion machines
CURA-3810
2017-05-29 18:00:46 +02:00
Tim Kuipers
3b62c4a59a fix: changelog attribution to community members (CURA-3879) 2017-05-29 16:31:11 +02:00
Tim Kuipers
b01f1bdbb3 feat: 2.6 beta changelog (CURA-3879) 2017-05-29 16:27:09 +02:00
Ghostkeeper
e0326bbb9b
Merge branch '2.6' of github.com:Ultimaker/Cura into 2.6 2017-05-29 15:55:08 +02:00
Lipu Fei
585bc78892 Only set material for imported quality profile if there is an active material
CURA-3881

CuraContainerRegistry._activeMaterialId() can return an empty string
if there is no active material, and in this case, importing a custom
quality file will fail.
2017-05-29 15:52:29 +02:00
Lipu Fei
b797fcc74d Use global stack to evaluate limit_to_extruder value
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
2017-05-29 15:44:57 +02:00
Ghostkeeper
50c4b88050 Let global stack handle limit to extruder
Contributes to issue CURA-3738.
2017-05-29 15:44:24 +02:00
Lipu Fei
85e875257b Use "/<version>/<machineName>" as the material info URL suffix
CURA-3810
2017-05-29 15:23:52 +02:00