Commit graph

5638 commits

Author SHA1 Message Date
Lipu Fei
ffa4df6a06 Merge 3.2 into master 2018-02-07 13:20:24 +01:00
Jack Ha
f29d07ce40 CURA-4923 corrected the material diameter of malyan_m200 2018-02-07 11:42:15 +01:00
Aleksei S
c890472641 Fix: save Custom setting visibility preset
CURA-3710
2018-02-07 10:53:17 +01:00
Ghostkeeper
45a4c56915
Fix brackets in Korean translation
So that it won't crash.
2018-02-06 16:25:15 +01:00
Ghostkeeper
64e7a8e61f
Merge branch '3.2' 2018-02-05 14:18:18 +01:00
Ghostkeeper
95d1d8cf34
Update headers of translation files
The dates are corrected, attribution correct, etc.

Contributes to issue CURA-4883.
2018-02-05 13:53:56 +01:00
Ghostkeeper
be660cc0bc
Update translations from Bothof
These are the unchecked translations from Bothof in Cura 3.2. Other translations follow.

Contributes to issue CURA-4883.
2018-02-05 13:32:00 +01:00
alekseisasin
6fe524dce8
Merge pull request #3142 from Velleman/master
Updated definition and added the qualities
2018-02-05 11:56:09 +01:00
Ian Paschal
f627c97a92
Merge pull request #3218 from Ultimaker/CURA-3710_setting_visibility_preset
CURA-3710 Add preset setting visibility files
2018-02-05 09:51:52 +01:00
ChrisTerBeke
8e86c49c81
Merge pull request #3176 from fieldOfView/fix_dark_sidebar
Fix sidebar theming (for Ultimaker Dark theme)
2018-02-02 14:31:43 +01:00
Lipu Fei
367e50669d Refactor code
CURA-3710
2018-02-01 13:56:49 +01:00
Lipu Fei
25713a6e64 Merge remote-tracking branch 'origin/3.2' 2018-02-01 11:23:20 +01:00
Lipu Fei
1801f1f27c Update advanced and export presets with some settings moved to exp.
CURA-3710

Some settings have been moved to experimental.
2018-02-01 11:17:57 +01:00
Lipu Fei
0e5c67a38f Merge remote-tracking branch 'origin/master' into CURA-3710_setting_visibility_preset 2018-02-01 11:00:13 +01:00
Diego Prado Gesto
701ac7f91e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-01 09:05:32 +01:00
alekseisasin
e5c72cfdc5 Validate material profile
CURA-4851
2018-01-31 14:58:44 +01:00
Lipu Fei
3927c70625 Fix material_diameter handling in ExtruderStacks
CURA-4898
2018-01-31 13:32:45 +01:00
Diego Prado Gesto
81488e0bbc Merge branch '3.2' 2018-01-31 09:13:29 +01:00
Aleksei S
f065a08c82 Added visible settings
CURA-3710
2018-01-30 15:26:15 +01:00
Diego Prado Gesto
36eded925c Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-30 14:43:00 +01:00
Ghostkeeper
c403d52972
Only limit retraction speed if retraction is enabled
For some printers the feedrate might be too low for the defaults.
2018-01-30 13:44:18 +01:00
Diego Prado Gesto
3981b717a8 CURA-4881 Remove the automatic option for buildplates 2018-01-30 13:31:14 +01:00
Diego Prado Gesto
e227ab5a23 CURA-4881 Remove the automatic option for buildplates if there is no information about them 2018-01-30 13:29:28 +01:00
Diego Prado Gesto
b7093e8b57 Make the menu separator only show if there are quality changes profiles 2018-01-30 11:26:01 +01:00
Ghostkeeper
fc23787c1c
Merge branch '3.2' 2018-01-29 10:37:59 +01:00
Ghostkeeper
58dc6e2b0f
Add new strings to each translation
This merges the updated translation templates (.pot) into the existing translations (.po).

