GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-13 10:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,832 Commits 290 Branches 260 Tags
Commit Graph

22832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Dimitriovski
e7ed93c132
fixed typing 
CURA-7090
 2020-01-21 14:51:53 +01:00
Nino van Hooff
1287ebdc51 Change backgroundColor and margin for licenseDialog 
CURA-7129
 2020-01-21 14:43:02 +01:00
ninovanhooff
d86b1bec2e
Merge pull request #7003 from Ultimaker/ci_invalid_import_checker 
ci_invalid_import_checker
 2020-01-21 12:38:54 +01:00
Dimitriovski
8abaa60052
Passed the sdk_version to the reevalute() function 
CURA-7090
 2020-01-21 11:24:31 +01:00
konskarm
d8abd24bfe
Merge pull request #6992 from Ultimaker/CURA-6984_decline_sync 
CURA-6984_decline_sync
 2020-01-21 10:47:22 +01:00
Ghostkeeper
5d21872e50
Take nozzle offsets into account when placing prime tower 
extruderValues('machine_nozzle_offset_x') := [0, 20, -18]
map(abs(extruderValues('machine_nozzle_offset_x') := [0, 20, 18]
max(map(abs(extruderValues('machine_nozzle_offset_x') := 20

So we take the highest offset of all extruders to get the area that can be reached by all extruders. And we take the abs() of all extruder values because positive or negative only means that the other extruders get offset in the same direction.

Fixes #6997.
 2020-01-21 10:31:47 +01:00
jos@mauk.cc
5e50211587 HMS434 update 
material flow
 2020-01-21 10:29:15 +01:00
Dimitriovski
365c30fadb
Added check to reevaluate dismissed incompatible packages (in case the package gets updated and has the correct SDK version) 
CURA-7090-addition
 2020-01-21 09:52:33 +01:00
Mark Burton
856f998e24 Added Hole Horizontal Expansion setting. 2020-01-21 08:35:24 +00:00
Nino van Hooff
2e20bf6a98 Update invalid imports checker documentation 
Makes it consistent with other checkers we already have
 2020-01-20 16:35:32 +01:00