GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 19:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,777 Commits 290 Branches 260 Tags
Commit Graph

21777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
26d1b4057d
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-24 14:38:13 +02:00
Jaime van Kessel
1fc2ea7cd2
Merge pull request #6398 from Ultimaker/CURA-6768_4.3_translations_lionbridge 
Update translations for Cura 4.3 from Lionbridge
 2019-09-24 14:37:31 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Ghostkeeper
0b4a3039e5
Remove multi-buildplate option 
It doesn't work any more.
 2019-09-24 14:24:57 +02:00
Jaime van Kessel
a741530db2
Also ensure that the container tree is used when selecting an intent 
CURA-6807
 2019-09-24 13:17:36 +02:00
Ellecross
4272a50515 Added CS tickets to the change log 4.3.0 2019-09-24 12:26:24 +02:00
Jaime van Kessel
f469b99471
Create intent nodes based on the selected quality type 
Previously it would use the material type from the material, but since
the material from the node can be different to that of the quality, we need
to use the one from quality instead (This is due to the fallback system)

CURA-6807
 2019-09-24 11:57:50 +02:00
Lipu Fei
bd314a765f Update setting_version 
CURA-6799
 2019-09-24 11:19:03 +02:00
Jaime van Kessel
984bee6f7e
Merge branch 'master-reweight-stages' of https://github.com/thopiekar/Cura 2019-09-24 11:14:42 +02:00
Lipu Fei
1977a865f1 Fix HMS434 version upgrade 
CURA-6774
 2019-09-24 11:05:52 +02:00
Lipu Fei
a6218179a9
Merge pull request #6329 from maukcc/master 
HMS434 change
 2019-09-24 11:04:50 +02:00
Ghostkeeper
9024567522
Remove multi-buildplate option 
It doesn't work any more.
 2019-09-24 11:04:00 +02:00
Jaime van Kessel
56c7fb9f7d
Merge branch 'CURA-6800_project_file_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-24 10:34:21 +02:00
Jaime van Kessel
2d1dec098b
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-24 09:27:23 +02:00
Jaime van Kessel
3ab0b5decf
Add extra exception handling for UFPwriter 2019-09-24 09:24:36 +02:00
Jaime van Kessel
4dc918c647
Fix unit test 2019-09-23 17:09:54 +02:00
maukcc
184116995c HMS434 outside wall 2019-09-23 16:35:41 +02:00
Nino van Hooff
2a488b48e9 Restore feedrate at end of Pause at Height script for Repetier. 
CURA-6799
 2019-09-23 16:31:24 +02:00
Diego Prado Gesto
52eabaae49 Merge branch 'CURA-6768_4.3_translations_lionbridge' of github.com:Ultimaker/Cura into CURA-6768_4.3_translations_lionbridge 2019-09-23 16:25:10 +02:00
Diego Prado Gesto
d82f5b55c2 Change some strings in German, based on an internal review 
Contributes to CURA-6768.
 2019-09-23 16:23:04 +02:00
Nino van Hooff
e51efe6cbc Restore feedrate at end of Pause at Height script 
CURA-6799
 2019-09-23 16:10:27 +02:00
Ghostkeeper
557746a832
Partial fix for intent manager not finding correct profile in test 
Only in test.
 2019-09-23 15:17:15 +02:00
Ghostkeeper
7d40d962e8
Mock ContainerTree instead of ContainerRegistry to test intent manager 
Because now it relies on the container tree instead of querying the registry anew every time.
 2019-09-23 15:03:24 +02:00
Ghostkeeper
43a568cd06
Make fixes found through manual checking of translations 
I'm not a native speaker of French or Portuguese but enough to make those corrections of not translating 'Trimesh'. I'm not an expert of the Korean language to fix that missing translation but I made do with someone who learnt it as a second language. I am an expert at Dutch so I made a couple of fixes there.

Contributes to issue CURA-6768.
 2019-09-23 14:55:03 +02:00
Nino van Hooff
3552484477 Add missing newline 
CURA-6805
 2019-09-23 14:49:04 +02:00