Contributes to issue CURA-4883.
2018-01-29 10:37:47 +01:00
Ghostkeeper
650ca4e5e8
Merge branch '3.2' 2018-01-29 10:25:29 +01:00
Ghostkeeper
a40d13b50e
Update translation templates for Cura 3.2
Contributes to issue CURA-4883.
2018-01-29 09:50:12 +01:00
fieldOfView
a1adce298e Add color to "recommended"/"custom" button texts 2018-01-24 16:56:53 +01:00
fieldOfView
1a56eae186 Bring SettingOptionalExtruder up to speed 2018-01-24 16:46:53 +01:00
fieldOfView
6480926869 Add swatches in extruder dropdown 2018-01-24 16:44:15 +01:00
fieldOfView
19e74a2d45 Add extruder combobox popup styling 2018-01-24 16:29:36 +01:00
Ghostkeeper
4f72f52447
Reduce minimum value for flow to 0.0001%
CuraEngine can handle that. It's not going to extrude anything, but neither is 5% really.

Contributes to issue CURA-4506.
2018-01-24 16:29:24 +01:00
Ghostkeeper
b9fe0046f2
Merge branch 'initial_layer_flow' of https://github.com/BagelOrb/Cura into BagelOrb-initial_layer_flow
Contributes to issue CURA-4506.
2018-01-24 16:20:48 +01:00
Ghostkeeper
ae40071ffd
Merge branch '3.2' 2018-01-24 16:17:49 +01:00
fieldOfView
428dfeaed7 Add combobox popup styling 2018-01-24 16:08:56 +01:00
Ghostkeeper
3f7eaaae94
Move HTML tags out of translated text
We always want the same HTML tag around it. There's no need to allow the translator to change that.

Discovered during issue CURA-4692.
2018-01-24 13:52:31 +01:00
Ghostkeeper
d6182c8c49
Fix extra space in translation
The only mistake I found, really.

Contributes to issue CURA-4692.
2018-01-24 13:52:31 +01:00
Ghostkeeper
5b90bb3c5a
Update Portuguese translations by Utópica3D
These people did a pass on the Portuguese translations and made a lot of improvements.

Contributes to issue CURA-4692.
2018-01-24 13:52:31 +01:00
ChrisTerBeke
b41d8eb0dd Merge branch '3.2' 2018-01-24 13:29:30 +01:00
Lipu Fei
a6f5f8ea68 Revert "Revert "Rename Enable Travel Optimization to Infill Travel Optimization""
This reverts commit 3ec4cc6a0b.
2018-01-23 20:37:24 +01:00
Ghostkeeper
2f61c4436f
Merge branch 'master' of https://github.com/pouncingiguana/Cura into pouncingiguana-master 2018-01-23 16:37:43 +01:00
Jack Ha
b0d0b75662 Merge branch '3.2' 2018-01-23 14:25:11 +01:00
Lipu Fei
3ec4cc6a0b Revert "Rename Enable Travel Optimization to Infill Travel Optimization"
This reverts commit a31d65786b.
2018-01-23 12:38:51 +01:00
Ghostkeeper
f5e40c2281
Merge branch '3.2'
Contributes to issue CURA-4797.
2018-01-23 11:27:17 +01:00
Ghostkeeper
a31d65786b
Rename Enable Travel Optimization to Infill Travel Optimization
Because it's now no longer in the Infill category this is unclear.
2018-01-23 11:24:43 +01:00
Aleksei S
54dc63a596 Add missing changes
CURA-3710
2018-01-23 11:24:27 +01:00
Aleksei S
8fe6e82459 Added Setting visibility preset
CURA-3710
2018-01-23 11:14:57 +01:00
Diego Prado Gesto
5c8a47275e CURA-4845 Revert changes when accessing the quality changes at the time
of creating the global ProfileTab in the preferences.
2018-01-22 13:08:30 +01:00
Ghostkeeper
23bfa798b1
Merge branch '3.2' 2018-01-22 12:51:39 +01:00