Commit graph

5638 commits

Author SHA1 Message Date
Ghostkeeper
af8176d309
Merge branch 'master' of github.com:Ultimaker/Cura 2017-12-01 15:37:11 +01:00
Ghostkeeper
f03615c8a7
Merge branch '3.1' 2017-12-01 15:36:58 +01:00
Ghostkeeper
1a9112d598
Add missing layer view translation
Luckily we already have some translations which were made for other contexts. I'm assuming that the translation here doesn't really depend on the context.

Contributes to issue CURA-4601.
2017-12-01 15:33:21 +01:00
Ghostkeeper
317effd8f3
Uncomment translations for Layer View
The layer view was renamed back from Simulation View to layer view after the string freeze.

Contributes to issue CURA-4601.
2017-12-01 15:24:09 +01:00
Ghostkeeper
e5966de99d
Merge branch '3.1' 2017-12-01 15:13:11 +01:00
ChrisTerBeke
c3ddd12e16
Merge pull request #2882 from fieldOfView/fix_sidebar_estimation_tooltips
Tweak layout and alignment of print time and cost estimation
2017-12-01 15:08:37 +01:00
Ghostkeeper
62185a8ef0
Add Traditional Chinese language option
Contributes to issue CURA-4370.
2017-12-01 15:06:03 +01:00
Ghostkeeper
7068f6c28c
Fix whitespace at the end
Otherwise gettext will complain that one of them ends with \n but the other doesn't.

Contributes to issue CURA-4601.
2017-12-01 14:59:51 +01:00
Ghostkeeper
e3b7bbb6bd
Fix whitespace at the end
Otherwise gettext will complain that one of them ends with \n but the other doesn't.

Contributes to issue CURA-4601.
2017-12-01 14:43:41 +01:00
Ghostkeeper
2236e0016d
Merge branch '3.1' 2017-12-01 14:41:41 +01:00
Dinow
c5baabd8a3
Update cura.po for 3.1 2017-12-01 14:40:51 +01:00
Dinow
4c1024fcc2
Update fdmprinter for 3.1 2017-12-01 14:40:41 +01:00
Dinow
302543cad2
update from pot files 2017-12-01 14:40:27 +01:00
Dinow
fb9645d185
import from 3.0 2017-12-01 14:40:15 +01:00
Ghostkeeper
b429966ab6
Merge branch 'translate-zh_TW' of github.com:dinowchang/Cura into dinowchang-translate-zh_TW 2017-12-01 14:37:57 +01:00
Ghostkeeper
c039535ee3
Fix retraction window of PLA and Nylon of 0.25mm profiles
This was probably caused by having wrong default profiles.

We're checking the rest of the settings again now just to be sure, because this probably has more implications elsewhere too.
2017-12-01 13:57:10 +01:00
Ghostkeeper
c0e7446f2a
Correct label of Save Project menu item
Capital P. Ellipses to indicate that a modal window is coming. Ampersand to enable the hotkey.
2017-12-01 10:44:56 +01:00
Ghostkeeper
f045b85db3
Merge branch '3.1' 2017-12-01 10:19:36 +01:00
Ghostkeeper
0336af3b4a
Merge branch '3.1' of github.com:Anraf1001/Cura into anraf1001-3.1 2017-12-01 09:52:17 +01:00
Ghostkeeper
96c38bce2b
Merge branch '3.1' 2017-11-30 16:57:01 +01:00
Ghostkeeper
93159c8986
Corrections to translations
Made by Vandrasc.

Contributes to issue CURA-4601.
2017-11-30 16:32:52 +01:00
Ghostkeeper
31104bcdc4
Corrections to Dutch translation
Not all too bad this time.

Contributes to issue CURA-4601.
2017-11-30 16:32:52 +01:00
fieldOfView
9564bb645f Remove test code 2017-11-30 15:54:24 +01:00
Ghostkeeper
0fdb21fc91
Update translations for 3.1
The rest of the ones from Bothof.

