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

25733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
cc6191a141
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2021-06-02 15:24:23 +02:00
Jaime van Kessel
6fc1088cdb
Merge branch 'fix_visibilitymenu_style' of https://github.com/fieldOfView/Cura 2021-06-01 16:33:10 +02:00
Jaime van Kessel
4d5894d0c5
Merge pull request #9915 from AiyionPrime/patch-1 
Update Readme regarding irc network
 2021-06-01 16:08:53 +02:00
Jaime van Kessel
942e3106cf
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-01 16:07:38 +02:00
Jaime van Kessel
02a4ade2a5
Fix incorrect icons 
CURA-8267
 2021-06-01 16:07:05 +02:00
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
cb2a7e1daa
Remove plugins that weren't restored in the backup from the installed list 
CURA-8269
 2021-06-01 14:37:12 +02:00
Jaime van Kessel
2d572eef7f
No longer include plugins in the backup 
Backups are synced with your account anyway. Backing up the plugins means that you
quickly reach the limit of the max size (250mb) that the backups allow.

CURA-8269
 2021-06-01 13:34:07 +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
StijnArntz
3e1cc89145 Changed version 16 to 17 
Changed version number 16 to 17
 2021-05-31 09:54:03 +02:00
StijnArntz
e68beabcbe Extra line at end of file 
Added extra line at end of file
 2021-05-31 09:34:47 +02:00
StijnArntz
605e1d1b2f PETG for UM3 
Removed Generic and UM PETG from exclude material list.
Add quality files for PETG on UM3.
 2021-05-31 09:20:00 +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
J. Burfeind
28aa9a1496
Update Readme regarding irc network 2021-05-27 15:56:21 +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
7eba38b286
Check if child bounding box is None before checking if it's degenerate. 
Contributes to issue CURA-7873.
 2021-05-21 13:53:55 +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
Gabriele Rossetti
259c2e718c Merge branch 'master' of https://github.com/kaleidoscopeit/Cura 2021-05-20 22:24:34 +02:00
Gabriele Rossetti
ec7b3ea8f9 Most recent updates 
- Travel avoid supports
- Dual Extrusion : switch_extruder_retraction_amount = 10
- PETg updates
- Reduced infill jerk in "quick" intent and removed useless first layer jerk
- Removed no more used 1.2x material_flow_layer_0 in order to compensate a bad bed leveling
- Rewiewed forced PLA and PETg temperatures
 2021-05-20 22:20:46 +02:00
Gabriele Rossetti
d70e0fde6c - Travel avoid supports 
- Dual Extrusion : switch_extruder_retraction_amount = 10
- PETg updates
- Reduced infill jerk in "quick" intent and removed useless first layer jerk
- Removed no more used 1.2x material_flow_layer_0 in order to compensate a bad bed leveling
- Rewiewed forced PLA and PETg temperatures
 2021-05-20 22:00:31 +02:00
Gabriele Rossetti
be61af6e8c Merge branch 'master' of https://github.com/kaleidoscopeit/Cura 2021-05-20 20:16:35 +02:00
Gabriele Rossetti
89c90c8e0d setting_version to 17 2021-05-20 20:15:19 +02:00
kaleidoscopeit
09e6344c58 setting_version to 17 2021-05-20 17:58:55 +02:00
kaleidoscopeit
eae71a100e setting_version to 17 2021-05-20 17:52:01 +02:00
kaleidoscopeit
59a0625046 Deltacomb configs for VersionUpgrade Plugin 2021-05-20 17:44:53 +02:00
Gabriele Rossetti
69beba448c
Merge pull request #5 from Ultimaker/master 
Update from master CURA Repo
 2021-05-20 17:00:57 +02:00
grigorasalex
7b0ce9fb65 Changed retraction 2021-05-20 15:06:26 +03:00
grigorasalex
3f7cbdb54b Support usb connection and modified cooling fan and retraction settings 2021-05-20 15:00:31 +03:00
fieldOfView
63a2085379 Fix positioning of setting visibility preset menu popup 2021-05-20 12:24:51 +02:00
fieldOfView
6e803c41f4 Add Cura-styled Menu, MenuItem and MenuSeparator controls 2021-05-20 12:20:19 +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