Commit graph

4450 commits

Author SHA1 Message Date
alekseisasin
37eb74e99e Fixed quality file names
CURA-4128
2017-08-31 13:16:08 +02:00
alekseisasin
d23e9cafe4 Merge pull request #2162 from FABtotum/master
FABtotum Personal Fabricator
2017-08-31 12:56:24 +02:00
Ghostkeeper
18a07b6eee
Change support Z offset to 2*layer_height
The materials team found this to work better.
2017-08-31 11:49:24 +02:00
Ghostkeeper
582a17c6af
Sort all UM2+ profiles
This will make it easier to modify these profiles in the future.
2017-08-31 11:48:41 +02:00
krios-fabteam
b4ae52b4c3 added 2 more variants
improved quality profiles
2017-08-30 17:17:39 +02:00
Jaime van Kessel
8830fa7e10 Merge branch '2.7' of github.com:Ultimaker/Cura 2017-08-30 15:12:56 +02:00
Lipu Fei
e8e8081215 Add quality_definition for UM2ex and UM2go
CURA-4139

UM2ex and UM2go should share the same set of quality profiles as UM2.
2017-08-30 14:58:07 +02:00
Lipu Fei
f426a0aa62 Add quality files for UM2
CURA-4139

Add dedicated quality files for UM2 so they won't get profiles with
layer height higher than 0.25mm
2017-08-30 14:56:38 +02:00
Ghostkeeper
2c7c29dc71
Merge branch 'master' into quarter_cubic_infill 2017-08-30 11:03:04 +02:00
alekseisasin
ac6f50e686 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-29 18:24:47 +02:00
alekseisasin
472b9fc779 Setting was not visible because was applied wrong settings scope
CURA-4192
2017-08-29 18:23:35 +02:00
Ghostkeeper
f5e0db5e2a
Add missing period
Spotted a small mistake in the translations by accident.
2017-08-29 17:23:17 +02:00
Ghostkeeper
f7def41df8
Enable prime tower for CPE+ 0.8 Fast Print
The prime tower is enabled for the other two quality profiles but not for this one, so we're making this consistent (with confirmation from the Materials team).
2017-08-29 15:27:10 +02:00
krios-fabteam
be4fa98638 removed quality duplicates 2017-08-29 11:34:21 +02:00
krios-fabteam
56bab36869 added generic label for materials 2017-08-28 17:56:01 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Jaime van Kessel
8a0f6d969e Merge branch '2.7_stack_context' of github.com:Ultimaker/Cura into 2.7 2017-08-28 16:05:59 +02:00
Ghostkeeper
3dbf91eb18
Fix mistakenly translated replace key
Bad translator. Baaaaaaad.

Contributes to issue CURA-3999.
2017-08-28 15:42:12 +02:00
Ghostkeeper
1401d90bd0
Update Chinese translations for 2.7
These are the files I got from Bothof.

Contributes to issue CURA-3999.
2017-08-28 15:41:27 +02:00
Ghostkeeper
eeea30f2d1
Update translation templates for 2.7
New strings get empty translations. This is generated by calling 'make i18n-update-po-zh_CN'.

