19798 Commits

Author SHA1 Message Date
Jaime van Kessel
7d8c97dd7b ChangeAtZ no longer sets flow to -1 if no previous flow was found
It makes a lot more sense to just asume the value is 100 than -1

Fixes #5284
2019-05-20 11:02:40 +02:00
Ian Paschal
6dc43f9ed1 Hide override button if it can't be overridden
Contributes to CL-1259
2019-05-20 10:59:51 +02:00
Ian Paschal
3cf2e19692 Put override logic in Python instead of QML
Contributes to CL-1259
2019-05-20 10:59:34 +02:00
Jaime van Kessel
df75183eda Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 10:47:19 +02:00
Jaime van Kessel
5c33277d9a Correctly reset the script list on machine change
Fixes #5747
2019-05-20 10:46:47 +02:00
Jaime van Kessel
414e8d2b08 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 09:20:42 +02:00
Jaime van Kessel
cb68a1f100 Remove fixed height of installed plugin name label
Fixes #5755
2019-05-20 09:19:39 +02:00
Jaime van Kessel
c1818bcfbe Add test for CuraStackBuilder 2019-05-20 08:57:58 +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
Jaime van Kessel
0c11304a7b Expand the oath tests with some extra failure cases 2019-05-17 16:09:23 +02:00
Jaime van Kessel
2937575be5 Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-17 15:29:51 +02:00
Jaime van Kessel
23bd611470 Added some tests for unhappy path of OAuth 2019-05-17 15:29:28 +02: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
Jaime van Kessel
b6643a9fbe Added tests for account API 2019-05-17 14:39:27 +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
4e65232364 Change the font size of settings in extruder tab
To make it consistent with the sizes in the Printer tab.
2019-05-17 11:58:30 +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
Ian Paschal
4078a23449 Fix typo 2019-05-17 10:44:53 +02:00
Remco Burema
4813ff0bb7 Ask users to write English in crash-report. 2019-05-17 10:37:25 +02:00
Jaime van Kessel
8b73f7cef9 No longer create convex hulls for modifier meshes
CURA-6030
2019-05-17 09:47:47 +02:00
Ghostkeeper
abcac67cee
Improve wording of No. Layers setting
Fixes #5741.
2019-05-17 09:39:51 +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
1c9eab6b2b Prevent crashes when backup fails to be restored
Also add a bit of logging so that we know what / how it went wrong
2019-05-16 15:48:09 +02:00
Jaime van Kessel
915e0e2047 Only add extrudernr to used extruders if it actually exists
This can cause issues when a profile got messed up (especially when using profiles between different custom machines)
2019-05-16 15:41:52 +02:00
Jaime van Kessel
186eef0b68 Fix backup causing a crash in specific situations 2019-05-16 15:38:44 +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
ChrisTerBeke
60488e9ff6
Merge pull request #5738 from Ultimaker/fixes-for-cloud-discovery
Amazing fixes for cloud discovery
2019-05-16 14:37:59 +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
Ghostkeeper
1f6a8f2f75
Increment default API version number 2019-05-16 14:27:53 +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
Diego Prado Gesto
cdcb1c15f6 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-16 12:04:50 +02:00
Diego Prado Gesto
c4044e731a Fix typo in a log warning message 2019-05-16 12:04:26 +02:00