6095 Commits

Author SHA1 Message Date
Jaime van Kessel
af6d30c067 Fix some typos 2019-04-30 11:39:45 +02:00
Jaime van Kessel
0a136b58f0 Also add the right metadata to the AMF plugin.
This ensures that the filetype shows up in the supported types of the open window
2019-04-30 11:38:55 +02:00
Jaime van Kessel
0bd516da4c Add mimetype to amf plugin 2019-04-30 11:34:30 +02:00
Jaime van Kessel
c394ce74c3 Merge branch 'feature_amf_reader' of https://github.com/fieldOfView/Cura 2019-04-30 11:23:19 +02:00
Jaime van Kessel
6fbbed9c06 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-30 10:51:33 +02:00
Jaime van Kessel
3f47ffeae7 Use only the active extruders when sending slice message
Fixes #5671
2019-04-30 10:50:57 +02:00
Jaime van Kessel
5359293d7a Merge branch 'CURA-6156_build_volume_temperature' of github.com:Ultimaker/Cura 2019-04-29 13:29:35 +02:00
Lipu Fei
d21c0a4ca9 Merge remote-tracking branch 'origin/4.1' 2019-04-26 15:52:37 +02:00
Ghostkeeper
b3b59d5a5c
Add typing 2019-04-26 15:42:22 +02:00
Lipu Fei
04c39824cb Fix typing 2019-04-26 15:39:28 +02:00
Jaime van Kessel
a86311fea3 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-04-26 15:25:58 +02:00
Jaime van Kessel
0d8b625bf8 Properly cache slice values to speed up sending the slice 2019-04-26 15:25:31 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Aldo Hoeben
b3bc3243d1
Update copyright 2019-04-26 11:54:44 +02:00
Aldo Hoeben
066b90bdea
Merge branch 'master' into feature_amf_reader 2019-04-26 11:51:55 +02:00
Jaime van Kessel
ac8cca31d1
Merge pull request #5667 from Ultimaker/CURA-6478_drag_expandable_component
Make Expandable Components Draggable [CURA-6478]
2019-04-26 11:03:52 +02:00
Lipu Fei
3e91f89ffe Add build volume temperature
CURA-6156
2019-04-26 07:43:03 +02:00
Remco Burema
c3a9ceaa18 Remove a line of commented-out code. [CURA-6478] 2019-04-25 22:42:52 +02:00
Remco Burema
c4265c1f67 Scale instead of center for preview/prepare-menus. [CURA-6478] 2019-04-25 21:50:24 +02:00
Jaime van Kessel
5f76070f05 Fix situation where authtoken wasnt updated for the toolbox request headers 2019-04-25 16:16:44 +02:00
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Lipu Fei
4f05ea578c Cancel the network request when cancel the manual ip request
CURA-6483
2019-04-25 11:55:49 +02:00
Ghostkeeper
cf9ab5a5cd
Don't serialize 'compatible' metadata key
It is already serialised in the 'hardware compatible' settings.
2019-04-25 10:55:17 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel
CURA-6483
2019-04-25 08:44:55 +02:00
Simon Edwards
da539b34f5
Merge pull request #5661 from Ultimaker/CL-1055_show_sliced_for_pills_on_print_jobs
CL-1055 show sliced for pills on print jobs
2019-04-24 14:59:50 +02:00
Lipu Fei
1b9bf6f0b9 Add optional empty placeholder for CuraView
CURA-6469
2019-04-24 09:10:21 +02:00
Ian Paschal
213a8fa6f3 Don't use compatible machien families for pills
Contriutes to CL-1055
2019-04-23 14:40:03 +02:00
Ian Paschal
6f762c676e Set the printer type on printer configuration
No idea why we didn't already do this
Contributes to CL-1055
2019-04-23 14:38:07 +02:00
Lipu Fei
905889214a Fix typing 2019-04-23 10:31:13 +02:00
Lipu Fei
4423fc82b0 Fix typing 2019-04-23 09:39:46 +02:00
Lipu Fei
97def2f6b1 Handle requests ConnectionErrors in Backup plugin
CURA-6471
2019-04-23 09:07:19 +02:00
Jaime van Kessel
50ad4e4d4e Speed up the rendering of the solid view by caching support_angle property 2019-04-19 14:55:28 +02:00
ChrisTerBeke
3b0cfc270f Fix unit test for device name 2019-04-18 14:43:53 +02:00
ChrisTerBeke
76d0b5f198 Ensure printers length is larger than 0 before accessing index 2019-04-18 14:26:38 +02:00
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