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

8758 Commits

Author SHA1 Message Date
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
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
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
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
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
Remco Burema
5c86984353 Translation: Fix linebreak in Korean. 2019-05-24 13:10:27 +02:00
Jaime van Kessel
9bc89534bf Add mouse area to prevent clickthroughs 
CURA-6283
 2019-05-24 12:53:34 +02:00
Remco Burema
575555186e raw bothoff translations -- not checked yet 2019-05-24 10:30:19 +02:00
Lipu Fei
3ca272ff72 Merge remote-tracking branch 'origin/4.1' 2019-05-22 07:44:26 +02:00
Remco Burema
083564a184
Merge pull request #5763 from Ultimaker/CL-1329_fix_monitor_progress_bar_bug 
CL-1329 fix monitor progress bar bug
 2019-05-21 17:27:53 +02:00
Lipu Fei
9187738d9c
Merge pull request #4599 from DesktopMetal/feature_nozzle_switch_extra_prime_distance 
Feature: "Nozzle Switch Extra Prime Distance"
 2019-05-21 09:18:11 +02:00
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode 
CURA-6182

Move complex logic to Python.
 2019-05-21 08:10:49 +02:00
Ghostkeeper
b52b6251b9
Clarify description of build volume temperature a bit 
Contributes to #5756.
 2019-05-20 15:35:53 +02:00
Ghostkeeper
cdda24b33a
Merge branch '4.1' 2019-05-20 14:30:47 +02:00
Ghostkeeper
9a9f584285
Reduce jerk for Creality printers 
As tested by our community.

Fixes #5694.
 2019-05-20 14:30:29 +02:00
Ghostkeeper
b64f2f1d8f
Remove override for outer wall line width 
This way the outer wall line width adjusts automatically to the user's value for the wall line width, if he chooses to change that.
 2019-05-20 13:56:57 +02:00
Ghostkeeper
19cc267726
Merge branch '4.1' 2019-05-20 13:42:38 +02:00
Ghostkeeper
70609d2764
Merge branch 'DragonJe-4.1' into 4.1 2019-05-20 13:42:21 +02:00
Jaime van Kessel
fbc4c5fb1e
Merge pull request #5719 from Ultimaker/CURA-6497_fix_empty_material_name 
CURA-6497 Add validation for empty strings in SettingDefinition
 2019-05-20 13:40:39 +02:00
Vlad Gribinchuk
055dcddd1e Change switch_extruder_extra_prime_amount setting to be more consistent with other 2019-05-20 14:35:27 +03:00
Ian Paschal
c9588d173f Add monitor column to theme 
Contributes to CL-1329
 2019-05-20 12:18:38 +02:00
DragonJe
864646d4a5
Update nwa3d_a5_normal.inst.cfg 2019-05-17 11:27:51 -05:00
DragonJe
3fc9567215
Update nwa3d_a5_fast.inst.cfg 2019-05-17 11:27:24 -05:00
DragonJe
be05d07acd
Update nwa3d_a5_best.inst.cfg 2019-05-17 11:26:54 -05:00
Lipu Fei
0c15f69c44 Merge remote-tracking branch 'origin/4.1' 2019-05-17 15:01:40 +02:00
Lipu Fei
0555cbae4e Fix add machine dialog state 2019-05-17 15:01:18 +02:00
Lipu Fei
33aae24d6d Merge remote-tracking branch 'origin/4.1' 2019-05-17 14:41:52 +02:00
Lipu Fei
361636af29 Allow WizardDialog to resize 2019-05-17 14:30:18 +02:00
Lipu Fei
584a101902 Fix limit to extruder for support infill angle 
CURA-6529
 2019-05-17 14:19:39 +02:00
Diego Prado Gesto
a28ca19647 Change the font size 
To make it consistent with the size of texts in the other Welcome pages.
 2019-05-17 11:54:40 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list 
Add an object list/selector
 2019-05-17 07:48:22 +02:00
Jaime van Kessel
f5e31060a6 Fixed unknown reference in qml 2019-05-16 16:44:29 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Lipu Fei
961f6403ad Change preference key to cura/show_list_of_objects 2019-05-16 15:49:08 +02:00
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Lipu Fei
28172c9ad2 Merge remote-tracking branch 'origin/master' into feature_model_list 2019-05-16 15:17:46 +02:00
Jaime van Kessel
3fe5c9fc6a Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-16 15:08:47 +02:00
Jaime van Kessel
a0c705e900 Remove usage of some deprecated functions 2019-05-16 14:49:53 +02:00
Lipu Fei
6a2980ab4f
Merge pull request #5655 from Ultimaker/shader_optimization 
Shader optimization
 2019-05-16 14:30:52 +02:00
Jaime van Kessel
2eb8203c70 Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-16 14:29:24 +02:00
Jaime van Kessel
99e6ec9509 Fix the last material qml warnings 2019-05-16 14:29:05 +02:00
Ghostkeeper
0352553193
Read resolved value for adhesion type 
We still write to the value property.
We need the resolved value because we want to read from the extruder stacks which may overwrite the adhesion type in a profile.

Contributes to issue CURA-6182.
 2019-05-16 14:28:10 +02:00
Ghostkeeper
f3ea522811
Use === to compare strings in JavaScript 2019-05-16 14:28:09 +02:00