12479 Commits

Author SHA1 Message Date
Aleksei S
37733f51ad Correct name
CURA-4851
2018-02-01 09:44:00 +01:00
Aleksei S
08c64d28cf Typo in XmlValidator
CURA-4851
2018-02-01 09:37:06 +01:00
Diego Prado Gesto
701ac7f91e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-01 09:05:32 +01:00
alekseisasin
a446ca2759 Material container validation
CURA-4851
2018-01-31 15:00:46 +01:00
alekseisasin
e5c72cfdc5 Validate material profile
CURA-4851
2018-01-31 14:58:44 +01:00
Diego Prado Gesto
81488e0bbc Merge branch '3.2' 2018-01-31 09:13:29 +01:00
Lipu Fei
cfd60e5557 Fix Olsson Block binding in UM2 machine settings
CURA-4897
2018-01-30 17:33:34 +01:00
Diego Prado Gesto
4cf07f5fe6 CURA-4868 Fix typo 2018-01-30 17:23:55 +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
Lipu Fei
759e596eb6 Fix add extruder function
CURA-4868
2018-01-30 12:19:16 +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
Diego Prado Gesto
41cf708db1 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-30 11:24:39 +01:00
Diego Prado Gesto
bdfb8f1b5b CURA-4885 Remove the part in which the version upgrader creates a
quality changes instance. This instance container is created in the
workspace reader. This avoids the profile to appear twice.
2018-01-30 11:23:00 +01:00
Lipu Fei
a4a1832a58 Fix legacy profile importing for CFP
CURA-4876
2018-01-30 09:49:31 +01:00
Lipu Fei
f1363fab73 Move newline format
CURA-4863
2018-01-29 16:33:52 +01:00
Aleksei S
0954211be8 Fix: Wrong print time
CURA-4874
2018-01-29 16:01:11 +01:00
Lipu Fei
d351eba758 Use \n instead of \r for message formatting
CURA-4863
2018-01-29 14:55:56 +01:00
Lipu Fei
924f3972fd Create quality_changes for extruder stack if missing in profile importing
CURA-4868
2018-01-29 14:50:08 +01:00
Lipu Fei
34e6816f83 Fix container ID modification in profile importing
CURA-4868
2018-01-29 14:50:07 +01:00
Lipu Fei
507b967946 Minor fixes
CURA-4868
2018-01-29 14:50:07 +01:00
Jaime van Kessel
0e5395dfd5 Fix crash when removing manually added device.
I forgot to rename a variable :(
CURA-4861
2018-01-29 14:29:13 +01:00
Aleksei S
b5856d6577 Merge branch '3.2' of github.com:Ultimaker/cura into 3.2 2018-01-29 13:48:23 +01:00
Aleksei S
750a86d2fd Added new lines to distinguis error message
CURA-4876
2018-01-29 13:47:24 +01:00
Lipu Fei
b9fc3997e5 Fix jellybox -> imade3d_jellybox renaming
CURA-4863
2018-01-29 13:00:48 +01:00
Lipu Fei
7dfc1a4aa7 Add encoding='utf-8' for text file reading
CURA-4875

When encoding is not provided, the behaviour is system dependent and it
can break on OS X.
2018-01-29 12:29:20 +01:00
Lipu Fei
63ac8412e6 Fix importing legacy INI quality profiles
CURA-4876
2018-01-29 11:18:16 +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
Ghostkeeper
09c7b7351a
Merge branch '3.0'
Found some commits in here that weren't merged.
2018-01-29 09:12:59 +01:00
Lipu Fei
4a9fc4b7d4 Set imported containers to bedirty so they will get saved
CURA-4875
2018-01-26 14:17:18 +01:00
Diego Prado Gesto
a0ebb5205b Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-26 14:14:59 +01:00
ChrisTerBeke
6cd64e1ce8
Two more fixes for typo in USBPrinterOutputController 2018-01-25 22:47:48 +01:00
ChrisTerBeke
8c7f8fa1fa
Fix typo in USBOutputController 2018-01-25 22:34:28 +01:00
Jaime van Kessel
bcfac3ace6 Added very rough implementation for UCP files 2018-01-25 17:14:32 +01:00
Diego Prado Gesto
38f1ad5db9 Merge branch '3.2' 2018-01-25 17:10:17 +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
Ghostkeeper
1818055966
Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-24 16:17:24 +01:00
Diego Prado Gesto
d72e08a3ba Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-24 16:05:28 +01:00
Diego Prado Gesto
e38cf957bb CURA-4839 Avoid creating unique names for the extruder instance
containers if the strategy is upgrade existing
2018-01-24 16:04:11 +01:00
ChrisTerBeke
9af3a5faa6 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-24 14:02:54 +01:00
ChrisTerBeke
d1f2d6f45d Fix checking material_used per extruder for analytics - CURA-4858 2018-01-24 14:02:44 +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