Contributes to issue CURA-4601.
2017-11-30 15:12:44 +01:00
Jaime van Kessel
1c1c195b93 When an printer gets added / removed, this is now correctly shown
CL-541
2017-11-30 15:01:28 +01:00
Ghostkeeper
3bb45488c3
Update translations for 3.1
From Bothof.

Contributes to issue CURA-4601.
2017-11-30 14:54:34 +01:00
Jaime van Kessel
339d7ca4c9 Cluster shows default controlItem again when a specific printer is selected
CL-541
2017-11-30 14:36:53 +01:00
Jaime van Kessel
dea13899b3 Cluster can now "target" one of it's printers for display
CL-541
2017-11-30 13:07:01 +01:00
fieldOfView
4303278602 Tweak layout and alignment of print time and (material) cost estimation...
improving readability

* table takes the full width and values are right-aligned
* time estimates are shortened
* values are right aligned
* feature/time/percentage are on a single line again
* handle long feature & material names gracefully

Fixes #2712
* totals are only shown when there are multiple extruders
2017-11-30 10:35:31 +01:00
Diego Prado Gesto
14e99cef17 CURA-4634 Remove standby temperature from quality profiles 2017-11-29 13:33:40 +01:00
ChrisTerBeke
0668f80792
Merge pull request #2758 from fieldOfView/feature_mesh_types
Improved mesh type UX (Per Model Settings)
2017-11-29 13:24:38 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
ChrisTerBeke
75e4c34a6a Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-29 10:47:58 +01:00
ChrisTerBeke
16e07fc461 Update color indicators for extruders when changing material color - CURA-4641 2017-11-29 10:47:39 +01:00
alekseisasin
d4dfca3ef5
Merge pull request #2868 from Ultimaker/feature_adaptive_layer_heights
Add experimental settings for adaptive layer heights - CURA-4524
2017-11-29 09:48:33 +01:00
Brecht Nuyttens
dadd6ffa67 Merge remote-tracking branch 'refs/remotes/Ultimaker/master' 2017-11-29 08:46:45 +01:00
Dinow
21c1272e45 Update cura.po for 3.1 2017-11-28 23:50:38 +08:00
ChrisTerBeke
ce88b9ee67
Merge pull request #2692 from Ultimaker/reload_qml
Added reload qml action
2017-11-28 15:50:47 +01:00
ChrisTerBeke
263230f9d2 Merge branch '3.1' 2017-11-28 15:45:57 +01:00
Lipu Fei
fa1d1ee3ad Fix layer height slider auto switching
CURA-4617
2017-11-28 14:35:44 +01:00
ChrisTerBeke
e6b3773d8e
Merge pull request #2797 from Ultimaker/feature_firmware_retract_setting
Add setting to determine whether to use firmware retraction
2017-11-28 13:45:38 +01:00
ChrisTerBeke
cf187215dd Add experimental settings for adaptive layer heights - CURA-4524 2017-11-28 11:44:20 +01:00
ChrisTerBeke
68cd9df65f Merge branch '3.1' 2017-11-28 10:36:11 +01:00
ChrisTerBeke
7b30e9a6fc
Merge pull request #2856 from Ultimaker/simulation_view_gradient_changes
Adapt gradient in Simulation view for better visualization of feedrates
2017-11-28 10:34:10 +01:00
Buco
af0b949a6f Changed Setting version
Setting version to 4
2017-11-28 09:28:25 +01:00
Buco
6caa434dc2 Add Quality Profiles
Added extra Quality profiles for BVOH, PET, Innoflex60 and PVA
2017-11-28 09:07:34 +01:00
Ruben D
ab64cb5749
Add print head shape
Fixes #2808.
2017-11-27 23:10:58 +01:00
ChrisTerBeke
a072af5585 Merge branch '3.1' 2017-11-27 17:17:02 +01:00
ChrisTerBeke
b74ebc57b4 Fix per extruder setting value depending on extruder count - CURA-4627 2017-11-27 17:00:57 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components
CL-541
2017-11-27 15:54:44 +01:00