ChrisTerBeke
dc826ab456
Fix typing
2019-07-30 22:52:29 +02:00
ChrisTerBeke
52a5a43fe2
Show cloud connection flow message when adding local network device
2019-07-30 22:44:45 +02:00
ChrisTerBeke
d280252437
Cleanup
2019-07-30 22:21:36 +02:00
ChrisTerBeke
72ac8b5f4c
Simplify output device cleanup code
2019-07-30 19:29:35 +02:00
ChrisTerBeke
c1b5cce064
Fix string formatting
2019-07-30 18:04:16 +02:00
ChrisTerBeke
b7dfa11e69
Enable network key pairing again
2019-07-30 17:41:03 +02:00
Ghostkeeper
846cbe79a3
Rename Orthogonal to Orthographic everywhere
2019-07-30 17:35:40 +02:00
ChrisTerBeke
c0933ddb2d
Simplify return
2019-07-30 17:00:30 +02:00
ChrisTerBeke
aa6105f1be
cleanup imports
2019-07-30 16:56:58 +02:00
ChrisTerBeke
69102643b7
Bring back print job preview images
2019-07-30 16:55:35 +02:00
ChrisTerBeke
cf1dff3fdc
Fix camera stream
2019-07-30 15:51:56 +02:00
ChrisTerBeke
64c7b2e737
Remove some TODOs
2019-07-30 15:32:34 +02:00
ChrisTerBeke
7398f08b27
Fix job name
2019-07-30 15:30:34 +02:00
ChrisTerBeke
1ec2ac4118
some cleanup
2019-07-30 15:20:59 +02:00
Lipu Fei
2ce567ccfe
Fix material current item reset
...
CURA-6679
2019-07-30 15:16:50 +02:00
Lipu Fei
0c66fd82d4
Merge remote-tracking branch 'origin/4.2'
2019-07-30 15:16:18 +02:00
Ghostkeeper
5b30b5bfae
Small improvement for Italian
...
Thanks to Andre(e)a.
Contributes to issue CURA-6663.
2019-07-30 13:14:21 +02:00
ChrisTerBeke
56f58c741a
Merge branch 'master' into CS-234_network_plugin_code_quality
2019-07-30 13:10:19 +02:00
ChrisTerBeke
bfca117bff
Fixes
2019-07-30 13:09:29 +02:00
Lipu Fei
78364e0c57
Fix pytest command
2019-07-30 12:57:01 +02:00
Lipu Fei
bcd18003e9
Use group runner
2019-07-30 12:53:59 +02:00
Ghostkeeper
ec9a5fce09
Disable Polish language from the UI
...
The translation files have not been updated this release, so they are incomplete.
Contributes to issue CURA-6663.
2019-07-30 12:06:00 +02:00
Jaime van Kessel
67dbb97958
Fix incorrect cast import
2019-07-30 11:45:27 +02:00
Jaime van Kessel
fe2412f3a7
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-30 11:41:51 +02:00
Jaime van Kessel
914d2e98e9
Fix the disabling of the material setting fields.
...
This was caused by using 2 different modelsItems.
2019-07-30 11:29:49 +02:00
Lipu Fei
2a7b887eb2
Use group gitlab runners
2019-07-30 07:51:13 +02:00
ChrisTerBeke
9e4c71cce3
Fixes for print job upload
2019-07-29 23:51:20 +02:00
ChrisTerBeke
8087fa421d
Make params named so we know what we're doing
2019-07-29 23:25:08 +02:00
ChrisTerBeke
bd6056dd33
Merge branch 'master' into CS-234_network_plugin_code_quality
2019-07-29 23:13:23 +02:00
ChrisTerBeke
b90e5b3262
re-implement requestWrite
2019-07-29 23:12:55 +02:00
ChrisTerBeke
529b483f36
Remove ABC
2019-07-29 22:00:48 +02:00
ChrisTerBeke
fa5b083b74
Small code improvements
2019-07-29 21:58:29 +02:00
ChrisTerBeke
f34fc7e6f9
Remove tests that are no longer relevant
2019-07-29 21:53:26 +02:00
ChrisTerBeke
11bd520c98
Rename some stuff to make it clear
2019-07-29 21:49:52 +02:00
ChrisTerBeke
25fde1e0c4
Extract zeroconf into separate class
2019-07-29 21:42:52 +02:00
ChrisTerBeke
4b71b45aa3
Fix for initial connection
2019-07-29 21:27:28 +02:00
ChrisTerBeke
8360b5b448
Simply manual device checking
2019-07-29 19:48:57 +02:00
ChrisTerBeke
5b206496d0
Formatting new line
2019-07-29 17:41:27 +02:00
ChrisTerBeke
67045b34b5
Add some more explanation
2019-07-29 17:39:27 +02:00
ChrisTerBeke
6d9b6668e2
Add TODO
2019-07-29 17:38:07 +02:00
ChrisTerBeke
14808c5de1
Don't cache application instance
2019-07-29 17:34:31 +02:00
ChrisTerBeke
93146610f7
Fix local pause, resume and abort
2019-07-29 17:31:05 +02:00
ChrisTerBeke
1aa70748af
Consistent naming, some bug fixes
2019-07-29 17:24:10 +02:00
Ghostkeeper
3e8ff04aa3
Merge branch '4.2'
2019-07-29 16:44:41 +02:00
Ghostkeeper
399e6d31ae
Remove <strong> tags
...
This messes with our layout. The setting title should be bold face, but nothing else.
Contributes to issue CURA-6663.
2019-07-29 16:42:17 +02:00
Ghostkeeper
330792feef
Corrections to Dutch
...
As a native and a 3D printing expert, and having contributed a lot (perhaps the most) to Cura, I feel entitled to be able to change this.
Contributes to issue CURA-6663.
2019-07-29 16:28:41 +02:00
ChrisTerBeke
ddd282eef3
Remove absolute plugin imports, some fixes
2019-07-29 16:11:01 +02:00
Ghostkeeper
c1e9f75461
Corrections from PoEdit
...
These need to be more consistent since it's being followed by data.
2019-07-29 16:10:12 +02:00
Ghostkeeper
6b998642da
Correct authors and latest authors
...
Contributes to issue CURA-6663.
2019-07-29 16:05:51 +02:00
Ghostkeeper
21010fef1e
Add missing report e-mails
...
Contributes to issue CURA-6663.
2019-07-29 15:57:26 +02:00