Commit graph

24910 commits

Author SHA1 Message Date
Dirk O. Kaar
58d737a9a9 Retraction hop enable has default value, the height value is fine by default, too. 2020-01-28 11:00:11 +01:00
Szymon Gamża
2817c6921c Deleted id from extruders 2020-01-28 10:20:28 +01:00
Szymon Gamża
9cd91643b5 Added <1MB meshes with proper filename extension 2020-01-28 10:16:01 +01:00
Szymon Gamża
888299603e Deleted old meshes 2020-01-28 10:14:27 +01:00
Szymon Gamża
b2353118c7 Definition changes 2020-01-28 09:57:56 +01:00
Jaime van Kessel
9a9e715e2f
Merge branch 'CURA-6914_Reset_print_sequence_when_reactivating_2nd_extruder' of github.com:Ultimaker/Cura 2020-01-28 09:36:29 +01:00
Nino van Hooff
5cedb2933e Only subscribe when logged in. (When installing a package from toolbox) 2020-01-28 09:31:36 +01:00
Ghostkeeper
305bce5a78
Enforce Cura API to be a singleton
If it's not used that way we want to know about it and fail.

If plug-ins use it this way, the plug-in won't get initialised so it'll be as if the plug-in is disabled or that function doesn't work.

Contributes to issue CURA-7135.
2020-01-27 16:28:26 +01:00
Jaime van Kessel
a706b42782
Disable create & import on materialpage if machine does not support materials 2020-01-27 16:12:26 +01:00
Szymon Gamża
7e74c243bd Changed max chamber temp for machines 2020-01-27 14:49:16 +01:00
ninovanhooff
3a0bd48e1b
Merge pull request #7011 from Ultimaker/CURA-7090-addition
CURA-7090/Added check to reevaluate dismissed incompatible packages
2020-01-27 14:33:13 +01:00
Kostas Karmas
a720939e64 Fix max layer to correspond to starting layer
When the starting layer was set to 0 the max layer was not adjusted
to be max_layer-1.
This commit makes the extra adjustment.
2020-01-27 14:21:51 +01:00
konskarm
e128dadbf5
Merge pull request #6930 from jtychu/master
Update DisplayFilenameAndLayerOnLCD.py
2020-01-27 14:08:26 +01:00
Dimitriovski
a08bea1376
String translate improvements
CURA-7090
2020-01-27 14:00:47 +01:00
Dimitriovski
2e0fef3bd4
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-27 13:25:35 +01:00
Dimitriovski
aa2c612925
PR review changes 2020-01-27 13:25:29 +01:00
Szymon Gamża
2ddeb5dc39 Add ATMAT printers profiles 2020-01-27 12:04:30 +01:00
SzymonGamza
56b244b0aa
Merge pull request #1 from Ultimaker/master
up
2020-01-27 11:57:22 +01:00
Kostas Karmas
bcec433f53 Update description of the Print Sequence setting
Update description to clearly state that Print Sequence is not
possible if more than one extruders are enabled.

CURA-6914
2020-01-24 17:30:46 +01:00
Kostas Karmas
9266c753c3 Reset print_sequence when reactivating extruder 2
The setting print_sequence was not being resetted to all at once
whenever the 2nd extruder was reactivated.
This commit fixes that by explicitly resetting print_sequence
when reenabling an extruder, if it has been changed by the user.

