19820 Commits

Author SHA1 Message Date
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode
CURA-6182

Move complex logic to Python.
2019-05-21 08:10:49 +02:00
Ian Paschal
5a8b70ad0c Simplify can_override conditional
Contributes to CL-1259
2019-05-20 15:48:57 +02:00
Ian Paschal
0dc49a66f1
Merge pull request #5762 from Ultimaker/CL-1259_hide_useless_override_button
CL-1259 hide useless override button
2019-05-20 15:47:26 +02:00
Ian Paschal
0c9f3a1842 Update MonitorConfigOverrideDialog.qml
Contributes to CL-1259
2019-05-20 15:47:19 +02:00
Ian Paschal
7be3863d51 Put override logic in Python instead of QML
Contributes to CL-1259
2019-05-20 15:46:07 +02:00
Ghostkeeper
b52b6251b9
Clarify description of build volume temperature a bit
Contributes to #5756.
2019-05-20 15:35:53 +02:00
Ian Paschal
2a80a8d0db Simplify can_override conditional
Contributes to CL-1259
2019-05-20 15:12:08 +02:00
Jaime van Kessel
919420c47a Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-20 14:41:19 +02:00
Jaime van Kessel
f7d0bcd0d4 Prevent modifier meshes from blocking one at a time slicing
CURA-6030
2019-05-20 14:40:41 +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
Ghostkeeper
127a5e4faa
Merge branch '4.1' of https://github.com/DragonJe/Cura into DragonJe-4.1 2019-05-20 13:39:09 +02:00
Jaime van Kessel
5ae103964a Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1 2019-05-20 13:38:37 +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
Ghostkeeper
2ada8cec72
Cast autosave delay preference to int
Oops. How long has this been in there, you think? At least 3 years.
As seen in #5729, when changing this preference it results in an error that it can't set the interval to a string. The default is an integer, so if you don't edit it it works fine, but if you edited the preferences file, it gets a string from the preferences file. Casting both to an int should work.
2019-05-20 13:33:33 +02:00
Ian Paschal
3b7b554f1a Update MonitorPrintJobProgressBar.qml
Contributes to CL-1329
2019-05-20 12:18:55 +02:00
Ian Paschal
c9588d173f Add monitor column to theme
Contributes to CL-1329
2019-05-20 12:18:38 +02:00
Jaime van Kessel
26db08048b Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 11:03:38 +02:00
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