Jack Ha
5a2aa8846b
Added extruder count detection to layer view. CURA-3273
2017-01-30 13:29:35 +01:00
Jack Ha
d6f00a0a64
Solved merge conflict. CURA-3321
2017-01-30 11:40:53 +01:00
Jack Ha
5f6ed488d1
Layerview removed Color Only Selected Extruder, cleanup 3d shader. CURA-3273
2017-01-30 11:39:59 +01:00
Jack Ha
645d188698
Merge branch 'layer_view3_cleanup' into layer_view3_layout
2017-01-30 11:26:13 +01:00
Jack Ha
2f9618f2ad
Merge branch 'master' into layer_view3_cleanup
2017-01-30 11:25:55 +01:00
Jack Ha
b1d95f3464
Layout Layer View menu, removed item, changed size. CURA-3321
2017-01-30 11:24:51 +01:00
Ghostkeeper
ee2076b407
Merge branch '2.4'
2017-01-28 02:35:28 +01:00
Ghostkeeper
d24f42444e
Fix formatting so translation files actually compile
...
My guess is that the translation bureau didn't properly check its file format correctness.
Contributes to issue CURA-3028.
2017-01-28 02:30:33 +01:00
Ghostkeeper
24cb768339
Remove all fuzzy markers from professional translations
...
They don't want them there. They apparently don't think they have to check for fuzziness either.
Contributes to issue CURA-3028.
2017-01-28 01:44:17 +01:00
Ghostkeeper
3d0c57262c
Fix fuzzy translations
...
They are still marked as fuzzy. Going to resolve that next.
Contributes to issue CURA-3028.
2017-01-28 01:29:40 +01:00
Ghostkeeper
efb866c64f
Update translations for 2.4
...
This initial round, the translators didn't check the fuzzy string matches. These are therefore incorrect. We have new translations for the fuzzies. I'm going to add them now.
Contributes to issue CURA-3028.
2017-01-28 01:05:43 +01:00
Mark Burton
31c1684066
Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles
2017-01-27 15:55:43 +00:00
Mark Burton
27a52092d3
Add the skin_angles setting which is analogous to the infill_angles setting.
2017-01-27 15:55:22 +00:00
Mark Burton
afc75b6c3e
Now uses the [int] setting type. The default value is [ ] (an empty list).
2017-01-27 15:54:58 +00:00
Mark Burton
db3cf0c0fb
Add the [int] setting type for settings that are a list of integers.
...
The RegExpValidator (more of a restrictor than a validator) requires the
text to start with a '[' and then have a sequence of integers separated by
commas. A trailing ']' is accepted.
2017-01-27 15:54:19 +00:00
Simon Edwards
eb43806d7a
Merge branch 'master' into python_type_hinting
2017-01-27 15:37:30 +01:00
Ghostkeeper
35cbedc5fe
Merge pull request #1386 from Patola/master
...
Fixed little things according to advice from Ghostkeeper
2017-01-27 09:52:46 +01:00
Cláudio (Patola) Sampaio
f83a2c1066
Fixed two typos, removed quotes from jerk, changed 'anti-suporte' to 'anti-pendências' so that it does not conflict with future changes.
2017-01-27 09:51:38 +01:00
Jaime van Kessel
48e5a2237d
Merge branch 'master' of github.com:Ultimaker/Cura
2017-01-27 09:33:13 +01:00
Cláudio (Patola) Sampaio
798b40864c
Fixed two typos, removed quotes from jerk, changed 'anti-suporte' to 'anti-pendências' so that it does not conflict with future changes.
2017-01-27 03:44:05 -02:00
Jack Ha
bb1fa3ae04
Started changing layout of layer view. CURA-3321
2017-01-26 17:29:39 +01:00
Jaime van Kessel
d9541a08b8
3mf reader now uses fast normal calculation
...
CURA-3215
2017-01-26 17:27:41 +01:00
Ghostkeeper
bb584f5f32
Merge branch 'ubitux-misc'
2017-01-26 17:27:29 +01:00
Ghostkeeper
4f2ec59298
Merge branch 'misc' of https://github.com/ubitux/Cura into ubitux-misc
2017-01-26 17:24:24 +01:00
Ghostkeeper
73516fce89
Merge branch 'fieldOfView-fix_unthemed_rects'
2017-01-26 17:21:21 +01:00
Ghostkeeper
0a2520599d
Merge branch 'fix_unthemed_rects' of https://github.com/fieldOfView/Cura into fieldOfView-fix_unthemed_rects
2017-01-26 17:19:05 +01:00
Ghostkeeper
d3029c6c4f
Add Brazillian Portuguese language
...
The translation is almost complete at the moment. In the beta of the next release we'll decide if we want to keep this language.
2017-01-26 17:06:06 +01:00
Ghostkeeper
635535e33a
Fix plural forms of Brazillian Portuguese files
2017-01-26 17:06:06 +01:00
Jaime van Kessel
ab3294a899
Merge branch 'master' of github.com:Ultimaker/Cura
2017-01-26 15:37:15 +01:00
Jack Ha
6defbc8649
Merge branch '2.4'
2017-01-26 15:30:50 +01:00
Ghostkeeper
ed64154600
Merge branch 'master' of https://github.com/Patola/Cura into Patola-master
2017-01-26 15:14:29 +01:00
Jack Ha
b8967edd82
Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4
2017-01-26 14:57:40 +01:00
Jack Ha
64d5d094b3
initial bed temperature: resolveOrValue to the rescue. CURA-3307
2017-01-26 14:57:26 +01:00
fieldOfView
e2a9fc0d79
Rename header tab status overlays to make them reusable
...
The "settings" tab could use a status overlay to show setting errors and slicing paused states.
2017-01-26 14:32:47 +01:00
fieldOfView
5939ff9b81
Make header tab button color stylable
...
The monitor tab icon is split up in a base monitor tab icon and a status overlay, each with their own color.
2017-01-26 14:17:07 +01:00
MaukCC
70a4d0bd52
Update cartesio_0.4.inst.cfg
2017-01-26 13:51:57 +01:00
MaukCC
e3aff8e2ac
Update cartesio_0.25.inst.cfg
2017-01-26 13:51:45 +01:00
MaukCC
c70229ff88
Update cartesio_0.8.inst.cfg
2017-01-26 13:51:34 +01:00
MaukCC
06830fe16a
Update cartesio_0.8.inst.cfg
2017-01-26 13:47:03 +01:00
MaukCC
50b65da860
Update cartesio_0.4.inst.cfg
2017-01-26 13:46:50 +01:00
MaukCC
5ba4e3549d
Update cartesio_0.25.inst.cfg
2017-01-26 13:46:37 +01:00
Clément Bœsch
bf73a76b96
definitions: fix deprecated usage of travel_speed in rigidbot
2017-01-26 13:32:47 +01:00
MaukCC
d625115815
Update cartesio_extruder_3.def.json
2017-01-26 12:46:33 +01:00
MaukCC
7398cdba18
Update cartesio_extruder_2.def.json
2017-01-26 12:46:03 +01:00
MaukCC
7d98b98a99
Update cartesio_extruder_2.def.json
2017-01-26 12:45:47 +01:00
MaukCC
7586054cdf
Update cartesio.def.json
2017-01-26 12:41:39 +01:00
MaukCC
059c70968e
Update cartesio_0.8.inst.cfg
2017-01-26 12:39:21 +01:00
MaukCC
f68e09ce9a
Update cartesio_0.4.inst.cfg
2017-01-26 12:38:57 +01:00
MaukCC
873340376e
Update cartesio_0.25.inst.cfg
2017-01-26 12:38:26 +01:00
fieldOfView
8d7bde02f3
Fix unslicable ("striped") model rendering and add overhang color theming
2017-01-26 11:09:09 +01:00
