Commit graph

4845 commits

Author SHA1 Message Date
ChrisTerBeke
3c747dd69e Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-03 11:22:18 +02:00
ChrisTerBeke
edc10e0630 fix topbar colors in monitor mode for UM3 networking 2017-10-03 11:21:47 +02:00
Ghostkeeper
9a30941ead
Set support horizontal expansion back to 3
Also for Extended.
2017-10-03 10:59:00 +02:00
Ghostkeeper
dd79b895f5
Set support horizontal expansion back to 3
They discovered that the 2 was causing a lot of failed prints.
2017-10-03 10:00:48 +02:00
Jerooney
9cbd710593 Update camera color
This will apply to all UMO+, UM2, UM2+ and UM3 with old firmware users, which look at the camera view. The background changed from blue > grey.
2017-10-02 14:41:06 +02:00
jack
575c3ebebb Merge pull request #2530 from Ultimaker/CL-457_cura_connect_visual
CL-457 cura connect visual
2017-10-02 14:40:13 +02:00
Jaime van Kessel
1f8a5a1957 Minor codestyle refactor 2017-10-02 14:19:44 +02:00
Jaime van Kessel
8e4bc433d6 Added missing has_machine_quality tag for UM2
CURA-4382
2017-10-02 14:15:13 +02:00
Jaime van Kessel
bd80a47652 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-02 13:36:33 +02:00
Jaime van Kessel
7a85dc28d7 Changing to a printer with user settings doesn't trigger keep/discard popup anymore
Fixes #2499 CURA-4384
2017-10-02 13:35:19 +02:00
Ghostkeeper
db46e9377d
Add translations for strings that were added after string freeze
Please let's not do this again.

The Spanish, Dutch, French, German and Chinese translations were asked to a native or secondary speaker of the language in the office. The Finnish, Italian, Russian and Turkish translations are obtained from Google Translate (with some more clever searching than copy-paste). The Korean and Japanese translations are not needed since we don't translate cura.pot for those languages. The Polish and Brazillian Portuguese translations will be made after receiving the translations from the translators.

Contributes to issue CL-118.
2017-10-02 13:33:08 +02:00
Jack Ha
48ad909431 CL-457 removed commented out code 2017-10-02 11:45:09 +02:00
Simon Edwards
7aa2f5f0b8 Disable the fade on the monitor blue overlay to prevent the annoying "flash of blue" problem
CL-457 CL-468
2017-09-30 10:52:34 +02:00
Simon Edwards
e04a63d337 CL-468 The sidebar in the monitor tab should have a grey background
Subtask of CL-457 Cura plugin: primary visual improvements
2017-09-30 10:48:16 +02:00
Diego Prado Gesto
4d9908364a Now empty message in materials and variants doesn't appear - CURA-4377 2017-09-29 16:28:18 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
A.Sasin
3082038261 Fixed code style and machine default name is retrieved from machine definition
CURA-4345
2017-09-29 13:52:00 +02:00
Ghostkeeper
89de83254d
Update end g-code for Ultimaker 3
As requested by Coen.

Contributes to issue EM-1859.
2017-09-29 13:38:35 +02:00
Jack Ha
b7dd756427 CL-506 changed Aborted to Print aborted and added it to all translations on the top 2017-09-29 11:21:15 +02:00
Diego Prado Gesto
f0e89b7e01 Reverted a previous workaround that fixed errors when selecting material and variants in the application menus - CURA-4386 CURA-4379 2017-09-29 09:40:54 +02:00
Diego Prado Gesto
afb83fac88 Update the active extruder index when the global container changes. This
fixes a problem when Cura starts with a single extruder printer but the
user then choose a multiextruder printer - CURA-4386
Also added a quality definition in UM3E extruder with the ids of the UM3
extruders, so that the profiles for UM3 are also valid for UM3E and viceversa - CURA-4389
All are related issues with profiles and multiextruder printers
2017-09-28 18:02:39 +02:00
Diego Prado Gesto
61e65d5cb0 Fixing code style -
CURA-4386 CURA-4379
2017-09-28 16:14:58 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
alekseisasin
2a302a3e27 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-28 13:24:13 +02:00
alekseisasin
5402092bb4 During adding a new printer the printer name generated from default name and not from custom name (changed by user)
CURA-4345
2017-09-28 13:22:15 +02:00
Diego Prado Gesto
e3edc79a3e modified some code to fix the multiple extrusion issues - CURA-4379 2017-09-28 13:21:03 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ChrisTerBeke
07899ba798 Merge branch 'feature_hide_gradual_infill' into 3.0 2017-09-28 09:34:25 +02:00
ChrisTerBeke
bff79c63d5 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-28 09:21:53 +02:00
ChrisTerBeke
8f4692b3bb Merge branch '3.0' into FieldOfView/fix_quality_disabled_alignment 2017-09-28 09:19:13 +02:00
Ghostkeeper
2884e1e5b5
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-28 09:17:40 +02:00
ChrisTerBeke
f2e362838e Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment 2017-09-28 09:16:52 +02:00
fieldOfView
0b03681890 Hide gradual infill checkbox if the gradual infill steps setting is disabled 2017-09-27 22:28:20 +02:00
Ghostkeeper
fcc914cf0d
Make material colour indication a circle instead of square
The rest of them are circles. This one should be one too.
2017-09-27 17:28:32 +02:00
Ghostkeeper
33fdca4a6b
Fix mistakes in translations from Bothof
What do we pay these guys for?

Contributes to issue CURA-4341.
2017-09-27 17:27:47 +02:00
Ghostkeeper
609187a4ce
Update translations from Bothof
These are the new translations we got from Bothof for German, Spanish, Finnish, French, Italian, Dutch, Turkish and Simplified Chinese.

Contributes to issue CURA-4341.
2017-09-27 17:26:29 +02:00
Diego Prado Gesto
dcf07e4f35 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-27 17:25:22 +02:00
Diego Prado Gesto
f8722a2d4b Fixed code style in the function - CURA-4352 2017-09-27 17:21:43 +02:00
fieldOfView
47ad68bda7 Show ticks when they are not available 2017-09-27 17:20:55 +02:00
fieldOfView
87c7373cb0 Fix visibility when there are ticks but no available ticks 2017-09-27 17:14:41 +02:00
ChrisTerBeke
3ddb45160d Update infill slider icon border color to not look like a checkbox, fixes #2487 2017-09-27 16:59:03 +02:00
ChrisTerBeke
e948f54ada Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment 2017-09-27 16:37:40 +02:00
Diego Prado Gesto
c03d54f598 Merge branch '3.0' into fix_infill_slider_rounding 2017-09-27 16:11:10 +02:00
fieldOfView
3be8f45636 Move the quality indicator to the center when there is only one quality available
Fixes #2485
CURA-4383
2017-09-27 15:18:53 +02:00
ChrisTerBeke
83e612c1c1 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-27 14:51:34 +02:00
ChrisTerBeke
c1cfb76f8a CURA-4380 code improvements for build plate adhesion label 2017-09-27 14:51:20 +02:00
ChrisTerBeke
a8ce7185cc CURA-4380 gradual infill checkbox closer to slider to indicate category 2017-09-27 14:35:13 +02:00
ChrisTerBeke
a337fd4e9c CURA-4380 quality slider text disabled color when slider cannot be used 2017-09-27 14:32:05 +02:00
Mark
500989e36d Re-add the margin between infill and support checkbox
CURA-4380
2017-09-27 14:28:31 +02:00
Mark
aa93c67a94 Re-add the margin between infill and support checkbox
CURA-4380
2017-09-27 14:27:04 +02:00