Commit graph

5638 commits

Author SHA1 Message Date
Ghostkeeper
bff00d41d0
Add description for print time
It looks a bit weird right below the print time but we'll discuss that later.

Contributes to issue CURA-4149.
2017-08-14 09:42:46 +02:00
Ghostkeeper
454293f926
Remove superfluous rectangles
There's only one item in there. It makes no sense to group them by rows and that only makes the bindings more complicated.

Contributes to issue CURA-4149.
2017-08-14 09:38:40 +02:00
Ghostkeeper
e514a9f474
Fix some binding loops
Contributes to issue CURA-4149.
2017-08-14 09:34:52 +02:00
Ghostkeeper
c4305c7b1e
Rearrange and align time/material estimates
They look correct now but the log says there is a binding loop in here. We'll fix that next.

Contributes to issue CURA-4149.
2017-08-14 09:23:56 +02:00
Ghostkeeper
fb3a0b701c
Remove superfluous item
This item was just transparently being the same size as its parent, no ID or nothing. We can just remove it.

Contributes to issue CURA-4149.
2017-08-14 09:12:21 +02:00
Ghostkeeper
0430a274d9
Make slicing status text smaller
Makes more room for the time/material estimates.

Contributes to issue CURA-4149.
2017-08-14 09:10:35 +02:00
Ghostkeeper
067449192a
Move time/material estimates code to sidebar
It sort of works but is aligned all wrong right now.

Contributes to issue CURA-4149.
2017-08-14 09:04:26 +02:00
Ghostkeeper
d9e1154cc3
Merge branch '2.7' 2017-08-11 16:57:34 +02:00
Ghostkeeper
0b19b20c24
Fix language metadata
For some reason PoEdit seems to automatically put this back every time. Maybe it's time to switch to a different standard.

Contributes to issue CURA-4113.
2017-08-11 16:57:14 +02:00
Ghostkeeper
23aeb7efa8
Merge branch '2.7' of https://github.com/halfakop/Cura into halfakop-2.7 2017-08-11 16:55:29 +02:00
Ghostkeeper
0528a03363
Merge branch '2.7' 2017-08-11 16:23:58 +02:00
Ghostkeeper
5416504fcb
Update Korean translations
These files are directly copied from the translator. They seem to be perfect though so I don't see a reason to modify them further (apart from the fact that I don't know any Korean; the format is correct though).

Contributes to issue CURA-4113.
2017-08-11 16:19:49 +02:00
Ghostkeeper
4728f31996
Merge branch '2.7' 2017-08-11 12:38:49 +02:00
Ghostkeeper
824849a878
Make manufacturer for base fdm- definitions unknown
They are always overwritten, but if it isn't overwritten we don't know the manufacturer for the printer.

Contributes to issue CURA-4159.
2017-08-11 12:38:34 +02:00
KEMIQ 3D
f3af7655d1 Update kemiq_q2_gama_pla_low.inst.cfg
Removed extra empty files at the end of the file and changed adhesion_type
2017-08-11 13:10:47 +03:00
KEMIQ 3D
d71afa6ef6 Update kemiq_q2_gama_pla_draft.inst.cfg
Changed build adhesion type value
2017-08-11 13:08:32 +03:00
KEMIQ 3D
6b88b12605 Update kemiq_q2_gama_pla_draft.inst.cfg
Removed extra empty files at the end of the file
2017-08-11 13:02:15 +03:00
KEMIQ 3D
7a9d3ba41e Update kemiq_q2_beta_pla_extra_fine
Removed extra empty lines at the end of the file
2017-08-11 12:58:44 +03:00
KEMIQ 3D
68c0b28f98 Update kemiq_q2_beta_pla_fine.inst.cfg
Removed extra empty lines at the end of the file
2017-08-11 12:56:51 +03:00
KEMIQ 3D
0b6024dce5 Update kemiq_q2_beta_pla_normal.inst.cfg
Removed extra lines at the end of the file
2017-08-11 12:28:05 +03:00
KEMIQ 3D
d796716746 Update kemiq_q2_beta_pla_low.inst.cfg
Removed extra empty lines at the end of the file
2017-08-11 12:24:42 +03:00
KEMIQ 3D
5f2d1de9b1 Update kemiq_q2_beta_pla_draft.inst.cfg
Removed extra empty lines at the end of the file
2017-08-11 12:20:13 +03:00
Ghostkeeper
76e0156076
Merge branch '2.7' 2017-08-11 11:18:15 +02:00
Ghostkeeper
e1266ceb1f Change Ultimaker manufacturer to Ultimaker B.V.
The material profiles are sent to UM3 with a manufacturer that's obtained from the printer definition rather than the material definition. The printer definition was 'Ultimaker' rather than 'Ultimaker B.V.' and the printer checked against this.

