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
Jaime van Kessel
bfe1275d46
Fix a number of QML warnings
2019-05-16 14:23:09 +02:00
Lipu Fei
dab0a43214
Merge remote-tracking branch 'origin/master' into shader_optimization
2019-05-16 14:22:05 +02:00
Remco Burema
d4f891d548
Brim for prime tower fix for resolve. [CURA-6492]
2019-05-16 12:39:12 +02:00
Diego Prado Gesto
2cbdc49539
Merge branch '4.1'
2019-05-16 12:13:04 +02:00
Remco Burema
19ce6aa65f
Prime tower brim (unless raft) by default. [CURA-6492]
2019-05-15 13:27:33 +02:00
Ghostkeeper
7094b222b1
Remove duplicate translation entry
...
Probably due to a merge conflict being resolved in a less than perfect way. Sorry.
Contributes to issue CURA-6521.
2019-05-15 10:58:48 +02:00
Lipu Fei
1bed5c9c11
Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name
2019-05-15 08:40:45 +02:00
Ghostkeeper
f4dac40f8b
Merge branch '4.1'
...
Conflicts:
resources/i18n/es_ES/cura.po -> Correction to Spanish translations while we generated new templates on 4.1.
2019-05-14 14:50:36 +02:00
Ghostkeeper
ef707e4bad
Update file headers of translation templates
...
We're in Cura 4.1 now. Also, the reporting e-mail was somehow missing from all the cura.po files.
Contributes to issue CURA-6521.
2019-05-14 14:35:58 +02:00
Ghostkeeper
f845d13514
Update translation templates per language from pot file
...
This is generated with the i18n-update-po CMake target.
Contributes to issue CURA-6521.
2019-05-14 14:31:14 +02:00
Ghostkeeper
51cc2ff701
Remove duplicate entries
...
MSGMerge crashes on these. They are probably caused by the build system being a little bit naive about where it gets its strings from.
2019-05-14 14:30:10 +02:00
Ghostkeeper
1941d5219f
Update translation templates for 4.1
...
These are the new strings for Cura 4.1.
Contributes to issue CURA-6521.
2019-05-14 14:25:01 +02:00
Lipu Fei
d1805d34be
Move background to ScrollView for GcodeTextArea
2019-05-14 11:44:14 +02:00
Lipu Fei
7f8896705f
Merge remote-tracking branch 'origin/4.1'
2019-05-14 10:41:12 +02:00
Lipu Fei
5280ec4af5
Fix Mark2 appearing at the bottom of machine list
2019-05-14 10:38:27 +02:00