CURA-6914
2020-01-24 17:12:00 +01:00
Jaime van Kessel
61a3122a78
Merge branch 'CURA-7129_license_window_design' of github.com:Ultimaker/Cura 2020-01-24 16:56:23 +01:00
Ghostkeeper
db41a83aa6
Fix mix of whitespace styles: Use spaces instead of tabs
Contributes to issue CURA-7140.
2020-01-24 16:13:15 +01:00
Ghostkeeper
20e410694b
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2020-01-24 16:11:49 +01:00
Ghostkeeper
61d5ace952
Merge branch 'rf100_config' of https://github.com/dok-net/Cura into dok-net-rf100_config 2020-01-24 16:09:09 +01:00
Dimitriovski
537891d80b
Further improvements and refactors to the CloudPackageChecker 2020-01-24 16:05:35 +01:00
Dimitriovski
526cdac200
fixed silly merge conflict 2020-01-24 15:41:13 +01:00
Dimitriovski
38c7d80f82
Refactored the onConfirmClicked function. Added the ability to auto-dismiss the incompatible packages. Changed the button text depending on the displayed list 2020-01-24 15:39:58 +01:00
Remco Burema
40ec88ab70
Merge pull request #7005 from Ultimaker/CURA-6627_Store_extra_data_project_files
CURA-6627_Store_extra_data_project_files
2020-01-24 15:21:04 +01:00
Dimitriovski
d829405347
Update plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py 2020-01-24 14:54:12 +01:00
Ghostkeeper
d31240ad70
Merge branch 'CURA-6627_Store_extra_data_project_files' 2020-01-24 14:53:33 +01:00
Jaime van Kessel
c97ce6fafb
Make the sentry_env a bit smarter 2020-01-24 14:12:03 +01:00
Jaime van Kessel
bd18a539e2
Only update position of label when it's visible
This prevents unneeded re-rendering
2020-01-24 14:04:27 +01:00
Dimitriovski
05e17843c6
Removed previous variants of the dismiss incompatible package functionality
CURA-7090
2020-01-24 13:56:59 +01:00
Dimitriovski
7ee8270b2e
Added the mechanism to dismiss all Incompatible packages when the Compatibility Dialog is closed
CURA-7090
2020-01-24 13:51:49 +01:00
Dimitriovski
ae494110ba
Removed unnecessary line (because we still want to show the Compatability Dialog even if there are only Incompatible packages)
CURA-7090
2020-01-24 11:28:36 +01:00
Dimitriovski
eb3bd811c1
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-24 11:27:05 +01:00
Nino van Hooff
a02e8d3b58 Use display_name for the package name in the license dialog
Implemented for both CloudSync and Toolbox
2020-01-24 10:36:36 +01:00
Jaime van Kessel
57648e2bb0
Merge branch 'CURA-6627_Store_extra_data_project_files' of github.com:Ultimaker/Cura into CURA-6627_Store_extra_data_project_files 2020-01-23 09:29:18 +01:00
Jaime van Kessel
87fb0d7df3
Fix incorrect read location for plugin metadata
CURA-6627
2020-01-23 09:28:28 +01:00
Nino van Hooff
b25d6360ab More documentation for UltimakerCloudScope 2020-01-22 11:53:48 +01:00
Nino van Hooff
1324969dc2 Add some documentation for HttpRequestScope 2020-01-22 11:50:22 +01:00
Nino van Hooff
95def2850d Make license decline button text context-dependant
CURA-7129
2020-01-22 11:17:29 +01:00
Nino van Hooff
3b534ea986 Add icon to licenseDialog (Toolbox flow)
CURA-7129
2020-01-22 10:54:05 +01:00
Nino van Hooff
2f3cf3c493 LicenseDialog layout tweaking
CURA-7129
2020-01-22 10:53:43 +01:00
Nino van Hooff
b3812a3630 Add icon to licenseDialog (clowd flow)
CURA-7129
2020-01-21 17:07:21 +01:00
Kostas Karmas
037e4d5b5f Merge branch 'PurpleHullPeas-add_mp_mini_delta' 2020-01-21 16:59:24 +01:00
Kostas Karmas
c0052ad492 Merge branch 'add_mp_mini_delta' of https://github.com/PurpleHullPeas/Cura into PurpleHullPeas-add_mp_mini_delta 2020-01-21 16:29:53 +01:00
Ghostkeeper
a3825c1f14
Merge branch 'master' into CURA-6627_Store_extra_data_project_files 2020-01-21 15:14:45 +01:00
Dimitriovski
369329c476
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-21 15:08:24 +01:00
Dimitriovski
5c498de1e4
Use meaningful variable name && some TODOs for later.
CURA-7090
2020-01-21 15:07:11 +01:00