Commit graph

2745 commits

Author SHA1 Message Date
Jack Ha
1d77864915 Added force layer view compatibility mode. CURA-3273 2017-02-07 09:36:21 +01:00
Jack Ha
e31a695061 WIP OpenGL 4.1 core profile. CURA-3273 2017-01-31 17:05:00 +01:00
Jack Ha
2f9618f2ad Merge branch 'master' into layer_view3_cleanup 2017-01-30 11:25:55 +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
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
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
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
Clément Bœsch
bf73a76b96 definitions: fix deprecated usage of travel_speed in rigidbot 2017-01-26 13:32:47 +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
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
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
fieldOfView
bf3d3d46e2 Fix Rectangles that always show as white regardless of the theme 2017-01-25 15:12:57 +01:00
Jack Ha
3a2438937d Removed crappy legend 2017-01-25 12:46:07 +01:00
jack
26ad2c8f6e Merge pull request #1378 from fieldOfView/feature_layerview_legend
Layerview Legend
2017-01-25 11:53:41 +01:00
Cláudio (Patola) Sampaio
fb2660c2d8 Added translation files for Brazilian Portuguese 2017-01-25 07:30:44 -02:00
fieldOfView
878ccc679c Add a legend to Layer View 2017-01-24 23:24:52 +01:00
Jack Ha
e21a6ed62a Cleanup 2017-01-24 16:52:47 +01:00
Ghostkeeper
a8efde9450 Merge pull request #1243 from fieldOfView/feature_material_cost
Implement material cost
2017-01-24 15:54:57 +01:00
Ghostkeeper
3a64f0791a Merge branch 'mb-min-infill-area' of https://github.com/smartavionics/Cura into smartavionics-mb-min-infill-area 2017-01-24 12:55:01 +01:00
Mark Burton
7020e01843 Don't minimise minimum! 2017-01-24 10:50:28 +00:00
Ghostkeeper
46d9d15d02 Merge branch 'mb-min-infill-area' of https://github.com/smartavionics/Cura into smartavionics-mb-min-infill-area 2017-01-24 11:42:22 +01:00
Tim Kuipers
6e66a71ed9 fix: let initial layer bed temp depend on bed temp (CURA-3307) 2017-01-24 10:24:15 +01:00
fieldOfView
32823a0183 Add viewport colors to cura theme 2017-01-23 20:06:06 +01:00
Jaime van Kessel
858886d6b7 Merge branch '2.4' of github.com:Ultimaker/Cura 2017-01-23 15:09:48 +01:00
Jaime van Kessel
3d58bd4d49 Workspace & load image dialog can now be resized
CURA-3247
2017-01-23 15:08:37 +01:00
Mark Burton
c017013aae Added min_infill_area setting.
This allows the user to specify in mm^2 the minimum area of infill regions.
Areas smaller than this will be merged into the surrounding skin rather
than being filled with infill.
2017-01-19 11:48:17 +00:00
Chris Petersen
f6110623ce Fix typos in kossel_pro gcode variable usage
Replace double-braces with single-braces so that `material_bed_temperature` and `material_print_temperature` are interpolated properly.
2017-01-18 01:15:59 -08:00
Jack Ha
abe7a8e9a3 Merge branch 'master' into layer_view3_cleanup 2017-01-17 15:16:50 +01:00
Simon Edwards
8d146d92b3 Merge branch '2.4' 2017-01-12 13:26:25 +01:00
awhiemstra
a2e00bd560 Merge pull request #1336 from fieldOfView/fix_center_zero_tower_pos
Fix prime disallowed areas when center is zero
2017-01-12 10:28:53 +01:00
awhiemstra
3e298c2d0e Merge pull request #1337 from fieldOfView/fix_hide_profile_selection
Hide profiles selection when hiding settings
2017-01-12 10:25:00 +01:00
Jaime van Kessel
3b29944b0f Merge pull request #1324 from TheRikke/master
Add definition file for 101Hero
2017-01-12 09:59:03 +01:00
fieldOfView
3e369c2494 Hide profiles selection (variant/material/quality) when hiding settings 2017-01-11 18:31:33 +01:00
fieldOfView
1226b2e78e Fix the min/max values for prime(tower) positions when center_is_zero 2017-01-11 18:05:27 +01:00