GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 08:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,795 Commits 290 Branches 260 Tags
Commit Graph

712 Commits

Author SHA1 Message Date
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
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
ChrisTerBeke
bfca117bff Fixes 2019-07-30 13:09:29 +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
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
ChrisTerBeke
ddd282eef3 Remove absolute plugin imports, some fixes 2019-07-29 16:11:01 +02:00
ChrisTerBeke
4b212d6c05 Merge more stuff, re-use models for local networking as well 2019-07-29 14:53:50 +02:00
ChrisTerBeke
4268c011a7 Start inheriting both output devices from a base device 2019-07-26 17:05:39 +02:00
ChrisTerBeke
bd4f0c4e25 Extract API calls to separate class 2019-07-26 15:34:37 +02:00
ChrisTerBeke
fb434ec81a Remove unneeded import 2019-07-26 15:08:49 +02:00
ChrisTerBeke
3c1b377308 Restructure codebase - part 1 2019-07-26 15:07:52 +02:00
ChrisTerBeke
96cf235d8c Get rid of any hardcoded references to machines 2019-07-25 14:56:46 +02:00
Jaime van Kessel
1e7875de48 Merge branch 'prevent_throwing_exception_when_not_connected' of github.com:Ultimaker/Cura 2019-07-23 13:57:31 +02:00
Lipu Fei
4b8a216771 Fix typing 2019-07-22 09:34:00 +02:00
ChrisTerBeke
25130b63e2 Fix logic 2019-07-12 09:19:30 +02:00
ChrisTerBeke
6210135b92 Send the correct action name when using local network 2019-07-12 08:14:28 +02:00
ChrisTerBeke
99e2939801 Add defense for when active printer is None 2019-07-10 12:55:12 +02:00
ChrisTerBeke
f1df7b93c4 Fix printer and print job ordering, add back 'move to top' 2019-07-10 12:42:01 +02:00
ChrisTerBeke
1d09cb5b9c
Fix typing for optional data argument 
Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
 2019-06-24 13:18:27 +02:00
ChrisTerBeke
baf9dc041c Fix typing of Any 2019-06-20 12:56:45 +02:00
ChrisTerBeke
93351ec9b9 Show context menu on printers with firmware 5.3 or later 2019-06-20 12:36:15 +02:00
ChrisTerBeke
eb8d353e11 Add basic support for print job actions via Cloud output device 2019-06-19 13:58:11 +02:00
Jaime van Kessel
14f96bd9b6 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-28 12:41:33 +02:00
Jaime van Kessel
63316fa4e9 Fix manual output devices not being added on boot 2019-05-28 11:59:17 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting" 
This reverts commit bec7b6546d3f7de457418a2e15f08c1e6dfa3148, reversing
changes made to 7094b222b10076af3a13f11b03dd3416eae12156.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
 2019-05-23 13:40:11 +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
7be3863d51 Put override logic in Python instead of QML 
Contributes to CL-1259
 2019-05-20 15:46:07 +02:00