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
Ghostkeeper
13124ae983
Don't make filter_out_tiny_gaps a child setting of fill_perimeter_gaps
...
Parent settings are not used by the engine. Or they shouldn't be, because the parent settings are disabled by the front-end when all of their child settings are overwritten. Then you'd have a parent setting that is used by the engine but you can't modify it. Also, the command-line slicing doesn't load parent settings since it can't parse categories and such.
2017-11-27 13:58:34 +01:00
Ghostkeeper
65ea8a614c
Don't make filter_out_tiny_gaps a child setting of fill_perimeter_gaps
...
Parent settings are not used by the engine. Or they shouldn't be, because the parent settings are disabled by the front-end when all of their child settings are overwritten. Then you'd have a parent setting that is used by the engine but you can't modify it. Also, the command-line slicing doesn't load parent settings since it can't parse categories and such.
2017-11-27 13:54:29 +01:00
Jaime van Kessel
083eee2e9d
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-11-27 13:43:39 +01:00
Jaime van Kessel
00eeb835ac
ManualPrinterControl uses correct functions again
...
CL-541
2017-11-27 10:22:30 +01:00
Jaime van Kessel
5036eccd32
Moved multiple components to their own files
...
CL-541
2017-11-27 10:15:28 +01:00
Ghostkeeper
e0f0e098ff
Use MaterialsModel for materialsModel
...
This specialized InstanceContainersModel has an override that makes the model a bit more efficient when non-materials get their metadata updated.
Contributes to issue CURA-4243.
2017-11-27 09:54:40 +01:00
Diego Prado Gesto
fa00a17c78
Make UI changes in the Simulation View for adapting the color gradient
...
in the Feedrate color scheme. Due to the travel speed is normally very
high compared with the other speeds in the model, the gradient is now
gradual instead of linear in order to show more changes in the low
values and less changes in the high values.
Adapt also the button styles and themes' colors.
Set the play/pause button to the left and reduce the size.
2017-11-26 21:21:18 +01:00
Ruben D
ffef26097d
Merge branch '3.1'
2017-11-26 18:48:42 +01:00
Ruben D
0d0bcb8aea
Clip text that exceeds the width of the text box.
...
For #2802 .
2017-11-26 18:48:27 +01:00
Ruben D
8847325cf8
Remove limit on length for integer arrays
...
The integer arrays were limited because the text in the text field is not properly clipped. I found a fix for that.
Fixes #2802 .
2017-11-26 18:47:58 +01:00
Dinow
e7477359bb
Update fdmprinter for 3.1
2017-11-25 00:31:48 +08:00
Diego Prado Gesto
d0c1569da6
Merge branch 'fieldOfView-feature_simulation_ux_tweaks'
2017-11-24 15:48:39 +01:00
Ghostkeeper
a0ae7489f8
Less technical term for X/Y offset of infill
...
Just in the description. It's good to describe a setting using different words than the setting name.
Contributes to issue CURA-4601.
2017-11-24 13:16:14 +01:00
Jaime van Kessel
57de028608
re-implemented abort & pause for legacy um3
...
CL-541
2017-11-24 11:26:30 +01:00
Jaime van Kessel
57406100ef
Fixed status icon in monitor tab
...
CL-541
2017-11-24 10:55:24 +01:00
Ghostkeeper
9ecfd5510a
Clarify description for when bed temperature is 0
...
Fixes #2674 .
2017-11-24 10:42:09 +01:00
Diego Prado Gesto
0b434978dd
CURA-4561 Add tooltip also to the Cancel button.
2017-11-24 10:34:38 +01:00
ChrisTerBeke
46a575b84f
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-24 10:31:30 +01:00
ChrisTerBeke
7d1db1b165
Merge branch '3.1'
2017-11-24 10:31:22 +01:00
Jaime van Kessel
9d7cd72691
JobData is now shown in monitor screen again
...
CL-541
2017-11-24 09:38:10 +01:00
Jaime van Kessel
219e285b20
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-11-24 09:23:21 +01:00
Jaime van Kessel
c523a6ddf6
Progress is now shown for LegacyPrinter while printing
...
CL-541
2017-11-24 09:22:50 +01:00
Adam Rumjahn
43c9df5703
Deactivate G32 auto leveling before print
...
don't need this any more on the new printers
2017-11-23 20:14:43 -05:00
Jack Ha
6f708fef8f
Merge branch 'master' of github.com:Ultimaker/Cura
2017-11-23 15:27:32 +01:00
Jack Ha
b6410ecf12
CURA-4561 prepare button upgrades
2017-11-23 15:27:22 +01:00
Mark
49705492ce
Merge branch '3.1'
2017-11-23 14:37:31 +01:00
Lipu Fei
dad2dfda89
No need to set currentItem after a material is imported
...
CURA-4546
2017-11-23 14:08:10 +01:00
Aleksei Sasin
1141368682
Hide icons if monitor view is selected CURA-4527
2017-11-23 12:54:53 +01:00
Mark
835a0fb5d3
Merge branch 'master' of github.com:Ultimaker/Cura
2017-11-23 10:39:00 +01:00
Mark
aee838c8c1
Merge branch '3.1'
2017-11-23 10:38:48 +01:00
Mark
3477b902ab
Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation
...
Cura 4527 view orientation
2017-11-23 09:56:26 +01:00
Lipu Fei
6b132a13de
Merge pull request #2786 from 0r31/discoeasy200_profile
...
Improve discoeasy200 profile
2017-11-23 00:25:07 +01:00
Diego Prado Gesto
2042cdf155
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-22 20:11:24 +01:00
Diego Prado Gesto
b776afaf3d
CURA-4509 Changing layout of the print time information tooltip,
...
now in two lines per feature. This is for avoid trimming the labels
because they depend on the language.
2017-11-22 20:09:39 +01:00
anraf1001
a0222eebb5
Polish translation - continued
2017-11-22 19:41:49 +01:00
