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

740 Commits

Author SHA1 Message Date
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
Ian Paschal
1244e30500 Add cloud-flow-is-possible checking 
Contributes to CL-1222
 2019-02-01 15:50:49 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Lipu Fei
c73747ad44 Merge remote-tracking branch 'origin/4.0' 2019-01-31 14:22:59 +01:00
ChrisTerBeke
b884e46187
Ensure Cura stores the cloud connection type in the stack file 2019-01-30 22:02:13 +01:00
Ghostkeeper
232498980c
Merge branch '4.0' 
Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
 2019-01-28 16:45:45 +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
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types. 
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
 2019-01-28 14:29:41 +01:00
Ian Paschal
f5379dda55 Fix improperly removed method 2019-01-23 14:48:38 +01:00
ChrisTerBeke
92eb361ba1 Make cloud API error a generic message to not scare the user 2019-01-23 09:37:32 +01:00
ChrisTerBeke
a702661b5d Decrease the API call intervals to get quicker UI updates 2019-01-15 14:17:38 +01:00
ChrisTerBeke
b7fb969524 Fixes for review 2019-01-15 09:37:38 +01:00
Daniel Schiavini
77c30c891f Fix tests 2019-01-15 08:20:39 +01:00
ChrisTerBeke
f478653c37 Uncomment code that was needed for testing 2019-01-14 14:56:14 +01:00
ChrisTerBeke
7bf319dfd1 Better fix for circular dependency 2019-01-14 14:17:36 +01:00
ChrisTerBeke
cd19eec98a Remove weird argument for timer 2019-01-14 11:06:16 +01:00
ChrisTerBeke
402097f4d0 Fix imports 2019-01-14 10:57:50 +01:00
ChrisTerBeke
1e2a8aa23e revert to prevent circular dependency 2019-01-14 10:52:50 +01:00
ChrisTerBeke
81abc84741 Fix typing of CloudOutputDevice in controller 2019-01-14 10:41:10 +01:00
ChrisTerBeke
7bbd43928a Fix more review comments 2019-01-11 16:38:25 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
e465bd771a Use toolpath instead of mesh, some review fixes 2019-01-11 16:18:47 +01:00
ChrisTerBeke
d8b5f75e2a Solve some review comments 2019-01-11 16:14:55 +01:00
ChrisTerBeke
32ad50864e
Merge pull request #5029 from Ultimaker/STAR-347_update_cura_connect_models 
Star-347: Update Cura Connect models
 2019-01-10 17:46:26 +01:00
ChrisTerBeke
36191fbe0f Fix typevar typing issue 2019-01-10 15:36:12 +01:00
ChrisTerBeke
56f0a341bc Fix merge conflicts 2019-01-10 15:17:53 +01:00
ChrisTerBeke
b8da720c1d Move translations in-line 2019-01-08 13:10:42 +01:00
ChrisTerBeke
485b471522 Fix some review comments 2019-01-08 12:19:00 +01:00
ChrisTerBeke
7c7bca31c7 Fix renamed property connectionType 2019-01-08 11:52:27 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Jaime van Kessel
4c1f68a447 Ensure that the connectiontype of a connected printer is set correctly 
CURA-6011
 2019-01-04 15:24:01 +01:00
Jaime van Kessel
1973397b92 Remove confusing printer preference text 
CURA-6003
 2019-01-03 15:34:41 +01:00
Jaime van Kessel
e769b324e1 Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0 2019-01-03 11:41:05 +01:00
Lipu Fei
ee72284616 Use appropriate log level 
CURA-6035
 2019-01-03 08:32:42 +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
Marijn Dee
12a4a5e9f5 Fixing the rest of the automatic test failures 2018-12-21 15:06:02 +01:00
Marijn Dee
131211e604 Fixed the unit tests 2018-12-21 09:42:28 +01:00
ChrisTerBeke
5403f5241b Fix not registering cloud output device for every machine 2018-12-20 17:21:07 +01:00
Marijn Dee
9d27c29c8c Fixed indentation and relative import, tests still fail though 2018-12-20 17:04:17 +01:00
Marijn Dee
403010aa90 Mirrored the changes made to the models in Commons 2018-12-20 16:32:00 +01:00
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
Lipu Fei
e79f312fa0 Fix unit tests for SendMaterialJob 
CURA-6035
 2018-12-20 14:20:34 +01:00
ChrisTerBeke
2f92f6ef50 Simplify checking if cloud or network printer, small fixes 2018-12-20 13:45:59 +01:00
Lipu Fei
68372aff60 Use MaterialManager in SendMaterialJob 
CURA-6035
 2018-12-20 10:45:40 +01:00
Remco Burema
9dbc642967 SendMaterials: Make sure the base-material is compared to and make case insensitive. [CURA-6035] 2018-12-19 17:34:31 +01:00
ChrisTerBeke
beb68213f4 Remove much logging or use debug level, fix cloud icon not appearing right away 2018-12-19 14:14:44 +01:00
ChrisTerBeke
cf06cb5351 Do not call printer_device.key before checking if it exists 2018-12-19 12:10:24 +01:00
ChrisTerBeke
d2746d03c1 Fix type checking for DiscoverUM3Action 2018-12-19 11:56:43 +01:00
ChrisTerBeke
5e9fe3fe50 Fix some codestyle, make connectionType a property as it's needed in QML 2018-12-19 11:21:50 +01:00