Mark Burton
0cc0fe93b8
Add further options to z_seam_type.
...
Can now specify that the z-seam should be located in either the most concave region of the
outline, the most convex region or the most curved (concave or convex) region.
2017-08-25 09:25:53 +01: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
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
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
Jaime van Kessel
fd6ee6ee3c
Merge branch 'pirate' of github.com:Ultimaker/Cura into 2.7
2017-08-22 10:53:51 +02:00
Ghostkeeper
ab0ab74fe8
Update Creality CR-10 definition
...
Michael found these settings to work towards better time estimate and neglegible quality differences.
2017-08-21 17:08:54 +02:00
Ghostkeeper
d793dc68ea
Add Creality CR-10
...
This definition was provided to me via e-mail. The initial data was badly formatted, so I corrected it and verified back with Michael Wildermuth that the new profile worked. Apparently it works, so thank you Michael.
2017-08-21 00:23:36 +02:00
Lipu Fei
24d3f8aab1
Put remove some zags settings as child settings
...
CURA-3957
2017-08-18 14:23:09 +02:00
Ghostkeeper
9241cfa5c6
Make tooltip backgrounds dark as well
...
Looks very professional.
Contributes to issue CURA-3948.
2017-08-18 14:19:53 +02:00
Lipu Fei
662e3b9cd1
Fix coding style
...
CURA-4147
2017-08-18 13:38:16 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7'
2017-08-18 10:42:14 +02:00
alekseisasin
7978b0efe9
Move quality profile, material and print core to it's new location
...
CURA-4147
2017-08-18 09:15:17 +02:00
Ghostkeeper
585b6ad8eb
Remove superfluous grid shader
...
The grid shader is now exactly equal to the colour shader, so let's just use the colour shader.
Contributes to issue CURA-4150.
2017-08-17 15:25:27 +02:00
Ghostkeeper
38e907b3ae
Add minor grid lines
...
Makes it feel very professional and technical.
Contributes to issue CURA-4150.
2017-08-17 10:32:47 +02:00
Ghostkeeper
5e63c0df48
Add major grid cells
...
This draws a grid of 1x1cm.
Contributes to issue CURA-4150.
2017-08-17 09:56:11 +02:00
Lipu Fei
16cfb768d2
Move dont show again checkbox above the buttons
...
CURA-4113
The Don't show again checkbox is on the same row with the buttons. In
some translations, the text for the checkbox is very long, which
overlaps with the button.
2017-08-16 16:07:02 +02:00
Tim Kuipers
567363fa7c
feat: skin preshrink (CURA-4103)
2017-08-16 13:51:00 +02:00
Ghostkeeper
484740f2ff
Remove grid pattern
...
It'll be replaced by grid lines instead of grid surfaces.
Contributes to issue CURA-4150.
2017-08-16 13:26:17 +02:00
Lipu Fei
b74c09dec8
Merge branch '2.7'
2017-08-16 11:51:26 +02:00
Jaime van Kessel
d5daf9ff81
Merge branch 'CURA-4146' of github.com:Ultimaker/Cura
2017-08-16 11:37:09 +02:00
Ghostkeeper
abcec2157e
Use the lowest of the layer heights for initial layer height
...
This was discussed with the materials team. A layer height of 0.4mm for a 0.4mm nozzle could give problems. This would be even worse with a 0.25mm nozzle.
2017-08-16 11:29:13 +02:00
Ghostkeeper
19bab721ef
Change language metadata field to contain language codes
...
According to the standard specified by GNU: https://www.gnu.org/software/gettext/manual/html_node/Header-Entry.html
Contributes to issue CURA-4113.
2017-08-15 17:51:47 +02:00
Lipu Fei
3a22d1916f
Go back to "Recommended/Custom" tabs
...
CURA-4146
2017-08-15 17:42:34 +02:00
Lipu Fei
1c747a962f
Merge remote-tracking branch 'CURA-4032'
2017-08-15 16:11:44 +02:00
Ghostkeeper
ddf35826dc
Merge branch '2.7'
2017-08-15 15:32:39 +02:00
Ghostkeeper
17a615d30c
Don't translate HTML tags and variable names
...
It says so in the context of the build dimensions translation. Not yet in the context of the HTML tags with <filename> and such, but it will do that for the next translation round properly.
Contributes to issue CURA-4113.
2017-08-15 15:32:23 +02:00
Ghostkeeper
31757f4ce1
Merge branch '2.7' of https://github.com/Patola/Cura into Patola-2.7
2017-08-15 15:29:24 +02:00
alekseisasin
3116ff829c
Merge pull request #2200 from fieldOfView/fix_monitoritem_size
...
Adapt camera image to available space
2017-08-15 15:04:18 +02:00
alekseisasin
7ad7fb0a3c
Merge pull request #2200 from fieldOfView/fix_monitoritem_size
...
Adapt camera image to available space
2017-08-15 14:45:34 +02:00
Ghostkeeper
72bf74e513
Merge branch '2.7'
2017-08-15 14:16:08 +02:00
Ghostkeeper
3110349f5e
Fix misunderstood translation
...
Literally it should've been 'weergavenaam', but I'm now opting for a less literal translation because weergavenaam sounds so weird.
Contributes to issue CURA-4113.
2017-08-15 14:15:51 +02:00