Contributes to issue CURA-3999.
2017-08-28 15:32:36 +02:00
Ghostkeeper
22b808afb3
Merge branch 'master' of https://github.com/PCDotFan/Cura into PCDotFan-master 2017-08-28 15:29:45 +02:00
alekseisasin
ae63060d75 Merge branch 'mb-z-offset' of https://github.com/smartavionics/Cura 2017-08-28 10:43:53 +02:00
Ghostkeeper
9cea356a18
Replace tabs with spaces
As per our code style standard.
2017-08-25 09:22:47 +02:00
Ghostkeeper
90583bd56d
Replace tabs with spaces
And fix the alignment while we're at it.
2017-08-25 09:22:07 +02:00
Ghostkeeper
4b4f971222
Make 'other' the default category
This should make it a bit easier for others to create a new definition since there is less for them to 'have to know'. Previously they would be required to fill in as category Other, but now they can just leave the category out.
2017-08-25 09:17:55 +02:00
Lipu Fei
f85a76b4bd Fix per-object settings qml 2017-08-24 17:38:16 +02:00
Mark Burton
2db96f02f4 Revised minimum_value and minimum_value_warning values.
Now just constrains z_offset_taper_layers to be >= 0 as that needs to be positive.
2017-08-24 15:24:10 +01:00
Ghostkeeper
557173e799
Merge branch '2.7' 2017-08-24 15:33:01 +02:00
Ghostkeeper
a1fdcd0e48
Update prime tower settings for PVA
This reduces the jerk considerably and makes use of the new prime tower purge settings.
2017-08-24 15:32:41 +02:00
Ghostkeeper
4caad8f3b9
Add Creality CR10S4 and S5 definitions
They use the same settings as the normal one but they are larger printers.
2017-08-24 14:53:15 +02:00
Ghostkeeper
c43b7f6f1b
Update Creality CR10 Beta definition
The printer was also renamed to a more specific name. These are updates I'm getting from Michael.
2017-08-24 14:42:39 +02:00
Ghostkeeper
ccf6d12283
Merge branch 'patch-9' of https://github.com/kemiq3d/Cura into kemiq3d-patch-9 2017-08-24 09:17:18 +02:00
Ghostkeeper
548d17390e
Merge branch 'patch-8' of https://github.com/kemiq3d/Cura into kemiq3d-patch-8 2017-08-24 09:15:20 +02:00
Ghostkeeper
6a40264f9a
Merge branch 'patch-7' of https://github.com/kemiq3d/Cura into kemiq3d-patch-7 2017-08-24 09:13:55 +02:00
Ghostkeeper
a12c569281
Merge branch 'patch-6' of https://github.com/kemiq3d/Cura into kemiq3d-patch-6 2017-08-24 09:12:00 +02:00
Ghostkeeper
ef3377e6fe
Merge branch 'patch-5' of https://github.com/kemiq3d/Cura into kemiq3d-patch-5 2017-08-24 09:10:05 +02:00
Ghostkeeper
65247ae9d4
Merge branch 'patch-4' of https://github.com/kemiq3d/Cura into kemiq3d-patch-4 2017-08-24 09:08:36 +02:00
Ghostkeeper
2000ccd8da
Merge branch 'patch-3' of https://github.com/kemiq3d/Cura into kemiq3d-patch-3 2017-08-24 09:07:11 +02:00
Mark Burton
2c13f5dc75 Add minimum_value to z_offset_taper_layers.
It now constrains the value to be no less than 0 when z_offset_layer_0 is negative or
z_offset_taper_layers is 0, otherwise the value must be such that the gap between subsequent
layers is not less than 80% of the normal layer height.

If the print head was lowered for the first layer, the tapering will always cause the
subsequent layers to be at least the normal layer height above the previous layer so the
tapering can occur over any number of layers.

On the other hand, if the print head was raised for the first layer, we demand that either
tapering is not used (value is 0) or that the tapering occurs over sufficient layers so that
the inter-layer gaps are not too small.
2017-08-23 22:32:11 +01:00
Mark Burton
5cbead5128 Add some value constraints to z_offset_layer_0.
Now the offset cannot be such that the first layer would be less than 1/2 of its normal height.

Warnings shown when first layer is less than 80% or more than 200% of its normal height.
2017-08-23 21:52:21 +01:00
Jaime van Kessel
d74d865ec8 Merge branch 'skin_preshrink' of github.com:Ultimaker/Cura 2017-08-23 13:34:21 +02:00
Mark
2d0a4d443d Switch material and print core
CURA-4147
2017-08-23 10:54:46 +02:00
alekseisasin
9363f93467 Merge pull request #2224 from fieldOfView/fix_multiextruder_menus
Fix multiextruder menus
2017-08-23 09:08:48 +02:00
Lipu Fei
28670edf8e Align profile dropdown box correctly
CURA-4147
2017-08-22 16:11:15 +02:00
Lipu Fei
e17a88fe11 Merge branch '2.7' 2017-08-22 16:06:36 +02:00
alekseisasin
10b50244e0 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-22 14:00:41 +02:00
alekseisasin
a0b7a2d165 Merge branch 'feature_grid_lines'
CURA-4150
2017-08-22 13:59:19 +02:00
Mark
64f6cd237f Rename Print tab to Monitor
CURA-4106
2017-08-22 13:58:01 +02:00
krios-fabteam
0685df789c added head variants
changed category definition
2017-08-22 13:05:03 +02:00
Jaime van Kessel
fd6ee6ee3c Merge branch 'pirate' of github.com:Ultimaker/Cura into 2.7 2017-08-22 10:53:51 +02:00