Lipu Fei
940a833e73
WIP: Add printers via network
2019-03-08 13:43:58 +01:00
Ghostkeeper
d42ba9dda0
Merge branch '4.0'
...
Conflicts:
resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
2019-02-15 13:58:47 +01:00
Ian Paschal
af565aff55
Clarify if using key or human-readable name
...
This is refering to "glass", not "Glass". According to @lipufei, "name" should denote a human readable/capitalized name.
Contributes to CL-1250
2019-02-14 11:49:43 +01:00
Ghostkeeper
d2e1c47029
Use spaces instead of tabs
...
Yeah, or remove extraneous tabs at the end of a line.
2019-02-11 08:53:42 +01:00
Ghostkeeper
51420c8311
Merge branch '4.0'
2019-02-08 14:23:36 +01:00
Ghostkeeper
473633de2c
Merge branch '4.0'
2019-02-08 11:28:06 +01:00
Ian Paschal
729f4c9d52
Revert "Fix line length"
...
This reverts commit 19f1a2f2d0
2019-02-08 09:40:56 +01:00
Ian Paschal
19f1a2f2d0
Fix line length
...
Contributes to CL-1237
2019-02-08 09:23:38 +01:00
Simon Edwards
8e569126ff
Use the older but backwards compatible API for moving print jobs in the queue.
...
CL-1237
2019-02-06 12:19:59 +01:00
Ian Paschal
b1104124f3
Add address property to ClusterUM3OutputDevice
...
This was necessary because it was the only way to get the address (NetworkPrinterDevice and PrinterOutputDevice returned empty strings)
Contributes to CL-1222
2019-02-06 12:01:42 +01:00
Ian Paschal
4c1131a7b4
Remove some redundant calls
...
Contributes to CL-1222
2019-02-04 16:11:48 +01:00
Ian Paschal
f2ddb2808f
Add firmware check
...
Contributes to CL-1222
2019-02-04 16:02:38 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0'
2019-02-04 13:06:32 +01:00
Ian Paschal
66ed42838f
Stop using depreciated API call
2019-02-04 11:53:24 +01:00
Ian Paschal
2a3a1d6e35
Move cloud flow checks back to UM3OutputDevice
...
Contributes to CL-1222
2019-02-04 11:51:27 +01:00
Ghostkeeper
25b18dee7a
Fix type errors
...
Nothing really changed but it should be more type-safe now for the messages it creates and the build plate temperature.
2019-01-28 16:14:01 +01:00
Ian Paschal
f5379dda55
Fix improperly removed method
2019-01-23 14:48:38 +01:00
ChrisTerBeke
f478653c37
Uncomment code that was needed for testing
2019-01-14 14:56:14 +01:00
ChrisTerBeke
3c10cca0de
Fixed all codestyle and nitpicks from review
2019-01-11 16:33:49 +01:00
ChrisTerBeke
a6114d39e4
Fix merge conflicts with 4.0
2019-01-08 11:49:36 +01:00
Jaime van Kessel
a16e406507
Properly display the full type + brand of unknown material
...
CURA-6033
2018-12-31 11:01:30 +01:00
ChrisTerBeke
5403f5241b
Fix not registering cloud output device for every machine
2018-12-20 17:21:07 +01:00
ChrisTerBeke
2f92f6ef50
Simplify checking if cloud or network printer, small fixes
2018-12-20 13:45:59 +01:00
ChrisTerBeke
25caf1a087
Fix merge conflicts
2018-12-18 14:44:13 +01:00
Daniel Schiavini
9f4b7bd703
STAR-322: Improving logging and cluster connection
2018-12-17 11:28:16 +01:00
Jaime van Kessel
b8a4d8e80d
Remove the cluster connection type
...
CURA-6011
2018-12-14 17:14:56 +01:00
Lipu Fei
6bf39a32a9
Rename Enum names to camal cases
...
CURA-6011
2018-12-14 09:56:10 +01:00
Aleksei S
973970a895
Every print ouput device should define its connection type(usb, network, cluster and etc)
...
CURA-6011
2018-12-13 16:00:12 +01:00
Daniel Schiavini
a5d8e6ceb8
STAR-322: Removing the print job after it was done
2018-12-11 14:28:00 +01:00
Daniel Schiavini
073e8cd6dc
Merge branch 'master' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-11 12:39:02 +01:00
Diego Prado Gesto
4949f39c34
Add translatable strings to empty and unknown material
...
Contributes to CL-1160.
2018-12-11 12:10:32 +01:00
Daniel Schiavini
4fddf1b7c7
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-11 11:56:43 +01:00
Daniel Schiavini
d54fc4182b
STAR-322: Fixing style errors
2018-12-11 11:56:36 +01:00
Diego Prado Gesto
70b0d16fa4
Fix typo
...
Missing parenthesis.
Contributes to CL-1160.
2018-12-11 11:53:26 +01:00
Diego Prado Gesto
2b2e8ebb31
Add some safety checks when checking for the guid of the material
...
Don't crash if the guid doesn't exist.
Contributes to CL-1160.
2018-12-11 11:37:01 +01:00
ChrisTerBeke
79430f9faf
Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection
2018-12-11 10:56:38 +01:00
Ian Paschal
0f357e1078
Replace fix for 'None' materials
...
This was fixed in 4.0 and accidentally got reverted when merging another branch in.
Contributes to CL-1160
2018-12-11 10:51:05 +01:00
Ian Paschal
df4e5c40df
Rename ClusterMonitorItem
...
Contributes to CL-1152
2018-12-10 12:19:52 +01:00
Ian Paschal
8a856f13d2
Re-add config changes in monitor tab
...
Contributes to CL-1152
2018-12-10 11:36:51 +01:00
Daniel Schiavini
4f82a2759a
STAR-322: Improving configuration models interface
2018-12-07 12:04:02 +01:00
Daniel Schiavini
a1c252d3a2
Revert "Revert "fix merge conflict""
...
This reverts commit 4bffa6d90f
2018-12-07 10:25:46 +01:00
Daniel Schiavini
4bffa6d90f
Revert "fix merge conflict"
...
This reverts commit ec03b012a72af33738d1
2018-12-07 10:22:32 +01:00
ChrisTerBeke
ec03b012a7
fix merge conflict
2018-12-06 16:39:58 +01:00
ChrisTerBeke
66690dfef7
Add testing todo
2018-12-05 17:06:22 +01:00
ChrisTerBeke
5e15858cae
more mocks for monitor page, fix showing current print job in monitor page, add todo
2018-12-05 17:05:21 +01:00
Daniel Schiavini
7e76913736
STAR-322: Fixing printer matching by network key
2018-12-05 16:02:38 +01:00
Daniel Schiavini
b693b9d98f
STAR-322: Extracting models to be able for converting themselves
2018-12-05 14:08:40 +01:00
Daniel Schiavini
163226f940
STAR-322: Using composition rather than inheritance
2018-12-05 12:02:04 +01:00
Daniel Schiavini
d99e2d1533
STAR-322: Extracting file handler methods
2018-12-05 11:21:17 +01:00
Daniel Schiavini
3c5e74a72c
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-05 10:44:53 +01:00
