10639 Commits

Author SHA1 Message Date
Ghostkeeper
21624d7761
Merge branch '2.6' 2017-06-27 16:25:55 +02:00
Ghostkeeper
f30d150ead
Rename CPE+ and PC draft prints to Not Supported
It's a hack. But it prevents having to write an upgrade script for this.

Contributes to issue CURA-3973.
2017-06-27 16:13:47 +02:00
Jaime van Kessel
4370e3a13c Added zoom to mouse preference
https://github.com/Ultimaker/Cura/issues/1572
2017-06-27 15:41:17 +02:00
Ghostkeeper
b2b9b1bede
Fix checking if container stack exists
It was checking a container stack ID against the definition containers, which doesn't match.

Contributes to issue CURA-3973.
2017-06-27 15:14:26 +02:00
Ghostkeeper
df2ec7bd73
Don't try to activate a machine that we don't have a definition for
Contributes to issue CURA-3973.
2017-06-27 14:02:35 +02:00
Ghostkeeper
8d3095c3b3
Merge branch '2.6' 2017-06-27 13:37:41 +02:00
Ghostkeeper
c66740d8e4
Increase warning value for Number of Slower Layers further
Because it was still giving a warning for the 0.4mm layer height profile.

Contributes to issue CURA-3960.
2017-06-27 13:23:30 +02:00
Ghostkeeper
5f5eb0b2a8
Merge branch '2.6' 2017-06-27 11:01:42 +02:00
Ghostkeeper
cb4e58c6f7
Increase the maximum warning for speed_slowdown_layers
Also round the resolved value, because the result needs to be an integer.

Contributes to issue CURA-3960.
2017-06-27 11:01:21 +02:00
Lipu Fei
9b20c7e69c Merge remote-tracking branch 'upstream/2.6' 2017-06-27 10:32:31 +02:00
Lipu Fei
d30c598977 Fix code style
CURA-3930
2017-06-27 10:13:54 +02:00
Tim Kuipers
66f23aa2e1 fix: copy global settings into extruder msessage for SE (CURA-3930) 2017-06-27 10:12:06 +02:00
Jaime van Kessel
b9c71a34eb Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-27 10:10:59 +02:00
Ghostkeeper
ca7992875a
Add 'Not Supported' profile for Polypropylene 0.25mm
Previously we also called the ID 'Not Supported' but we decided against that for new profiles, since that would mean that if the profile ever becomes supported we'd have to do a rename of the user's file names in their settings via a version upgrade. So now the ID is as if it's supported but the user-visible name still says that it's Not Supported and the profile still becomes orange.

Contributes to issue CURA-3960.
2017-06-27 09:32:17 +02:00
Ghostkeeper
264e09bdaf
Update Japanese translations
These have not been tested or even opened yet at this point, but by the time I've pushed the commit they will be. This should fix the missing translation and inconsistent wording.

Contributes to issue CURA-3950.
2017-06-27 08:47:22 +02:00
Ghostkeeper
a8da2407c7
Fix link to pp instead of polypropylene
The material profile was renamed but that wasn't put through here.

Contributes to issue CURA-3960.
2017-06-27 08:44:28 +02:00
PCDotFan
17a7bd7ae9 Add 简体中文 to GeneralPage.qml 2017-06-27 10:29:21 +08:00
PCDotFan
7e222ed16a update fdmextruder.def.json translation 2017-06-27 10:23:47 +08:00
PCDotFan
d476a8eace update chinese translation 2017-06-26 23:43:11 +08:00
PCDotFan
742d400975 Merge remote-tracking branch 'Ultimaker/master' 2017-06-26 23:38:25 +08:00
Ghostkeeper
ee0918f1d0
Merge branch '2.6' 2017-06-26 17:23:57 +02:00
Ghostkeeper
36cc21d31b
Rename Polypropylene to PP
They changed their mind.

