ChrisTerBeke
874b08eb07
Fixes for infill slider gradual reset - CURA-4397
2017-10-05 18:08:52 +02:00
Lipu Fei
185c350a19
Merge remote-tracking branch 'upstream/3.0'
2017-10-05 15:49:18 +02:00
Diego Prado Gesto
17183316db
Gradual infill stepping 1 by 1 and remembering previous value - CURA-4397
2017-10-05 15:22:39 +02:00
Lipu Fei
5e970fa5a5
Use more descriptive function name
...
CURA-4411
2017-10-05 15:08:08 +02:00
ChrisTerBeke
82805fefe4
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-10-05 15:01:27 +02:00
ChrisTerBeke
9ef1caff50
Fix view combobox not updating when using view menu item, code cleanup, CURA-4411
2017-10-05 15:01:19 +02:00
Ghostkeeper
f2ecf41ab1
Fix referencing creality definitions
...
The IDs don't matter, but that little 'a' there does.
2017-10-05 13:44:06 +02:00
Ghostkeeper
aa9ae73e8f
Set minimum layer time to 10 seconds
...
Via inheritance this is applied to all Creality printers.
2017-10-05 13:44:06 +02:00
Ghostkeeper
5cd1825603
Remove 'beta' from names of Creality printers
...
They are now considered stable.
2017-10-05 13:44:06 +02:00
Ghostkeeper
42652cc1c1
Update Japanese translations
...
Received these via Ultimaker's resellers in the area.
Contributes to issue CURA-4341.
2017-10-05 13:44:06 +02:00
Ghostkeeper
203485d436
Update Korean translations
...
These were received via Ultimaker's resellers for that area. I fixed up the metadata before uploading it here.
Contributes to issue CURA-4341.
2017-10-05 13:44:06 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""
...
This reverts commit e07e7bc9e714843cf853f0a255ee5a8432696886.
Contributes to issue CURA-4414.
2017-10-05 10:58:49 +02:00
Ghostkeeper
ff41b043b1
Merge branch '3.0'
2017-10-05 10:58:21 +02:00
ChrisTerBeke
a8476c30ca
CURA-4414 replace all Text elements for Label, make sure no half pixel anchors exist
2017-10-05 10:58:07 +02:00
Mark
e9a8ae15f3
Move text back to label and remove unused font
2017-10-05 10:57:43 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"
...
This reverts commit b62c19206f5e494fa27eb0b877197556c559e449, reversing
changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3.
Contributes to issue CURA-4414.
2017-10-05 10:28:54 +02:00
Diego Prado Gesto
30be02be14
Keep custom infill density value when disabling gradual infill - CURA-4397
2017-10-05 09:08:52 +02:00
Ghostkeeper
e7153968f0
Merge branch 'feature_raise3d_n2' of https://github.com/fieldOfView/Cura into fieldOfView-feature_raise3d_n2
2017-10-04 17:19:35 +02:00
ChrisTerBeke
b62c19206f
Merge branch 'fix_garbled_fonts_macos' into 3.0
2017-10-04 14:09:59 +02:00
ChrisTerBeke
3f1ec174ba
CURA-4414 replace all Text elements for Label, make sure no half pixel anchors exist
2017-10-04 13:34:24 +02:00
ChrisTerBeke
b0fa87231c
CURA-4390 add new menu item for plugins
2017-10-03 17:33:24 +02:00
Mark
dcb630a24e
Move text back to label and remove unused font
2017-10-03 14:02:07 +02:00
Ghostkeeper
179ea654cc
Merge branch '3.0'
2017-10-03 12:29:27 +02:00
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
bd78c1ae63
Merge branch '3.0'
2017-10-03 10:59:16 +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
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
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
Jaime van Kessel
0103e2d259
Merge branch 'patch-1' of https://github.com/Jerooney/Cura
2017-10-02 14: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
8e4bc433d6
Added missing has_machine_quality tag for UM2
...
CURA-4382
2017-10-02 14:15:13 +02:00
Ghostkeeper
bc53fea8aa
Merge branch 'mb-infill-offset' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-origin
2017-10-02 13:42:07 +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
Ghostkeeper
b468a4f0cc
Merge branch '3.0'
2017-10-02 13:35:47 +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
Jaime van Kessel
b5ce439c96
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-10-02 13:18:44 +02:00
Jerooney
6eb7932517
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 13:00:53 +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
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
Ghostkeeper
ffe3e16b56
Merge branch '3.0'
2017-09-29 13:38:50 +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
