10639 Commits

Author SHA1 Message Date
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
8f7471a892
Remove debug statement 2017-06-14 10:41:53 +02:00
fieldOfView
ed6f4d851c
Update documentation 2017-06-14 10:41:39 +02:00
fieldOfView
c9998ca6fe
Set properties for all containers with the same base_file metadata entry 2017-06-14 10:41:23 +02:00
fieldOfView
a7cdf49018
Fix setting metadata on fdmmaterial containers 2017-06-14 10:41:12 +02:00
fieldOfView
1f49a87acb
Update material_diameter when editing the material in MaterialView.qml 2017-06-14 10:41:02 +02:00
fieldOfView
5550fe0da8
Fix confusion around the use of the word "global" 2017-06-14 10:40:52 +02:00
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
Jaime van Kessel
d89af03432 Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-13 16:29:14 +02:00
Jaime van Kessel
4fa9b94e30 Minor code cleanup 2017-06-13 16:28:41 +02:00
Lipu Fei
0e09094a3d Merge branch '2.6' 2017-06-13 15:06:37 +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
c8d9720a8a Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-13 13:51:55 +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
Arjen Hiemstra
e5df4c4c5e Merge branch '2.6'
* 2.6:
  Merge pull request #1910 from Ultimaker/fix_dialog_sizes
  Fix ordering of merged PlatformPhysicsOperation
2017-06-13 13:23:35 +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
e0e5114163 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-06-12 15:25:45 +02:00
Jaime van Kessel
df67ae18f1 Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-12 15:25:35 +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
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
fieldOfView
c3dcee7f14 Update Peopoly Moai definition infill overlap and adhesion type 2017-06-11 12:18:16 +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
Mark Burton
9228617253 Merge remote-tracking branch 'upstream/master' into mb-group-walls 2017-06-09 10:46:21 +01: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
0153ba6947 Remove support_interface_density from default visible settings. Changing it will usually mess up your print 2017-06-08 11:38:57 +02:00
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
Marcos Gomes
e37a3c48f5
Updated helloBEEprusa printer profiles 2017-06-07 13:28:26 +01:00
sheinz
de62a3c0fe Fix displaying layers with python3.6 2017-06-06 23:47:40 +03: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
d705ca1b1d
Only enable sanding line spacing when sanding is enabled
Forgot this one.

Contributes to issue CURA-3903.
2017-06-06 11:13:24 +02:00
Ghostkeeper
5eab3191af
Limit sanding settings to top/bottom extruder
Makes sense that whether you need to sand is based on the material used for most of the material that you're sanding over. You're also sanding over the walls, but the skin is hopefully more telling for the types of surfaces you're sanding.

Contributes to issue CURA-3903.
2017-06-06 11:09:36 +02:00
Ghostkeeper
7135a26c1b
Adjust default for sanding inset to half line width
This way it ends up at the very top of the outer wall, which may work better.

Contributes to issue CURA-3903.
2017-06-06 11:03:32 +02:00
Ghostkeeper
f9b792ef76
Set default for sanding flow to 10%
30% is way too much. 10% is a bit much too I think but it produces nice results in the long run. 5% is too little.

Contributes to issue CURA-3903.
2017-06-06 10:54:53 +02:00