Ghostkeeper
8f97751e11
Don't make 'print core' translatable 
It is an Ultimaker name so it should never be translated.

Contributes to issue CURA-6768.
 2019-09-23 14:35:22 +02:00
Ghostkeeper
80bc1119fc
Add clarification for translators of this file format 2019-09-23 14:25:55 +02:00
Ghostkeeper
699e601de8
Improve context of override and new translation items 
Contributes to issue CURA-6768.
 2019-09-23 14:20:43 +02:00
Ghostkeeper
a4fd45db39
Apply fixes for errors found by PoEdit 
The Japanese sentence with 'update existing' was confusing to the translators. I've asked for a better translation from a native. I'll improve the context for the next release.
 2019-09-23 14:19:55 +02:00
Ghostkeeper
cc9ab2a8b6
Update translations for Cura 4.3 from Lionbridge 
These are the new translations we got from Lionbridge, imported from our import script.

Contributes to issue CURA-6768.
 2019-09-23 13:30:00 +02:00
Jaime van Kessel
3a2c5b2473
Fix test for stack builder 2019-09-23 13:26:21 +02:00
Jaime van Kessel
7e3f265068
Add a function to add a MachineNode to the tree. 
This solves the issue that machines created by the stack builder broke the material updating

CURA-6791
 2019-09-23 13:18:11 +02:00
Lipu Fei
8d77726089 Add intent logic for project loading 
CURA-6800
 2019-09-23 13:05:36 +02:00
Ghostkeeper
fae4138b79
Fix percentages using fullwidth font 
These would not be recognised by Python.

Contributes to issue CURA-6768.
 2019-09-23 12:06:41 +02:00
Ghostkeeper
020b874ec3
Update traditional Chinese translations for Cura 4.3 
These are the new translation files we got from Chang.

Contributes to issue CURA-6768.
 2019-09-23 12:04:59 +02:00
Jaime van Kessel
5b5256b9e4
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-23 11:52:03 +02:00
Jaime van Kessel
521c55f267
Delete the aluminum profiles 
We're not using them (and we're not going to either). Since they are now causing issues,
it's a perfect time to kill them
 2019-09-23 11:51:25 +02:00
THeijmans
f6cd807bb3 Adds Ultimaker S5 intent profiles 
Initial version, for merging with master.
 2019-09-23 11:50:34 +02:00
Lipu Fei
79f938a39c Add intent for project saving summary 
CURA-6800
 2019-09-23 11:44:11 +02:00
Lipu Fei
ddab8e204a Add typing 
CURA-6800
 2019-09-23 11:43:50 +02:00
Ghostkeeper
5ec833c15e
Remove extraenous space 
This space triggers PoEdit to give a warning that the translation doesn't have the space there. That's okay, since it's a column and the space doesn't influence spacing then.
 2019-09-23 11:43:24 +02:00
Ghostkeeper
dab9f71a0a
Merge branch '4.3' of https://github.com/Patola/Cura into Patola-4.3 2019-09-23 11:39:51 +02:00
Ghostkeeper
4bf8ea9332
Merge branch '4.3' 2019-09-23 11:25:31 +02:00
Ghostkeeper
cb045fb0c2
Update default SDK version 
Just in time.
 2019-09-23 11:24:20 +02:00
Jaime van Kessel
08ffafa475
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-23 11:19:19 +02:00
Jaime van Kessel
a4ed51342c
Fix favorite not being checked properly in MaterialMenu 
CURA-6804
 2019-09-23 11:18:47 +02:00
Lipu Fei
1aa6708677 Fix typing 2019-09-23 10:59:31 +02:00
Lipu Fei
18d93d0b7b Fix UM2 extended variants 
CURA-6775
 2019-09-23 10:43:58 +02:00
Ghostkeeper
61527e082e
Mock ContainerTree instead of ContainerRegistry 
The intent models are now using the ContainerTree to build themselves rather than the registry.
 2019-09-23 09:59:57 +02:00
Cláudio 'Patola' Sampaio
d181913eec Updated pt_BR strings for Cura 4.3 2019-09-23 03:28:40 -03:00