ChrisTerBeke
0028ec6746
Ensure all property values are of type bytes
2019-04-18 14:22:05 +02:00
ChrisTerBeke
5bb56e06a4
Merge branch 'master' into cloud-cluster-discovery-mvp
2019-04-18 13:55:56 +02:00
Lipu Fei
e3c1505612
Merge branch 'master' into CURA-6435_new_style_add_machine
2019-04-18 06:33:11 +00:00
Lipu Fei
98c4b7508f
Fix typing
2019-04-18 06:32:52 +00:00
Lipu Fei
427cfdc4b2
Merge remote-tracking branch 'origin/master' into CURA-6435_new_style_add_machine
2019-04-18 07:53:13 +02:00
ChrisTerBeke
3cbd8a94a9
Add minimal support for discovering cloud printers outside of LAN
2019-04-18 00:19:12 +02:00
Ghostkeeper
cd89f7345a
Merge branch 'WIP_gitlab_ci'
2019-04-17 16:30:32 +02:00
Jaime van Kessel
ef92aad6bb
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6435_new_style_add_machine
2019-04-17 11:06:30 +02:00
Jaime van Kessel
f2044998ae
Merge pull request #5604 from Ultimaker/CURA-6447_fix_start_onboarding
...
CURA-6447 Fix start onboarding
2019-04-17 10:59:23 +02:00
Lipu Fei
904a8ab26c
Fix theming
...
CURA-6435
2019-04-17 09:18:08 +02:00
Jaime van Kessel
acf7229d1d
Merge pull request #5620 from Ultimaker/add_maximum_deviation_setting
...
Add maximum deviation setting
2019-04-16 14:50:56 +02:00
Diego Prado Gesto
eb3e343be5
Rename variable
...
Even if we could reuse the other, it make sense to call it 'deviation'
Contributes to CURA-6458.
2019-04-16 12:04:34 +02:00
Ghostkeeper
6325a5f1c2
Change setting value defaults for maximum resolution to use deviation
...
All profiles that use maximum resolution should use maximum deviation instead, and halve it.
Contributes to issue CURA-6458.
2019-04-16 11:36:07 +02:00
Jaime van Kessel
e8d2e070d8
Dont calculate bounding box for non printing meshes
...
Fixes #5603
2019-04-15 17:46:54 +02:00
Jaime van Kessel
42b1a0e028
Refactor some small bits of the setting override decorator
...
There was code duplication and a number of functions that should be private
contributes to #5603
2019-04-15 17:36:55 +02:00
Ghostkeeper
fdc629de32
Make error message log which layer could not be found
2019-04-15 13:17:31 +02:00
Lipu Fei
77ffc16c33
Move type checking imports into type checking closure
2019-04-15 08:26:54 +02:00
Lipu Fei
e35c0cc363
Fix incorrect import in UFPReader
2019-04-15 08:14:54 +02:00
Diego Prado Gesto
d0aee9da3f
Merge branch 'master' into CURA-6447_fix_start_onboarding
2019-04-12 16:39:51 +02:00
Diego Prado Gesto
969b5f7081
Merge branch 'master' into CURA-6435_new_style_add_machine
2019-04-12 16:15:36 +02:00
Lipu Fei
f303485595
Remove changelog preferences entry in version upgrade
...
CURA-6436
CURA-6447
2019-04-12 12:13:55 +02:00
Lipu Fei
3794c8f75e
Remove ChangeLog plugin
...
CURA-6436
CURA-6447
2019-04-12 12:13:41 +02:00
Simon Edwards
474aff2d4a
Merge pull request #5606 from Ultimaker/CL-1325_pass_output_device_to_cloud_check
...
CL-1325 Pass output device (or not) to cloud check method
2019-04-12 10:57:34 +02:00
Lipu Fei
4065a1204a
Fix string comparisons
2019-04-12 08:52:35 +02:00
Remco Burema
852e7bc8f6
Fit missing font in material-vendor text.
2019-04-11 14:46:27 +02:00
Ian Paschal
17a5816b88
Fix typing
...
Contributes to CL-1325
2019-04-11 10:12:27 +02:00
Ian Paschal
61c38c5ec0
Pass output device (or not) to cloud check method
...
Contributes to CL-1325
2019-04-10 15:43:44 +02:00
Lipu Fei
9a33a301ab
Merge remote-tracking branch 'origin/master' into CURA-6447_fix_start_onboarding
2019-04-10 09:08:05 +02:00
Jaime van Kessel
9cc4665db8
Fix crash for when resetDownload is called after a long wait
...
CURA-6448
2019-04-09 17:10:18 +02:00
Jaime van Kessel
c2b901ae47
Merge branch 'CURA-6057_fix_onboarding' of github.com:Ultimaker/Cura
2019-04-09 16:34:36 +02:00
Lipu Fei
f94344263b
Fix merge conflicts
2019-04-09 11:33:07 +02:00
Lipu Fei
738886b4fb
Merge remote-tracking branch 'origin/CURA-6057_fix_onboarding' into CURA-6447_fix_start_onboarding
2019-04-09 11:31:42 +02:00
Jaime van Kessel
49a9561625
Added exception handling for serial write
2019-04-08 17:43:03 +02:00
Jaime van Kessel
2765122b95
Fix case where aborting a download would cause a crash
2019-04-08 17:32:43 +02:00
Lipu Fei
75e92aaa78
Adjust printer setup page for Mac
...
CURA-6057
2019-04-08 14:49:55 +02:00
Lipu Fei
3bf8a1f257
New style more info dialog for SliceInfo
...
CURA-6057
2019-04-08 14:34:35 +02:00
Ian Paschal
1ef98d029d
Merge branch 'master' of https://github.com/Ultimaker/Cura
2019-04-08 13:45:21 +02:00
Ian Paschal
2a7df3cedd
Fix untranslated string
...
Contributes to CL-1302
2019-04-08 13:45:09 +02:00
Jaime van Kessel
cbfe10a748
Prevent a zeroDivision error from crashing the usb printing
...
This fixes #5592
2019-04-08 13:36:48 +02:00
Lipu Fei
086ae1c735
Make sure the unsuccessful manual device gets removed
...
CURA-6057
2019-04-08 12:27:32 +02:00
Lipu Fei
7d096e5734
Merge remote-tracking branch 'origin/master' into CURA-6435_new_style_add_machine
2019-04-08 09:09:07 +02:00
Jaime van Kessel
fe14024620
Move existNetworkInstances into discover action
2019-04-05 17:49:29 +02:00
Jaime van Kessel
5b818d203a
Move a bunch of network only functions out of machine manager
...
Machine manager is way to big as is, so we need to move more code out of it to
locations where the code is actually used.
2019-04-05 17:45:19 +02:00
Jaime van Kessel
ed503cb6ec
Removed platform check that always had the same result
...
The UM.Application.platform property has been removed by someone for quite some time.
I don't know why the check was in there, but it doesn't seem needed at all as the property was always undefined
2019-04-05 17:07:12 +02:00
Lipu Fei
6892307be3
Fix typo
2019-04-05 10:49:36 +02:00
Lipu Fei
f2234cffa4
Fix extruder enable/disable problem in color scheme
2019-04-05 10:43:09 +02:00
Lipu Fei
5074cf69dd
Fix typing
...
CURA-6435
2019-04-05 09:57:58 +02:00
Lipu Fei
d5f4fd43dd
Fix typing
...
CURA-6435
2019-04-05 09:42:24 +02:00
Lipu Fei
945fa35946
Fix incorrect reference in UM2UpgradeSelectionMachineAction
...
CURA-6435
2019-04-05 09:09:00 +02:00
Ghostkeeper
bd1712cb10
Spelling fix: Overriden -> Overridden
...
I think some of us got the spelling of this word wrong in their heads.
2019-04-04 14:39:01 +02:00
