Ghostkeeper
1d7792861d
Merge branch '3.0'
...
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
2017-10-02 17:40:24 +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
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
Jaime van Kessel
b5ce439c96
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-10-02 13:18:44 +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
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
9f8691feef
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-09-29 15:22:23 +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
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
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
Mark
fded206cc3
Merge branch '3.0'
2017-09-28 15:04:52 +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
b4154b8cc0
Merge branch '3.0'
2017-09-28 13:01:10 +02:00
Mark
9a193ad5c5
Changing AGPLv3 to LGPLv3
2017-09-28 13:00:43 +02:00
ChrisTerBeke
c4c9375bc3
Merge branch '3.0'
2017-09-28 09:35:48 +02:00
ChrisTerBeke
07899ba798
Merge branch 'feature_hide_gradual_infill' into 3.0
2017-09-28 09:34:25 +02:00
ChrisTerBeke
ca277da35c
Merge branch '3.0'
2017-09-28 09:22:15 +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
3fa281084f
Merge branch '3.0'
2017-09-28 09:17:55 +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
c4fc4a7198
Add better descriptions for abbreviated units
...
This should help the translators next time to find better translations.
Contributes to issue CURA-4341.
2017-09-27 17:34:12 +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
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
ChrisTerBeke
f8e8dcacdf
CURA-4381 use modulus to set infill slider step size and tick show
2017-09-27 13:55:57 +02:00
ChrisTerBeke
aed5e631dc
CURA-4352 fix passing int values as float when changing slider value
2017-09-27 13:13:55 +02:00
Jaime van Kessel
2dee054003
Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0
2017-09-27 12:57:42 +02:00
fieldOfView
0308d3d9d0
Fix margin between tools and extruders
2017-09-27 11:46:42 +02:00
fieldOfView
3d08ec6bac
Fix Simple mode sliders for Hi DPI
2017-09-27 11:43:57 +02:00
