11418 Commits

Author SHA1 Message Date
Lipu Fei
b43a09d773 Merge pull request #2064 from Ultimaker/feature_top_navigation_bar
Feature top navigation bar
2017-07-04 15:46:03 +02:00
maukcc
194d7bb3b8 Cartesio profiles update
Cartesio disalowed areas
Cartesio extruder offsets
Cartesio high quality profiles
2017-07-04 14:58:01 +02:00
Ghostkeeper
b66f9a0da4
Invert enabled condition on spaghetti_infill_stepped
These two settings are only relevant if the spaghetti infill is stepped, not when it's not stepped.

Contributes to issue CURA-3861.
2017-07-04 13:50:19 +02:00
Lipu Fei
d0ef97b02c Remove invalid anchoring for SidebarHeader
CURA-3964

sidebarHeaderBar has been removed and the anchor line is not needed.
2017-07-04 13:06:41 +02:00
Ghostkeeper
d3fc47fb42
Remove nonsensical warning values for prime tower position
I discovered this during work on CURA-3521.
2017-07-04 12:36:18 +02:00
Ghostkeeper
88ee878423
Simplify inheritance formula for prime tower wall thickness
Firstly, all the resolveOrValue calls are identity functions now so they can be phased out.

Secondly, all the max(extruderValues(...)) should be done by the resolve property rather than the value property. The resolve property already makes sure that the prime tower is evenly thick for every extruder, so it doesn't need to ensure this in the value function as well.

Contributes to issue CURA-3521.
2017-07-04 12:33:19 +02:00
Jaime van Kessel
1627a65513 Viewport overlay now shows correctly when switching between monitor & settings
CURA-3964
2017-07-04 11:58:04 +02:00
Lipu Fei
b2a263b2db Enable support_infill_sparse_thickness when support is enabled
CURA-2724
2017-07-04 11:38:56 +02:00
Arjen Hiemstra
ec25164731 Cleanup monitoringPrint stuff by properly passing things as properties
Instead of relying on the property magically being propagated from the
root object, which causes crashes.

Contributes to CURA-3964
2017-07-04 11:37:04 +02:00
Mark Burton
ff4935011d Tweak description. 2017-07-04 10:36:45 +01:00
Jaime van Kessel
edeb2fa787 Merge branch 'master' of github.com:Ultimaker/Cura into feature_top_navigation_bar 2017-07-03 16:40:47 +02:00
Lipu Fei
68cae135a9 Make outer wall line width to evaluate its value accroding to its extruder
CURA-3891

This commit fixes the problem that limit to extruder for outer wall
doesn't work.
2017-07-03 16:19:10 +02:00
Jaime van Kessel
680cceb6f5 Switching to monitor tab now shows the correct sidebar again
CURA-3964
2017-07-03 16:12:19 +02:00
fieldOfView
5fec3d4f6d Replace mock borders with true borders 2017-07-03 16:04:18 +02:00
Jaime van Kessel
7e07482dec Added topbar to Cura
CURA-3964
2017-07-03 15:44:42 +02:00
Lipu Fei
848c607db1 Only enable gradual support if support infill rate > 0
CURA-2724
2017-07-03 11:11:26 +02:00
Tim Kuipers
60379d395d feat: spaghetti infill stepping vs all volume at once (CURA-3861) 2017-06-30 17:59:47 +02:00
Lipu Fei
7b494cccf7 Only enable gradual_support_infill_steps when support infill density > 0
CURA-2724
2017-06-30 15:49:37 +02:00
Lipu Fei
328ec0419d Implement gradual support infill
CURA-2724
2017-06-29 17:42:09 +02:00
Ghostkeeper
b8b23055ba
Fix getting new material diameter
Same problem, it's not been updated yet at this point.

Contributes to issue CURA-2822.
2017-06-29 16:50:15 +02:00
Ghostkeeper
27bcb11dc9
Store old approximate diameter in variable
Shorter line, easier to read.

Contributes to issue CURA-2822.
2017-06-29 16:41:24 +02:00
Ghostkeeper
b3e49f0c12
Fix getting the old approximate diameter
The properties.approximate_diameter gets updated later via signals, so at this point it's not correct yet.

Contributes to issue CURA-2822.
2017-06-29 16:28:01 +02:00
Ghostkeeper
c7120dddda
Don't allow changing the default printing temperature per mesh
The printing temperature is not settable per mesh. The default printing temperature shouldn't be either.
2017-06-29 14:16:02 +02:00
Jaime van Kessel
4a5b1d0760 Merge branch 'feature_xy_offset_layer_0' of https://github.com/fieldOfView/Cura 2017-06-28 15:16:18 +02:00
PCDotFan
57503439dd Merge remote-tracking branch 'Ultimaker/master' 2017-06-28 18:32:14 +08:00
fieldOfView
20b2a3dc81 Improve description for xy_offset_layer_0 2017-06-28 11:48:16 +02:00
Jaime van Kessel
b7165ad41d Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-28 10:56:43 +02:00
PCDotFan
ef6945b14a Merge remote-tracking branch 'Ultimaker/master' 2017-06-28 00:12:53 +08:00
PCDotFan
4d981810dd update fpmprinter.def.json.po 2017-06-28 00:12:50 +08:00
Ghostkeeper
ebdcd46062
Rename other quality profiles to old not-supported names
The Superdraft quality was sometimes still active in users' old configuration as well.

Contributes to issue CURA-3973.
2017-06-27 16:41:58 +02:00
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
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
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
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