GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,723 Commits 291 Branches 260 Tags
Commit Graph

5855 Commits

Author SHA1 Message Date
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
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
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
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
Ian Paschal
164e721c42
Merge pull request #5331 from Ultimaker/monitor_tab_images 
Fix the path to the pop up images in the monitor tab.
 2019-02-20 10:17:54 +01:00
Simon Edwards
43b1c86920 Use QUrl.fromLocalFile() to create the file:// URLs for the images 2019-02-20 09:31:51 +01:00
Jaime van Kessel
3f18b0b974 Increase agressiveness of short circuit logic; Just check if the node is slicable 
That should also filter out platform, buildVolume and convexHulLNodes
 2019-02-19 18:00:20 +01:00
Jaime van Kessel
aef89e2bd3 Add few more cases where Camera changes caused un-needed updates 2019-02-19 17:40:44 +01:00
Simon Edwards
3ad916b565 Fix the path to the pop up images in the monitor tab. 2019-02-19 17:07:09 +01:00
Jaime van Kessel
22b70e1a34 Ignore sceneChange signals if the camera triggered them in some places 
These places weren't interested in all changes. They can probably be more
strict, but the camera is a really safe bet (and already greatly decreases
the number of updates, especially when just moving the camera)
 2019-02-19 17:06:48 +01:00
Jaime van Kessel
3c9f630ddd Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-19 15:43:40 +01:00
Jaime van Kessel
d53bac6eb8 Simplify the expensive call to the validation state 
Since the support angle needs to be between 0 and 90, we don't have to rely on the (expensive)
validator. We can just check that ourselves.
 2019-02-19 15:42:51 +01:00
Simon Edwards
ebc3537537
Merge pull request #5325 from Ultimaker/CL-1222_improve_cloud_flow_toggle 
Improve "don't ask me again" checkbox
 2019-02-19 15:31:38 +01:00
Ian Paschal
7b3420653e Actually, just hide manage queue on cloud 
Contributes to CL-1247
 2019-02-19 12:27:41 +01:00
Ian Paschal
0ef014a542 Don't show "Review Connection" unless you're on the LAN 
Contributes to CL-1247
 2019-02-19 12:24:04 +01:00
Ian Paschal
b6b7f8cfce Disable queue link when connected to cloud 
Contributes to CL-1247
 2019-02-19 12:23:48 +01:00
Ian Paschal
e23dd2dd6b Grey-out buttons when using cloud connection 
Contributes to CL-1247
(includes some boyscoutin')
 2019-02-19 12:23:33 +01:00
Ghostkeeper
fe9d106332
Remove debug prints 2019-02-19 11:48:10 +01:00
Ian Paschal
05b5dfa05f Improve "don't ask me again" checkbox 
Contributes to CL-1222
 2019-02-19 10:13:05 +01:00
Lipu Fei
64150cc7cf Merge remote-tracking branch 'origin/4.0' 2019-02-18 13:52:27 +01:00
Ian Paschal
0cfc258b8d
Merge pull request #5316 from Ultimaker/fix-cloud-printer-properties 
CL-1255 Manually create printer properties for cloud output device
 2019-02-18 13:33:44 +01:00
Jaime van Kessel
222f8e6cdb Prevent crash for backup plugin if there is no internet connection 2019-02-18 10:38:39 +01:00
ChrisTerBeke
f25fefdbcb Add expected mesh back to test 2019-02-15 17:24:03 +01:00