Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
...
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +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
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
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
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
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
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
Ghostkeeper
97000d8538
Merge branch '3.1'
2017-11-22 12:45:33 +01:00
Ghostkeeper
3823cca936
Disable Russian translation since it's incomplete
...
The maintainer of this translation didn't want to continue spending time to keep his translation up-to-date.
Contributes to issue CURA-4601.
2017-11-22 12:45:21 +01:00
Ghostkeeper
dfe29fa482
Merge branch '3.1'
2017-11-22 12:41:57 +01:00
Ghostkeeper
ffa418660a
Update Korean translations for 3.1
...
This adds empty translations and updates the line numbers and such. The original Korean translations for 3.0 are still retained.
Contributes to issue CURA-4601.
2017-11-22 12:41:31 +01:00
Ghostkeeper
62113df3bd
Update Korean translations with 3.0 translations
...
These are so wrong that Cura won't start with these translations loaded. We're asking for corrections.
Contributes to issue CURA-4601.
2017-11-22 12:41:31 +01:00
Aleksei S
d7b230269b
The icons changed
...
CURA-4527
2017-11-22 11:10:25 +01:00
Diego Prado Gesto
10ec02840e
Merge branch 'feature_simulation_ux_tweaks' of https://github.com/fieldOfView/Cura into fieldOfView-feature_simulation_ux_tweaks
2017-11-22 09:55:57 +01:00
Jack Ha
82a7b3718d
Merge branch 'master' of github.com:Ultimaker/Cura
2017-11-22 09:42:13 +01:00
Jack Ha
0a2a9a2589
CURA-4533 added setting 'Filter out tiny gaps'
2017-11-22 09:42:03 +01:00
Ghostkeeper
628e88a7e4
Update translation templates for every language
...
These files are to be sent to the translators. Their old translations have been retained but new strings were added.
Contributes to issue CURA-4601.
2017-11-21 16:59:56 +01:00
Ghostkeeper
1cb109d192
Update translation templates for Cura 3.1
...
Generated by calling 'make extract-messages'. This commit introduces a string freeze for Cura 3.1.
Contributes to issue CURA-4601.
2017-11-21 16:51:40 +01:00
fieldOfView
863b40b900
Merge branch 'master' into feature_simulation_ux_tweaks
...
# Conflicts:
# plugins/SimulationView/SimulationView.qml
2017-11-21 16:49:41 +01:00
Diego Prado Gesto
b36f4e497a
Merge branch 'CURA-4595_remove_0.1_bam_quality' into 3.1
2017-11-21 15:22:21 +01:00
Jack Ha
92e273fba9
Merge branch '3.1' of github.com:Ultimaker/Cura into 3.1
2017-11-21 15:12:26 +01:00
Jack Ha
602e8c0e66
Changed 'Check material compatibility' to 'Check compatibility' because it's not only materials possibly being incompatible
2017-11-21 15:12:17 +01:00
Lipu Fei
b09ffaf9e2
Remove "Fine" 0.1mm quality for BAM
...
CURA-4595
2017-11-21 13:35:59 +01:00
Diego Prado Gesto
b6e997c88d
CURA-4526 Delete LayerView plugin because it will be replaced with the
...
SimulationView.
This commit also adapts the code in order to accept the messages coming
from the engine, with information about feedrates and line thicknesses.
Add also some changes in the GCodeReader that reads feedrates and
line thickness from the gcode file.
2017-11-21 10:47:29 +01:00
fieldOfView
b4b39f0949
Tweak compatibility mode collapsed view panel
2017-11-20 20:32:45 +01:00
