GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 14:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,520 Commits 295 Branches 268 Tags
Commit Graph

25520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
867b3ba31e
Merge branch 'master' of https://github.com/NilsRo/Cura into NilsRo-master 2021-06-01 15:58:09 +02:00
Jaime van Kessel
fc87c6a90c
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-01 11:41:16 +02:00
Jaime van Kessel
4f49a38168
Fix pre-heat button being ocluded by tooltip 
Fixes #9891
 2021-06-01 11:40:20 +02:00
Ghostkeeper
0f23dd714e
Merge branch 'CURA-8267_remove_new_icons' 2021-05-31 16:05:29 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons" 
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
 2021-05-27 16:06:20 +02:00
Jaime van Kessel
38ce22ba7c
Revert "Fix typo in icon name" 
This reverts commit 12a98388d9fd00cd9e3b85a2ea060d6c8c9a215e.
 2021-05-27 16:03:13 +02:00
Jaime van Kessel
119a957e7f
Revert "Add list for deprecated icons" 
This reverts commit 34f75839c4811eeae946c2fb1c122569c1e75d7a.
 2021-05-27 16:03:03 +02:00
Jaime van Kessel
760726cf0b
Revert "Add Function icon" 
This reverts commit 5ad9cd4845ba286687e2bf0e74e947f219b384b9.
 2021-05-27 16:02:53 +02:00
Jaime van Kessel
26afff6093
Revert "Switch out inherit icon" 
This reverts commit 672d6c89cf6b12b01fe27c28622806310b063968.
 2021-05-27 16:02:46 +02:00
Jaime van Kessel
6483db3d47
Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura" 
This reverts commit 90eb2bfbdcc66fdbf82b0e1dac6bcf1a536845b0, reversing
changes made to 91c4d8b5f2cf3c18df2f75a0161f727eeae1bf41.
 2021-05-27 16:01:17 +02:00
