3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
22028 commits 306 branches 270 tags 779 MiB
Commit graph

22028 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cherubim
cdafdc8d5c
Break up translation in two pieces 
As a rule of thumb, translated text should not contain any layout. This particular text has gone wrong in the translations because the translators didn't translate the second part (or their application messed it up). I'm breaking it up into two pieces as to force them to translate both.

Contributes to issue CURA-6547.
 2019-05-28 11:23:42 +02:00
Jaime van Kessel
c763052615 Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-28 11:22:52 +02:00
Jaime van Kessel
31f53dfc3c Add tests for SettingOverrideDecorator 
CURA-6539
 2019-05-28 11:22:13 +02:00
Cherubim
b19c6dad64
Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-28 11:07:48 +02:00
Cherubim
0ebb2a35fe
Merge branch '4.1' 
Conflicts:
	resources/i18n/es_ES/cura.po -> Correction being made on master while translations were being done for 4.1.
 2019-05-28 11:07:20 +02:00
Remco Burema
020bedcfee Settings-GUI: Max decimal places to 4 (from 3). 2019-05-28 11:07:18 +02:00
Cherubim
376c5445e4
Re-enable Polish 
It was disabled yesterday because it was incomplete then, but we got the translations yesterday evening.

Contributes to issue CURA-6547.
 2019-05-28 10:48:58 +02:00
Lipu Fei
0bc8a67a37 Merge master 2019-05-28 10:43:51 +02:00
Lipu Fei
f9af9754c8 Make reset button and revert stack levels configurable 
CURA-6490
 2019-05-28 10:33:26 +02:00
Lipu Fei
a14eb50fec Handle the case that resolve is undefined 
CURA-6490
 2019-05-28 10:33:26 +02:00
Cherubim
9793fc16a3
Corrections to translations 
These translations had quite a few inconsistencies.

Contributes to issue CURA-6547.
 2019-05-28 10:28:51 +02:00
Cherubim
99bf04e48a
Correct header again 
The language team contains everyone that worked on these translations.

Contributes to issue CURA-6547.
 2019-05-28 10:28:51 +02:00
Jaime van Kessel
bea64a4e86 Some minor fixes to change log 
This makes them more alike the previous ones
 2019-05-28 09:42:07 +02:00
Cherubim
8285ab3b08
Update translations for Polish 
These are the translation files that were sent to me by Mariusz.

Contributes to issue CURA-6547.
 2019-05-28 09:22:58 +02:00
Remco Burema
9114780ee6 Updated changelog for 4.1 (contributed by Matt) [CURA-6543] 2019-05-28 08:48:46 +02:00
Lipu Fei
8426942395 Fix tests 2019-05-28 08:09:07 +02:00
Lipu Fei
2784edb15e Fix tests 2019-05-28 07:57:29 +02:00
Lipu Fei
6db96abe2f Fix tests 2019-05-28 07:48:00 +02:00
maukcc
62d0c44e14 HMS434 update 2019-05-27 13:53:19 +02:00
Diego Prado Gesto
b234485592 Merge branch '4.1' 2019-05-27 11:31:08 +02:00
Diego Prado Gesto
fa197f53a7 Hide Polish from the list of available languages in 4.1 
The tranlations are incomplete so not available in 4.1

Contributes to CURA-6521.
 2019-05-27 11:16:54 +02:00
Diego Prado Gesto
10823c4daf Add Traditional Chinese translations to 4.1 
Contributes to CURA-6521
 2019-05-27 11:13:41 +02:00
Diego Prado Gesto
f36fcfcae6 Merge branch 'brazilian_translations_4.1' into 4.1 2019-05-27 10:26:31 +02:00
Diego Prado Gesto
518ceb9b69 Use Ultimaker Cloud instead of the literal translation in Brazilian 
Contributes to CURA-6521.
 2019-05-27 09:47:18 +02:00
Cláudio 'Patola' Sampaio
0faf4fad43 Updated pt_BR strings 2019-05-26 21:44:04 -03:00
Jaime van Kessel
3748b256ce Add a few more simple tests for extruder stack 2019-05-24 17:28:42 +02:00
Jaime van Kessel
43cbe0ad7d Add tests for favorites in material manager 2019-05-24 17:11:41 +02:00
Jaime van Kessel
879dc90246 Add test for creating extruder stack 2019-05-24 16:42:20 +02:00
Jaime van Kessel
76163636a1 Fix the simple create machine test 2019-05-24 16:36:39 +02:00
Jaime van Kessel
66d8e41064 Also add tests for the update of the objects mode 
CURA-6283
 2019-05-24 15:27:08 +02:00
Jaime van Kessel
6cc8b8c184 Add tests for _renameNodes function 
CURA-6283
 2019-05-24 14:59:35 +02:00
Jaime van Kessel
d1f6ac47f3 Add tests for ObjectsModel 2019-05-24 14:41:00 +02:00
Remco Burema
1cd02766f6
Merge pull request #5777 from Ultimaker/WIP_i18n_4.1 
[CURA-6521] bothoff translations
 2019-05-24 13:39:42 +02:00
Jaime van Kessel
834e6344df Cut up large update function to make testing easier 
CURA-6283
 2019-05-24 13:26:11 +02:00
Remco Burema
5c86984353 Translation: Fix linebreak in Korean. 2019-05-24 13:10:27 +02:00
Jaime van Kessel
0bede7e3c5 Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-24 12:53:56 +02:00
Jaime van Kessel
9bc89534bf Add mouse area to prevent clickthroughs 
CURA-6283
 2019-05-24 12:53:34 +02:00
Lipu Fei
8a18e0c65c Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-24 10:51:19 +02:00
Lipu Fei
7c6c00df84 Merge remote-tracking branch 'origin/4.1' 2019-05-24 10:50:43 +02:00
Lipu Fei
27d6b9b53b Calculate bounding box for helper meshes 2019-05-24 10:49:35 +02:00
Remco Burema
575555186e raw bothoff translations -- not checked yet 2019-05-24 10:30:19 +02:00
Jaime van Kessel
bd39a9c591 Simplify & cleanup objects mode 
CURA-6283
 2019-05-24 09:30:50 +02:00
Jaime van Kessel
502eea4d26 Simplify the objects model further 
CUA-6283
 2019-05-23 16:09:22 +02:00
Jaime van Kessel
71d156b175 Remove unneeded check 
CURA-6283
 2019-05-23 16:04:39 +02:00
Jaime van Kessel
4a6495a0e6 Remove unneeded itemsChanged emit 
CURA-6283
 2019-05-23 16:01:53 +02:00
Jaime van Kessel
48dd9d247c Renamed some local variables so they describe better what they do 
CURA-6283
 2019-05-23 16:01:19 +02:00
Jaime van Kessel
c784a39ec6 Fixed typing 
CURA-6283
 2019-05-23 15:59:14 +02:00
Ghostkeeper
3845da24a1
Add new material properties for cleanly breaking off materials 
When performing a long retract, the firmware can use these material properties to determine how fast and how far it needs to retract.
The retraction goes in two stages: Anti-ooze retraction stops oozing, and then the break retraction breaks off the filament from the bead in the nozzle.

Contributes to issue CURA-6329.
 2019-05-23 15:53:00 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting" 
This reverts commit bec7b6546d, reversing
changes made to 7094b222b1.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
 2019-05-23 13:40:11 +02:00
Lipu Fei
288770b991 Fix merge conflicts 2019-05-23 11:37:51 +02:00