Contributes to issue CURA-4159.
2017-08-11 10:24:13 +02:00
Ghostkeeper
5f057f46ea
Add Pirate language only on Talk Like a Pirate Day
Let's see who finds this.
2017-08-10 20:26:35 +02:00
Ruslan Popov
d349854bdd Update russian translation. 2017-08-09 19:28:25 +03:00
Lipu Fei
0a76e5c38f Merge branch '2.7' 2017-08-09 16:59:56 +02:00
Lipu Fei
a49c956cfa Temporary work around for "not overriden" limit to extruder features
CURA-4145

When features with limit to extruder set to "not overriden" and its
value is retrieved with "extruderValue()", because the extruder number
is "-1", extruderValue() falls back to the global stack. As a result,
values can be incorrect. This workaround using the variants temporarily
solves the problem for outer and inner wall line widths.
2017-08-09 16:57:21 +02:00
Lipu Fei
1aba451149 Fix value for outer wall_line_width
CURA-4145
2017-08-09 13:52:05 +02:00
Lipu Fei
98b72fb971 Merge branch '2.7' 2017-08-09 13:16:43 +02:00
krios-fabteam
8829f64991 updated resources settings version 2017-08-09 10:21:56 +02:00
Ghostkeeper
c0d96a1d79
Remove heat/cool speeds that are equal to default
The default value for both of these settings in fdmprinter is 2.
2017-08-09 09:46:22 +02:00
Lipu Fei
7d3ad43c90 Merge pull request #2177 from Ultimaker/raft_smoothing
JSOn feat: raft smoothing setting (CURA-3854)
2017-08-09 08:40:34 +02:00
Lipu Fei
63ea940680 Add minimum_value 0 for raft_smoothing
CURA-3854
2017-08-09 08:39:10 +02:00
Lipu Fei
33bf758081 Merge pull request #2127 from ChrisRiddell/cr_fix_ironing_settings
Keep Ironing settings together while in experimental
2017-08-08 16:54:37 +02:00
Lipu Fei
050caf49b2 Merge branch '2.7' 2017-08-08 16:44:58 +02:00
Lipu Fei
f75871567f Merge branch 'master' into cr_fix_ironing_settings 2017-08-08 16:43:48 +02:00
fieldOfView
0630559472 Fix setting variant of non-active extruder through menu 2017-08-08 11:41:15 +02:00
Ghostkeeper
919bc6767c
Disable top surface line directions if there is no top surface 2017-08-08 11:40:19 +02:00
fieldOfView
8d72ba5fe7 Fix setting material of non-active extruder through menu 2017-08-08 11:32:34 +02:00
Ghostkeeper
80cbdd03bb
Merge branch '2.7' 2017-08-07 11:06:12 +02:00
Ghostkeeper
ac5c0d019b
Minor fixes to Polish translation
Contributes to issue CURA-4113.
2017-08-07 11:06:00 +02:00
Ghostkeeper
e23e049c22
Update Polish translations for 2.7
These are the translation files exactly as I got them from Jagus85. Thanks!

Contributes to issue CURA-4113.
2017-08-07 10:58:46 +02:00
Lipu Fei
3bc7e9012d Use the right stack to retrieve infill values in Recommended mode
CURA-3932
2017-08-07 10:53:19 +02:00
Lipu Fei
b274f63df0 Use the right stack to retrieve infill values in Recommended mode
CURA-3932
2017-08-04 14:19:14 +02:00
alekseisasin
c5cdf2e206 UM3 Initial layer speed is fixed 20
CURA-3377
2017-08-03 15:19:17 +02:00
alekseisasin
03c48ac39c Addded other printer "Kemiq Q2 Gamma & Beta" and material quality
CURA-4086
2017-08-03 15:05:45 +02:00
alekseisasin
543fda4656 Merge pull request #2136 from kemiq3d/master
Add Kemiq Q2 Beta and Kemiq Q2 Gama definitions, mesh and qualities
2017-08-03 15:04:35 +02:00
Lipu Fei
f5c1bd6abd Add unit "mm" for Support Chunk Size
CURA-3957
2017-08-03 13:55:52 +02:00
Lipu Fei
8029efdffb Rename skip-some-zags setting names
CURA-3957
2017-08-03 13:55:24 +02:00