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

22542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Szymon Gamża
4ea408c86b Changed name of machine cause of orion.de 2020-02-13 08:56:08 +01:00
Szymon Gamża
508b08ff0d Fixed default_value/value overrides. 2020-01-29 08:30:21 +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
Szymon Gamża
7e74c243bd Changed max chamber temp for machines 2020-01-27 14:49:16 +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
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
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
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
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
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
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
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
Nino van Hooff
b830a6faa3 Rewrite invalid imports checker to Python 
Makes it consistent with other checkers we already have
 2020-01-20 16:24:26 +01:00
Jaime van Kessel
06ccd882e1
Add missing typing 
CURA-6627
 2020-01-20 16:03:56 +01:00
Jaime van Kessel
52ce106399
Change _loadMetadata to be static 
CURA-6627
 2020-01-20 15:37:57 +01:00
Jaime van Kessel
bee641da5a
Remove local import of json 
CURA-7005
 2020-01-20 15:30:23 +01:00
MakeIt3D
39780636a9 Add MAKEiT Pro-MX Profile (#6983) 
CURA-7125
 2020-01-20 14:53:48 +01:00
Ghostkeeper
92926cfc21
Revert "Limit retraction_combing_max_distance to be no lower than retraction_min_travel" 
This reverts commit 3b1e88e49c005657e463f6c76c505ad253ce8636.
It was changing the default behaviour for these printers.

Contributes to issue CURA-6860.
 2020-01-20 10:47:46 +01:00
Ghostkeeper
8f6fb5e007
Revert "Properly override retraction_combing_max_distance" 
This reverts commit 5ddee1e70fbc2bec6b8ccc1531d146f7d79cec1b. It was changing the default behaviour for this printer.

Contributes to issue CURA-6860.
 2020-01-20 10:46:55 +01:00
Ghostkeeper
5ddee1e70f
Properly override retraction_combing_max_distance 
Since by default it now defines a value for this one rather than default_value, this override had broken. Thank you, tests.

Contributes to issue CURA-6860.
 2020-01-20 09:51:30 +01:00
Nino van Hooff
66105e8a3a Add invalid imports checker 
Since plugins.* is not available on the PATH for some builds,
they should not be used. Relative imports are preferred
 2020-01-20 09:51:22 +01:00
Ghostkeeper
3b1e88e49c
Limit retraction_combing_max_distance to be no lower than retraction_min_travel 
Retraction_min_travel overrides retraction_combing_max_distance in CuraEngine, so it has no effect to make it any lower.

Contributes to issue CURA-6860.
 2020-01-20 09:41:48 +01:00
Nino van Hooff
b03be75a13 Show error messages for cloud flow errors 
- failed downloads
- failed installs

CURA-6984
 2020-01-17 13:54:39 +01:00
Nino van Hooff
9dd50c8804 Replace buttons by PrimaryButtons for cloud sync dialogs 
CURA-6984
 2020-01-17 13:54:39 +01:00
Nino van Hooff
4e8534b93b Unsubscribe from package when a license is declined (cloud flow) 
CURA-6984
 2020-01-17 13:54:39 +01:00
Ghostkeeper
0e5654e44b
Guard against selection pass not existing yet 
It could happen that the selection pass is not initialised because you're right clicking on the screen before the first render has happened.

Hopefully this fixes #6976.
 2020-01-17 13:09:19 +01:00
ninovanhooff
8bf7666493
Merge pull request #6986 from Ultimaker/CURA-7027_Add_more_materials_from_Marketplace_button 
Cura 7027 add more materials from marketplace button
 2020-01-16 16:26:38 +01:00
ninovanhooff
4b60da6802
Update resources/qml/Actions.qml 
Remove redundant icon from marketplaceMaterialsAction
 2020-01-16 16:26:15 +01:00