Contributes to issue CURA-3960.
2017-06-26 17:20:59 +02:00
Jaime van Kessel
4ceb9f95cc Fixed weights of a few profiles
CURA-3845
2017-06-26 16:43:12 +02:00
Jaime van Kessel
b58abc91b3 Fixed names of 2 pp profiles
CURA-3960
2017-06-26 16:42:58 +02:00
Tim Kuipers
d31cacb69a Merge branch 'feature_prime_tower_purge' 2017-06-26 16:32:49 +02:00
Ghostkeeper
cefbe54843
Fix double infill overlap settings
These settings say the same, only the infill_overlap_mm one overwrites the infill_overlap setting. I therefore removed infill_overlap_mm so that the mm gets auto-calculated and none of the settings are overwritten any more (so they don't get greyed out).

Contributes to issue CURA-3960.
2017-06-26 16:30:26 +02:00
Jaime van Kessel
93f4a7e399 Fixed weights of a few profiles
CURA-3845
2017-06-26 16:28:53 +02:00
Ghostkeeper
a259217f52
Remove gradual infill for PP
This was delivered false by the materials team. It seems that in the end they decided to not use gradual infill for PP but only made the change in UM3, not UM2+. Removing gradual infill also requires me to set the infill density to 20% (the default).

Contributes to issue CURA-3960.
2017-06-26 16:15:40 +02:00
Tim Kuipers
e1d98d22f0 Merge branch 'master' into feature_prime_tower_purge 2017-06-26 16:11:41 +02:00
Lipu Fei
8a0afa9c32 Enable prime tower purge volume when prime tower and wipe are both enabled 2017-06-26 15:54:56 +02:00
Ghostkeeper
a5f3a1c983
Remove maximum warning for gradual infill step height
That 100mm figure was weird. 9cm was fine, but 10cm not? It's all going to print fine, really.

Contributes to issue CURA-3960.
2017-06-26 15:53:40 +02:00
Ghostkeeper
aee0cf7207
Make expand_lower_skins inherit from expand_skins_into_infill
And then also update the profiles to make the profiles end up at what it was originally (I confirmed this with the materials team).

Contributes to issue CURA-3960.
2017-06-26 15:47:49 +02:00
Ghostkeeper
b617c8be9c
Remove minimum warning value for z-hop height
It was giving a warning for 0.8mm polypropylene because that was set to 0.5mm hop. It was decided that a minimum value at all for z-hop is nonsense because you can just disable z-hop without getting a warning. I'm still setting it to zero because negative will still go wrong in your print.

Contributes to issue CURA-3960.
2017-06-26 15:27:27 +02:00
fieldOfView
d1211e3951 Add a setting for Horizontal Expansion for the first layer 2017-06-26 15:16:26 +02:00
Ghostkeeper
c0b6df0bfa
Increase warning value for outer wall wipe distance
For polypropylene a wipe distance of twice the nozzle size is fine. Even required, since the material warps so much that it breaks open automatically if a breach starts to appear at the seam. For other warping materials this could also be a problem, so let's just increase the warning value.

Contributes to issue CURA-3960.
2017-06-26 15:14:22 +02:00
Jaime van Kessel
568b0c2285 Changed start code of Dagoma printer to indicate it's created by cura.
Originally it said it was created by Cura-by-dagoma, which is not the case. CURA-3966
2017-06-26 15:02:24 +02:00
Jaime van Kessel
71c262040f Merge branch 'master' of https://github.com/landru29/Cura 2017-06-26 14:58:37 +02:00
Ghostkeeper
c9aa8b4dfd
Put stand-by temperature back in optimised profiles
The stand-by temperature should be 175 for these profiles because the UM3 firmware levels the bed with that temperature. It should be 100 in the quality profiles because that's what the stand-by temperature should be when standing by while the other nozzle is printing.

Contributes to issue CURA-3960.
2017-06-26 14:58:14 +02:00
Jaime van Kessel
c36ab386fa Merge branch 'feature_tab_navigation' of https://github.com/fieldOfView/Cura 2017-06-26 14:39:12 +02:00
fieldOfView
0f9cfa0304 Fix tab order after expanding categories or using search
This reimplements the behavior of pressing tab/backtab to force the correct order of items in the listview.
2017-06-26 14:35:37 +02:00
Ghostkeeper
6cd7c8eb08
Fix stand-by temperature
The stand-by temperature in the material profiles is the temperature at which the build plate levelling should be done. The actual stand-by temperature in Cura should be 100, so these profiles have to overwrite the material profile then.

Contributes to issue CURA-3960.
2017-06-26 14:32:48 +02:00
Jaime van Kessel
eda6394b34 Merge branch 'mb-fix-layer-view-line-widths' of https://github.com/smartavionics/Cura 2017-06-26 14:22:00 +02:00
Lipu Fei
d3bc625852 Fix prime tower purge description text
CURA-3094
2017-06-26 13:49:13 +02:00
Jaime van Kessel
cd17433d1c Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-26 13:17:20 +02:00
Jaime van Kessel
7813bfc543 No longer crash when trying to get non existing extruder stacks
CURA-3953
2017-06-26 13:16:14 +02:00
fieldOfView
8917762ed5 Animate scrolling focussed item into view 2017-06-26 13:03:28 +02:00
fieldOfView
edee53b0b1 Scroll setting with active focus into view 2017-06-26 13:00:59 +02:00
Lipu Fei
fe5466872f Merge remote-tracking branch 'upstream/2.6' 2017-06-26 12:59:25 +02:00
Lipu Fei
dc6eef0bc6 Merge pull request #2015 from Ultimaker/fix_override_extruder_settings_with_global_2.6
fix: copy global settings into extruder msessage for SE (CURA-3930)
2017-06-26 12:57:39 +02:00
Lipu Fei
bc65cc1102 Fix code style
CURA-3930
2017-06-26 12:49:34 +02:00