3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19026 commits 302 branches 270 tags 769 MiB
Commit graph

12 commits

Author SHA1 Message Date
Lipu Fei
80dff49b8a Fix merge conflicts 2019-03-22 10:00:57 +01:00
Lipu Fei
d3ea506167 Add docs for createMachineFromDiscoveredPrinter 2019-03-22 09:47:13 +01:00
Lipu Fei
9265a0de4a Fix typing 2019-03-22 09:41:12 +01:00
Remco Burema
139edbb0b7
Merge pull request #5460 from Ultimaker/WIP_onboarding_by_ip 
'WIP-onboarding-by-ip' into 'parent' branch
 2019-03-21 09:52:39 +01:00
Lipu Fei
7e176e0f2c Fix merge conflicts 2019-03-21 08:34:07 +01:00
Lipu Fei
5d45dba8f3 Fix DiscoveredMachineModel test 2019-03-20 16:00:39 +01:00
Lipu Fei
a17642a5a1 Merge WIP_onboarding_by_ip 2019-03-20 13:42:15 +01:00
Lipu Fei
615241a416 Fix module renaming 2019-03-20 13:39:08 +01:00
Remco Burema
ad6603bab8 Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-20 13:33:19 +01:00
Lipu Fei
c3c9c53f13 Merge WIP_onboarding 2019-03-20 11:28:30 +01:00
Lipu Fei
105a07fc16 Rename vars and add typing in DiscoveredPrintersModel 2019-03-20 10:42:43 +01:00
Lipu Fei
4078719c58 Move cura.Machine.Models to cura.UI.MachineModels 2019-03-20 09:56:11 +01:00