Commit graph

5150 commits

Author SHA1 Message Date
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
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
fieldOfView
532331bd44 Add a collapse button to the Simulation View panel
See https://github.com/Ultimaker/Cura/pull/2732
2017-11-20 20:24:38 +01:00
Mark
43f339f927 Update fdmprinter.def.json 2017-11-20 18:14:08 +01:00
Jack Ha
7219d84b91 CURA-4104 added settings for flow rate compensated extrusion 2017-11-20 18:13:28 +01:00
jack
f197508694 Merge pull request #2814 from Ultimaker/feature_maximum_resolution
Maximum mesh resolution
2017-11-20 18:09:11 +01:00
Ghostkeeper
b875f06baf Add setting to set the maximum mesh resolution
Implements issue CURA-4590.
2017-11-20 18:04:34 +01:00
fieldOfView
a42d054505 Tweak simulation view panel margins 2017-11-20 17:49:00 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements
Container stack improvements
2017-11-20 17:42:26 +01:00
Ghostkeeper
085e933e34 Move ironing into shell category
It is no longer considered experimental.
2017-11-20 17:39:10 +01:00
Ghostkeeper
df1a11ca07 Don't crash if support density is 0
Found while working on CURA-4523.
2017-11-20 17:38:39 +01:00
fieldOfView
1483683992 Move play button to path slider 2017-11-20 17:17:16 +01:00
Lipu Fei
b439581e2d
Merge pull request #2816 from Ultimaker/CURA-4104
CURA-4104 added settings for flow rate compensated extrusion
2017-11-20 15:27:56 +01:00
Aleksei S
9337cc8a7f Merge branch '3.1' into print_simulation_view 2017-11-20 14:32:22 +01:00
Mark
c1733dd908
Update fdmprinter.def.json 2017-11-20 14:19:58 +01:00
Jack Ha
12bee471eb CURA-4104 added settings for flow rate compensated extrusion 2017-11-20 14:06:03 +01:00
Ghostkeeper
a5a15df08d
Add setting to set the maximum mesh resolution
Implements issue CURA-4590.
2017-11-20 13:41:28 +01:00
Ghostkeeper
2974c4d7ab
Merge branch 'cura/Cura/master' of https://github.com/maukcc/Cura into maukcc-cura/Cura/master 2017-11-20 13:04:34 +01:00
Diego Prado Gesto
41d0df5b5b
Merge branch 'master' into print_simulation_view 2017-11-20 09:29:18 +01:00
Ghostkeeper
7a42c5bcce
Fix technical mistakes of Japanese translation
There's a lot of keys that weren't added to the Japanese translation. Our program crashes on these because it can't find where it needs to fill in the argument.
2017-11-17 16:49:56 +01:00
Ghostkeeper
568e18f664
Add Japanese translation of cura.po
It's quite bad though so let's see what improvements we can make.
2017-11-17 16:49:47 +01:00
Ghostkeeper
91621497f0
Fix technical mistakes of Japanese translation
There's a lot of keys that weren't added to the Japanese translation. Our program crashes on these because it can't find where it needs to fill in the argument.
2017-11-17 16:38:02 +01:00
Ghostkeeper
37163ec0b4
Add Japanese translation of cura.po
It's quite bad though so let's see what improvements we can make.
2017-11-17 16:30:57 +01:00
Diego Prado Gesto
0f6d65950a CURA-4526 Add colors to themes for selected handles 2017-11-17 13:18:44 +01:00
ChrisTerBeke
f48539cc93
Merge pull request #2685 from Ultimaker/container_stack_improvements
Container stack improvements
2017-11-17 13:09:54 +01:00
Ghostkeeper
f27494d60a
Move ironing into shell category
It is no longer considered experimental.
2017-11-17 10:59:14 +01:00
Ghostkeeper
15a50511b7
Don't crash if support density is 0
Found while working on CURA-4523.
2017-11-17 10:57:23 +01:00
Andreea Scorojitu
9bcc4da4a1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-15 13:40:56 +01:00
Andreea Scorojitu
7aeaf661ae Change_Color_UI_elements_CURA-4548 2017-11-15 13:40:46 +01:00
Ruben D
8dd91519a6
Move Support Chunk Size out of children of skip_some_zags
The rule is that leaf settings are the ones that are used by the engine. The support_skip_some_zags setting is used by the engine.
2017-11-15 00:54:08 +01:00
MaukCC
b081b686a8
Merge branch 'master' into cura/Cura/master 2017-11-14 11:59:35 +01:00
MaukCC
38882c6d13
Update cartesio.def.json 2017-11-14 10:53:51 +01:00
maukcc
ef2d9b0468 Cartesio profiles
updated prime tower
update PC profiles
2017-11-14 10:30:10 +01:00
Diego Prado Gesto
1008789364 Merge branch 'master' into print_simulation_view 2017-11-13 11:28:27 +01:00
Diego Prado Gesto
720b9ebdfa CURA-4556 Add profiles for AA0.25 and BAM material 2017-11-13 11:06:27 +01:00