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
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
Ghostkeeper
b377fdd2a6
Merge branch 'fix_unthemed_rects' of https://github.com/fieldOfView/Cura into fieldOfView-fix_unthemed_rects
2017-01-26 10:56:10 +01:00
Ghostkeeper
995377907b
Hide ooze shield in single extrusion
...
The setting has no effect then, because the ooze shield gets limited to the height of the highest extruder switch and there are no extruder switches in single extrusion prints.
2017-01-26 10:55:57 +01:00
Ghostkeeper
97bcf5b490
Add new fixes for UM2 firmware in 2.4
...
This text is at my judgement. No marketing speak.
Contributes to issue CURA-3048.
2017-01-26 10:55:57 +01:00
Jack Ha
4af902671f
Scale large models by default off. CURA-3289
2017-01-26 09:26:32 +01:00
Ghostkeeper
6f3acaf8b5
Hide ooze shield in single extrusion
...
The setting has no effect then, because the ooze shield gets limited to the height of the highest extruder switch and there are no extruder switches in single extrusion prints.
2017-01-25 16:36:01 +01:00
Ghostkeeper
a44013d384
Add new fixes for UM2 firmware in 2.4
...
This text is at my judgement. No marketing speak.
Contributes to issue CURA-3048.
2017-01-25 16:30:14 +01:00
Jaime van Kessel
092f42ef28
Revert "Only emit signal when the active extruder actually changes"
...
This reverts commit 4e8fb254f67790c6f97e12f1d365521ce0235933.
2017-01-25 16:20:10 +01:00
Jack Ha
06a42d98ee
Fix PrintInformation if somehow no active material container is found
2017-01-25 16:06:13 +01:00
Jack Ha
7281b46118
Merge branch '2.4'
2017-01-25 15:28:56 +01:00
fieldOfView
4a3329bc6c
Remove background from setting buttons (revert, override notice, linked)
...
The background now reverts to "transparent". These icon buttons are outside the setting control, so they should not have the background of the control itself.
2017-01-25 15:26:32 +01:00
fieldOfView
a823980d17
Replace "transparent" Rectangles by Items
2017-01-25 15:21:37 +01:00
MaukCC
9a117b4029
Update cartesio_extruder_0.def.json
2017-01-25 15:17:03 +01:00
MaukCC
6047f807ec
Update cartesio_extruder_1.def.json
2017-01-25 15:16:15 +01:00
fieldOfView
bf3d3d46e2
Fix Rectangles that always show as white regardless of the theme
2017-01-25 15:12:57 +01:00
MaukCC
6acfa572e0
Update cartesio_extruder_0.def.json
2017-01-25 14:59:18 +01:00
MaukCC
cc499ec59e
Update cartesio.def.json
2017-01-25 14:57:42 +01:00
