GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-05 20:46:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,186 Commits 295 Branches 268 Tags
Commit Graph

12186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
68366ccc8d CURA-4897 Minor changes 2018-01-31 11:01:42 +01:00
Andreea Scorojitu
ac266581c6
Update_changelog_CURA-4886 
Update to 3.2, CURA-4886
 2018-01-31 10:32:08 +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
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
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
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
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
a40d13b50e
Update translation templates for Cura 3.2 
Contributes to issue CURA-4883.
 2018-01-29 09:50:12 +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
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
Ghostkeeper
5b90bb3c5a
Update Portuguese translations by Utópica3D 
These people did a pass on the Portuguese translations and made a lot of improvements.

Contributes to issue CURA-4692.
 2018-01-24 13:52:31 +01:00
ChrisTerBeke
9488c39f68 Update plugin browser version as we have breaking changes in Cura 3.2 2018-01-24 11:07:13 +01:00
Lipu Fei
a6f5f8ea68 Revert "Revert "Rename Enable Travel Optimization to Infill Travel Optimization"" 
This reverts commit 3ec4cc6a0ba466df7d454084b51a0becbc3d7d32.
 2018-01-23 20:37:24 +01:00
Jack Ha
def86defe6 CURA-4848 Global stack now does its infinite resolve prevention on per thread basis 2018-01-23 16:17:38 +01:00
Jack Ha
cde3799702 CURA-4848 removing the debugging list because it's not a threading issue 2018-01-23 14:46:44 +01:00
Jack Ha
e3bffb0b1d Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-23 14:24:07 +01:00
Jack Ha
07e6875199 CURA-4848 added logging for when the crash occurs 2018-01-23 14:24:00 +01:00
Lipu Fei
710e3c1629 Revert "Simplify check for _outside_buildarea" 
This reverts commit 5c8d46b5c2ff27ff32bfc8e27451d3f8764accf8.
 2018-01-23 12:39:15 +01:00
Lipu Fei
f45de9654b Revert "Remove unused import" 
This reverts commit cf556ccf8ff7116af0014ffc91c019b26cf4f364.
 2018-01-23 12:39:07 +01:00
Lipu Fei
d3e85e6370 Revert "Do boundary checks on nodes for which the boundary check is unknown" 
This reverts commit 27e441ecd9642530b5b8f8fe949cff152d54dcba.
 2018-01-23 12:38:59 +01:00
Lipu Fei
3ec4cc6a0b Revert "Rename Enable Travel Optimization to Infill Travel Optimization" 
This reverts commit a31d65786b0c8a0a62c1a3637db914d88bbcc6b4.
 2018-01-23 12:38:51 +01:00
Diego Prado Gesto
7a84712fc9 CURA-4854 Revert some changes in 619a8cc that make that issue not working 2018-01-23 12:13:26 +01:00
Jack Ha
1efc92ddbe CURA-4853 evaluate layer view compatibility mode in init, therefore not binding some signals and fixing the bug 2018-01-23 11:46:59 +01:00
Ghostkeeper
a31d65786b
Rename Enable Travel Optimization to Infill Travel Optimization 
Because it's now no longer in the Infill category this is unclear.
 2018-01-23 11:24:43 +01:00
Ghostkeeper
27e441ecd9
Do boundary checks on nodes for which the boundary check is unknown 
Just before deciding whether to drop down the node on the build plate.

Contributes to issue CURA-4797.
 2018-01-23 11:22:24 +01:00
Ghostkeeper
cf556ccf8f
Remove unused import 
Contributes to issue CURA-4797.
 2018-01-23 11:22:24 +01:00
Ghostkeeper
5c8d46b5c2
Simplify check for _outside_buildarea 
There is a getter function that has a default if the attribute doesn't exist.

Contributes to issue CURA-4797.
 2018-01-23 11:22:24 +01:00
Lipu Fei
1c605a5108 Fix different strategies for machine and quality in project loading 
CURA-4839
 2018-01-23 10:58:43 +01:00
Lipu Fei
c0bce6ffd4 Move Jenkins timeout into parallel_nodes block 2018-01-23 10:26:39 +01:00
ChrisTerBeke
53d097b138 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-23 09:49:33 +01:00
ChrisTerBeke
6c9d7b5a2e Fixes for resetting print time information when removing all or last model, reduce signals being used for print time resetting - CURA-4852 2018-01-23 09:49:26 +01:00
Jack Ha
92e99012d3 CURA-4785 now actually checking for extruder position, improved logs 2018-01-23 09:33:52 +01:00