3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 09:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
20201 commits 302 branches 270 tags 770 MiB
Commit graph

97 commits

Author SHA1 Message Date
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
93351ec9b9 Show context menu on printers with firmware 5.3 or later 2019-06-20 12:36:15 +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
Ghostkeeper
cd89f7345a
Merge branch 'WIP_gitlab_ci' 2019-04-17 16:30:32 +02:00
Lipu Fei
dd19d7d1a9 Fix typing 2019-04-03 08:25:17 +00:00
Jaime van Kessel
f8b67be487 Fix error spam when a printer of a cluster is unreachable 
CURA-6057
 2019-03-29 10:43:47 +01:00
Lipu Fei
8780fce7a7 Move MaterialOutputModel back 2019-03-28 14:26:54 +01:00
Lipu Fei
4a171eebf6 Move models around again 
- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI
 2019-03-26 08:29:22 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
81fbc525e4 Rename ConfigurationModel to PrinterConfigurationModel 2019-03-20 09:52:35 +01:00
Lipu Fei
e555f7da68 Move ConfigurationModel into cura.UI module 2019-03-20 09:51:06 +01:00
Lipu Fei
69eb381f10 Move MaterialOutputModel into cura.UI module 2019-03-20 09:47:44 +01:00
Lipu Fei
49c87a1e1d Move ExtruderConfigurationModel into cura.UI module 2019-03-20 09:44:15 +01:00
Lipu Fei
6a8db55112 Move PrinterOutputModel into cura.UI module 2019-03-20 09:43:10 +01:00
Lipu Fei
2b39d6422c Move PrinterOutputDevice into cura.PrinterOutput module 2019-03-20 09:43:09 +01:00
Jaime van Kessel
c1ed8ba9d0 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-18 14:56:49 +01:00
Jaime van Kessel
61e031bf1a Fix format for two of the translated messages. 
The format needs to be done on the result of whatever the translate spits out instead of
the string that is passed to the translate.
 2019-03-18 13:45:31 +01:00
Lipu Fei
2b0e9ea439 WIP: Fix refresh and naming 2019-03-14 08:56:31 +01:00
Lipu Fei
6b2642ee9a Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-11 09:05:43 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ian Paschal
88fc7d0fba Don't try to get the plugin path when there's no plugin registry 
i.e. in tests
Contributes to CL-1274
 2019-03-04 14:27:35 +01:00
Ian Paschal
a74717ca3c Get plugin path like most other plugins do 
Contributes to CL-1274
 2019-03-04 12:42:48 +01:00
Ian Paschal
3889570697 K.I.S.S. 
Contributes to CL-1274
 2019-03-04 12:04:34 +01:00
Ian Paschal
c8580cf417 Prevent circular dependencies 
Contributes to CL-1274
 2019-03-04 11:27:52 +01:00
Ian Paschal
a1e0ddd9df Don't hardcode plugin directory 
Contributes to CL-1274
 2019-03-04 10:19:33 +01:00
Ian
cac8c85489 Don't use __file__ 
Contributes to CL-1274
 2019-03-01 10:46:41 +01:00
Ian
cf9a1c0248 Sort UM imports alphabetically for easy scanning 
Contributes to CL-1274
 2019-03-01 10:46:27 +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