Ghostkeeper
8e12d49160
Merge branch 'master' of github.com:Ultimaker/Cura 2021-05-27 15:21:38 +02:00
Jaime van Kessel
6ec61a6a11
Merge branch 'fix_authdata_infinite_loop' of https://github.com/fieldOfView/Cura 2021-05-25 16:01:25 +02:00
fieldOfView
be06108f36 Fix an crash when starting Cura without a network connection 2021-05-24 18:43:05 +02:00
Humsie
21baf90ec8
Add Z Position parameter to FilamentChange (#9658) 
* Add Z Position

* PR Comment: Add minimum value for z_position

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-05-21 17:02:53 +02:00
Remco Burema
0e95a4612a
Merge pull request #9856 from Ultimaker/CURA-8232_measure_file_type_usage 
Add source file type to anonymous usage statistics
 2021-05-21 14:05:30 +02:00
Ghostkeeper
48d1715c2d
Also remove other transformations when getting the center position 
The other transformations, in particular rotation, were also influencing the merge. The transformations were not removed when calculating the center position, causing the center position of a mesh to be calculating differently. When the meshes were actually transformed/moved, all of the transformations were removed but this gave the model a different center position. The different center position wasn't properly being compensated for using the previously calculated center position.

Fixes CURA-7873.
 2021-05-21 13:45:51 +02:00
Ghostkeeper
6eeb135672
Fix calculating AABBs if group nodes are involved 
The position of the group node should in theory never be included.
We'll return that position only if there is no mesh data and all children have no AABB either. In that case we'll return a degenerate AABB so that handling code has something to work with. But then also make sure that those degenerate AABBs are ignored if we want to get the AABB of a parent node.

Contributes to issue CURA-7873.
 2021-05-21 13:30:53 +02:00
Vandresc
4936ff54d2
Merge pull request #9855 from Ultimaker/CURA-8233_filter_images_from_digital_factory 
Filter images from DF open screen
 2021-05-21 08:41:51 +02:00
Jaime van Kessel
cfb32bfd50
Also notify layercolor changed if the feedrate with extrusion changed 
CURA-8196
 2021-05-19 16:44:49 +02:00
Jaime van Kessel
de07286900
Change logger severity of log 
CURA-8196
 2021-05-19 16:38:55 +02:00
Jaime van Kessel
87fe4555ce
Merge branch 'inat_defs_fixes' of https://github.com/MarkINAT/Cura 2021-05-19 15:32:40 +02:00
Jaime van Kessel
a49627a1f7
Remove unneeded declaration 
CURA-8196
 2021-05-19 11:10:25 +02:00
Jaime van Kessel
a9970800f6
Don't use travel moves to calculate max flow 
CURA-8196
 2021-05-19 11:03:29 +02:00
Ghostkeeper
9a7b19f8ac
Only upgrade stacks based on TwoTrees printers 
Both extruder stacks and global stacks though.

Contributes to issue CURA-8212.
 2021-05-18 17:37:08 +02:00
Ghostkeeper
a00b21a802
Be more robust to broken input files 
We've seen from experience that people do end up with broken files, due to user-modifications and whatnot. Corrupting it further won't make things better for the user.

Contributes to issue CURA-8212.
 2021-05-18 17:37:08 +02:00
Jaime van Kessel
6f5c3a0c4c
Merge branch 'master' of github.com:Ultimaker/Cura 2021-05-18 16:19:34 +02:00
Jaime van Kessel
5bfb0fc437
Use properties instead of slots for min & max flow 
This fixes some update issues in the simulation view display

CURA-8196
 2021-05-18 16:18:45 +02:00
Ghostkeeper
0ee9cbd9ee
Merge branch 'CURA-8246_repetier_pause_at_height_fix' 2021-05-18 16:14:37 +02:00
Jaime van Kessel
45f8f3ba3c
Remove some code duplication in DF image filtering 
CURA-8233
 2021-05-18 15:52:06 +02:00
Ghostkeeper
5d3b442efb
Remove debugging print statement 
Don't know how this passed code review. I think I was the one to review it, too.
 2021-05-18 13:41:36 +02:00
Remco Burema
4d4427ce79
Extrusion should be retraction. 
Should fix #9752 aka internal ticket CURA-8246 -- This makes the repetier case completely analogous to the other 'not-griffin' flavours (at least what concerns retraction amounts), and also neatly dove-tails with the first point things start to go wrong in the bug-report.
 2021-05-18 13:21:34 +02:00
Jaime van Kessel
e9d1e91ec2
Convert identation to spaces for line_length_checker script 2021-05-18 11:40:14 +02:00
Jaime van Kessel
0ddc6e1c58
Add line length checker script 2021-05-18 11:37:16 +02:00
Ghostkeeper
9e136eb499
Serialise MIME type name rather than entire MIME type 
So we don't get the bracket syntax from its repr, just the MIME type itself.

Contributes to issue CURA-8232.
 2021-05-18 11:08:06 +02:00
Ghostkeeper
d4fa1cee45
Fix copying MIME type if scene nodes are copied 
We're not doing this in the nicest way possible...

Contributes to issue CURA-8232.
 2021-05-18 11:07:02 +02:00
NilsRo
c89e186671 Mega X: Fixed Layer Mesh, Optimized qualities 2021-05-17 20:23:51 +02:00
Ghostkeeper
77b7a29fca
Add source file type to anonymous usage statistics 
Contributes to issue CURA-8232.
 2021-05-17 17:54:13 +02:00
Jaime van Kessel
3018485077
Remove stray debug code 
CURA-8233

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-05-17 15:24:46 +02:00
Jaime van Kessel
2a304ce90a
Filter images from DF open screen 
CURA-8233
 2021-05-17 14:12:46 +02:00
Jaime van Kessel
90eb2bfbdc
Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura 2021-05-17 13:49:21 +02:00
Jaime van Kessel
91c4d8b5f2
Fix rendering issue in flow view 2021-05-17 10:37:38 +02:00
Jaime van Kessel
dd952c7f63
Merge branch 'master' of https://github.com/khani3s/Cura 2021-05-17 10:33:32 +02:00
Ghostkeeper
28a7facd1b
Merge branch 'CURA-8212_Add_version_upgrader_for_two_trees_definitions' 2021-05-17 09:55:56 +02:00
Kostas Karmas
9d284d9c6f Use new icon for "Block support overlap" models in the object menu 
CURA-8205
 2021-05-14 10:42:37 +02:00
Kostas Karmas
b5a3bfbf50 Remove old "MeshTypeExclude" icon 
It was used by the "Don't support overlaps" tool in the "Per Model settings" but it is now replaced
by the icon "BlockSupportOverlaps"

CURA-8205
 2021-05-14 10:10:56 +02:00
Kostas Karmas
7feba68847 Add new icon for block support overlaps 
CURA-8205
 2021-05-14 09:16:43 +02:00
Kostas Karmas
8014f11d6b Add missing entry to the deprecated_icons dict 
CURA-8205
 2021-05-14 09:11:27 +02:00
Ghostkeeper
3c4d0b6ecd
Add missing type to lowestPrintableHeight variable 
Otherwise it should theoretically default to int, which is wrong. However with some graphics drivers it just seems to result in a failure to compile and concluding with a crash and crescendo.

Fixes #9692.
 2021-05-12 13:26:10 +02:00
Ghostkeeper
1cab9cb567
Clarify description of Max Comb Distance With No Retract 
It wasn't really clear that a value of 0 essentially equates to not having any maximum (like setting it to infinity).
 2021-05-11 15:35:14 +02:00
Kostas Karmas
7ec66bfe42 Update setting version of Strateo3D quality profiles to 17 
CURA-8212
 2021-05-11 14:29:12 +02:00