5885 Commits

Author SHA1 Message Date
Lipu Fei
3911c3d73d WIP: Cleanup and unify MachineAction styles 2019-03-19 15:40:44 +01:00
Lipu Fei
8d68db9ff0 WIP: Add first-start machine actions 2019-03-19 14:24:57 +01:00
Lipu Fei
cf0e3effc7 WIP: Refactor NumericTextFieldWithUnit 2019-03-18 08:48:29 +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
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
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
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
Ian
cf9a1c0248 Sort UM imports alphabetically for easy scanning
Contributes to CL-1274
2019-03-01 10:46:27 +01:00
Simon Edwards
4590fae9b2 Hide the "View print history" button when connecting via cloud
CL-1247
2019-02-28 17:08:28 +01:00
Jaime van Kessel
91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues
If the upgraded single extrusion machine was never activated, it would not have it's extruders set.

CURA-6252
2019-02-28 16:17:34 +01:00
Jaime van Kessel
21c6bba1ce Add the discovered printer functionality
This can be used in the add machine wizard to short circuit the creation of a printer.
So instead of first selecting a printer and then connecting it, it will be possible to have
a list that contains all network discovered printers (from all plugins that can do this).

This means we can select one of those printers and directly add it (thus no longer needing that step)

CURA-6179
2019-02-27 11:05:54 +01:00
Jaime van Kessel
3de9cab1e2
Merge pull request #5363 from Ultimaker/backup-list-response-error-handling
Add extra validation to backup list response
2019-02-26 11:16:40 +01:00
ChrisTerBeke
53cc9cd188 Add extra validation to backup list response 2019-02-26 11:09:57 +01:00
Lipu Fei
4d3211e651 Merge remote-tracking branch 'origin/4.0' 2019-02-22 13:38:29 +01:00
Diego Prado Gesto
271573d0ae Fix typo... again 2019-02-22 13:19:04 +01:00
Diego Prado Gesto
5d8eb3e6e5 Fix typo 2019-02-22 13:18:20 +01:00
Jaime van Kessel
198ea3c74f Ensure the model checker doesn't update a gazillion times on multiply
CURA-6237
2019-02-21 21:09:49 +01:00
Ghostkeeper
650204dae7
Merge branch '4.0' 2019-02-21 09:09:19 +01:00
Ghostkeeper
3040fde9eb
Merge branch '4.0'
Conflicts:
	cura/OAuth2/AuthorizationService.py -> Code style change vs. fixing logging in while no internet connection.
2019-02-21 08:25:21 +01:00
Ian Paschal
10f0a5663d Update MonitorMain.qml 2019-02-20 14:32:19 +01:00
Ian Paschal
a5761cb56b Use new property names for cloud connection detection 2019-02-20 14:08:13 +01:00
Simon Edwards
60547b4265
Merge pull request #5329 from Ultimaker/CL-1247_improve_cloud_disabled_states
CL-1247 Improve cloud disabled states
2019-02-20 13:17:11 +01:00
Remco Burema
f81ad58836 Merge branch 'ppa_contribute_compatible_format' into 4.0 2019-02-20 11:29:24 +01:00
Remco Burema
7fca9dae04 Merge branch '4.0' into ppa_contribute_compatible_format 2019-02-20 11:26:13 +01:00
Jaime van Kessel
9a1d8ea5f9 Don't serialize "definition" for material profile
CURA-5787
2019-02-20 10:46:49 +01:00