3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
18847 commits 340 branches 299 tags 734 MiB
Commit graph

5903 commits

Author SHA1 Message Date
Remco Burema
ad6603bab8 Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-20 13:33:19 +01:00
Lipu Fei
4078719c58 Move cura.Machine.Models to cura.UI.MachineModels 2019-03-20 09:56:11 +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
2d78c2d7fc Move ExtruderOutputModel into cura.UI module 2019-03-20 09:45:26 +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
Lipu Fei
e30104ff7f Move PrintJobOutputModel into cura.UI module 2019-03-20 09:27:23 +01:00
Lipu Fei
e1d26da528 Move ExtrudersModel into cura.UI module 2019-03-20 09:19:30 +01:00
Lipu Fei
5eb51c6cd4 Move CuraStage into cura.UI module 2019-03-20 09:07:15 +01:00
Remco Burema
740dd095cc (Add-by-IP) Incorporated review comments. [CURA-6294] 2019-03-19 13:45:56 +01:00
Remco Burema
5b31feebba Remove UserAgreement-plugin in favour of Welcome-Pages. [CURA-6057] 2019-03-15 13:58:36 +01:00
Remco Burema
0f116fa3f4 Replace old User-Agreement-page with new Welcome-Pages. [CURA-6057] 2019-03-14 14:59:04 +01:00
Remco Burema
2693eecd33 (Add-by-IP/onboard) Cleanup and use discovered-printer instead of machine-manager. [CURA-6294] 2019-03-14 13:33:24 +01:00
Remco Burema
61821e6378 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_by_ip 2019-03-14 11:40:44 +01:00
Lipu Fei
b3621bae84 WIP: Disable unknown printer type buttons 2019-03-14 11:18:39 +01:00
Lipu Fei
2b0e9ea439 WIP: Fix refresh and naming 2019-03-14 08:56:31 +01:00
Remco Burema
b12b6892ca Add-by-IP onboarding: Create (and set active) new device. [CURA-6294] 2019-03-13 17:36:03 +01:00
Remco Burema
bb17ab14da (WIP) Connect manual-device-added signals to AddPrinterByIP-page. [CURA-6294] 2019-03-13 15:46:02 +01:00
Lipu Fei
e5b51c8edf WIP: Implement refreshConnections() 2019-03-13 15:34:18 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00
Lipu Fei
6b2642ee9a Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-11 09:05:43 +01:00
Diego Prado Gesto
8c41bc86d2
Merge pull request #5259 from fieldOfView/fix_travel_speed 
Add {travel_speed} as an alias to {speed_travel}
 2019-03-08 17:26:18 +01:00
Diego Prado Gesto
9396628170 Make suggested changes to post processing scripts 
Contributes to CURA-5713.
 2019-03-08 15:46:21 +01:00
Diego Prado Gesto
b913dd9702 Merge branch 'master' of https://github.com/wporter82/Cura into wporter82-master 2019-03-08 15:37:41 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Remco Burema
6d34a2abd0 Start to connect/handle new signals for manual device addition. [CURA-6294] 2019-03-08 13:08:44 +01:00
Diego Prado Gesto
55e27f6e21
Merge pull request #5402 from lucik/patch-1 
monitor does not show "Build Plate"
 2019-03-08 11:46:52 +01:00
Andrew
70e640be22
Change regexp for greater compatibility 
Change regexp in bed_temperature_matches  and extruder_temperature_matches for greater compatibility with different printers.
 2019-03-08 11:25:49 +06:00
Remco Burema
7a7e710b2a Support for manual device addition for plugins (WIP). [CURA-6294] 2019-03-06 17:50:40 +01:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ghostkeeper
d72a8581bf
Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 2019-03-06 15:23:33 +01:00
Remco Burema
5f335b4401 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-06 14:07:44 +01:00
Andrew
e56a97bfa2
monitor does not show "Build Plate" 
bed_temperature_matches : error in temperature search expression
 2019-03-06 17:28:22 +06:00
Lipu Fei
ffb8aed4c3 Merge CURA-6179 2019-03-06 11:32:52 +01:00
Ghostkeeper
943503cac7
Fix iterating over 'hardware compatible' keys 
This is both faster and actually functions properly.

Contributes to issue CURA-6272.
 2019-03-05 15:25:39 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +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
87d4a68c0e Merge remote-tracking branch 'origin/4.0' into CL-1274_dont_use___file__ 2019-03-04 12:11:57 +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
Diego Prado Gesto
0e7127f80b Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-01 14:54:10 +01:00
Remco Burema
113c37f555 Start work on 'AddPrinterByIp' for WelcomePages. [CURA-6057] 2019-03-01 13:17:15 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Diego Prado Gesto
3f8f363836 Fix the installed checkmark in Marketplace 
Show a package as completelly installed if the user has more or the same number of packages than in the list. Otherwise if the contributor removes one of the packages from the list, it seems that I don't have all the packages installed when in fact I do.
 2019-03-01 10:57:39 +01:00
Ian
cac8c85489 Don't use __file__ 
Contributes to CL-1274
 2019-03-01 10:46:41 +01:00