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

23065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nino van Hooff
4f55c8d832 Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects" 
This reverts commit 3e46489b6ba3ae0baab347b26ceb036c1a47007d, reversing
changes made to f5669a5a277042266f9b92314948a5cfb75f58ea.
 2020-04-03 15:31:08 +02:00
Nino van Hooff
3e46489b6b
Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects 
Cura 7333 fix reloading 3mf files with many objects
 2020-04-03 12:41:22 +02:00
Kostas Karmas
4495cea8a4 Remove type of job to avoid type error 
If the type of the job is mentioned, the CI/CD system complains about
reading the "private" variable _node of the job.

CURA-7333
 2020-04-03 11:20:09 +02:00
Kostas Karmas
8eb48672e1 Use the node id as identifier 
Now that libSavitar allows us to read the object id from the 3mf file,
this id will be propagated as an id inside CuraSceneNodes and it will
be used as an identifier to find the object that has to be refreshed.

CURA-7333
 2020-04-03 11:05:38 +02:00
Ghostkeeper
f5669a5a27
Merge branch 'CURA-7340_fix_simulation_slider_layout' into 4.6 2020-04-02 17:20:45 +02:00
Jaime van Kessel
6df2f84c07
Prevent crash when releasing released lock 
CURA-C2
 2020-04-02 16:51:32 +02:00
Jaime van Kessel
c6dfb6e4cf
Set FirmwareUpdater in error state if file is empty 
CURA-6Q
 2020-04-02 16:44:18 +02:00
Nino van Hooff
9d9753cb45 Fix: Using onCompleted would break the binding. So Use a Binding instead 2020-04-02 16:31:29 +02:00
Nino van Hooff
6d56b52913 Revert "Fix binding loop in action panel widget" 
Fix improper player slider layout which was introduced in 5cfe71e5
 2020-04-02 15:15:05 +02:00
Tom Hofman
f3927115d6
Infill wipe distance reduced 
Since it was protruding the shell
 2020-04-02 09:45:11 +02:00
Kostas Karmas
5bdcc2e5ba Add type to objects_in_filenames 
CURA-7333
 2020-04-01 18:41:04 +02:00
Kostas Karmas
99a762bcb9 Avoid warning for object in position 0 
CURA-7333
 2020-04-01 17:42:26 +02:00
Remco Burema
175121e86c
Fix add printer scrollview overlaps buttons. 
CURA-7336
 2020-04-01 17:31:23 +02:00
Kostas Karmas
97199d72ad Reload nodes based on object index 
Refactored the code in order to extract the index of the node inside
the file and then use that index to reload the correct object from the
file.

CURA-7333
 2020-04-01 17:08:30 +02:00
Kostas Karmas
b118a46630 Remove TODO message from 3mf reload function 
CURA-7333
 2020-03-31 18:02:13 +02:00
Kostas Karmas
134541ee6e Fix reloading multiple objects from 3mf file 
CURA-7333
 2020-03-31 17:57:23 +02:00
konskarm
cbccb08103
Merge pull request #7370 from Ultimaker/CURA-7328_remove_unused_machine_settings 
Remove unused machine settings
 2020-03-31 14:41:41 +02:00
Kostas Karmas
189c734145 Changed wrapMode to WordWrap, similar to master 
CURA-7332
 2020-03-31 11:41:03 +02:00
Kostas Karmas
6b6446e201 Wrap the restart prompt text in Marketplace 
CURA-7332
 2020-03-31 11:22:07 +02:00
Jaime van Kessel
329c5c5c11
Rename pause duration to disarm timeout and set default to give same behavior as before 
The name wasn't really covering what it was doing. It wasn't setting the duration of the
pause, it was setting the timeout for the stepper disarm.
Also, ive set the defaults so that the behavior remains the same, unlesss a user
explicitly enables this

CURA-7331
 2020-03-30 17:20:59 +02:00
Jaime van Kessel
4682b9c4ae
Merge branch 'pp-plugin_pause-a-h_disarm' of https://github.com/ilyko96/Cura 2020-03-30 17:12:54 +02:00
konskarm
95cefbe895
Merge pull request #7368 from maukcc/master 
HMS434 update
 2020-03-30 15:53:09 +02:00
konskarm
bba6a5cc39
Merge pull request #7144 from Ultimaker/CURA-7162/replace_robot_with_placeholder 
CURA-7162/Replace the default logobot.svg with a new placeholder
 2020-03-30 15:05:37 +02:00
Ghostkeeper
2ee3e5b386
Don't remove machines that don't exist 
Fixes Sentry issue CURA-EM.
 2020-03-30 14:10:59 +02:00
Ghostkeeper
f34edd6bec
Show error when we don't have permission to write workspace 
Fixes several Sentry issues, among which Cura-EG.
 2020-03-30 14:00:36 +02:00
Ghostkeeper
6063307a31
Remove overrides of unused machine setting 
Contributes to issue CURA-7328.
 2020-03-30 12:10:35 +02:00
Ghostkeeper
40fc064e98
Don't remove Nozzle Length 
Turns out this one was used: As default for the wire printing height.

Contributes to issue CURA-7328.
 2020-03-30 12:10:01 +02:00
Ghostkeeper
b5dfcdd482
Remove Nozzle Length and Filament Park Distance from the settings list 
Implements CURA-7328.
 2020-03-30 12:00:59 +02:00
Ghostkeeper
8422172000
Increment setting version to 12 
This is necessary for the version upgrade to run.

Contributes to issue CURA-7328.
 2020-03-30 11:54:18 +02:00
Ghostkeeper
bdb3c4bcad
Add version upgrade plug-in to remove settings 
Contributes to issue CURA-7328.
 2020-03-30 11:48:38 +02:00
Ghostkeeper
be85e6d75e
Merge branch 'fieldOfView-feature_object_name' 2020-03-30 09:32:27 +02:00
maukcc
b92d0a83ac HMS434 update 2020-03-29 14:21:57 +02:00
Jaime van Kessel
c1de3d49bb
Merge branch 'CURA-7325_fix_config_error_on_restore_backup' of github.com:Ultimaker/Cura 2020-03-27 14:44:03 +01:00
konskarm
cc365c23e1
Merge pull request #6994 from Ultimaker/ppscript_pre_secure 
Prepare PostProcessingPlugin for security.
 2020-03-27 13:31:08 +01:00
Remco Burema
380e377cf3
Scout some documentation to docstring. 
part of CURA-7325
 2020-03-26 18:26:14 +01:00
Remco Burema
3c50b78e68
Fix: Definitions could be partly saved between backup restore and quit. 
part of CURA-7325
 2020-03-26 18:19:47 +01:00
Ghostkeeper
afea4a76e7
Merge branch 'feature_object_name' of https://github.com/fieldOfView/Cura into fieldOfView-feature_object_name 2020-03-26 17:39:25 +01:00
Nino van Hooff
0841124389
Merge pull request #7344 from Ultimaker/CURA-7310_Template_export_inkection_call_custom_openUrl 
Cura 7310 template export injection call custom open url
 2020-03-26 15:40:39 +01:00
Ghostkeeper
92691f68b6
Reduce retraction at the end of all Anet g-code 
Multiple people have found this to work better.

Fixes #7275.
 2020-03-26 14:47:41 +01:00
Ghostkeeper
fd8c29ebbf
Merge branch 'master' of github.com:Ultimaker/Cura 2020-03-26 14:15:51 +01:00
Ghostkeeper
ae9f2b4ba9
Catch TopologicalError when calculating convex hull intersection 
Apparently this can happen. I don't know what shapes this happens with though. I'm guessing it's got something to do with degenerate shapes.

Fixes Sentry issue CURA-DZ.
 2020-03-26 14:15:38 +01:00
Remco Burema
e664eccb8d
Merge pull request #7299 from Ultimaker/CURA-7173_validate_uploads 
CURA-7173_validate_uploads
 2020-03-26 12:05:19 +01:00
Nino van Hooff
ddd7d15287 Attempt to appease mypy 2020-03-26 09:45:26 +01:00
Nino van Hooff
3bb3b69082 Attempt to appease mypy 2020-03-25 17:32:41 +01:00
Nino van Hooff
92f278acc8 Change trusted scripts path from resources to plugin/scripts 
CURA-7319
 2020-03-25 16:54:43 +01:00
Nino van Hooff
6bf00d7ea1 Merge branch 'master' into ppscript_pre_secure 2020-03-25 16:25:44 +01:00
Ghostkeeper
433c9a9f60
Add SVGToolpathReader to gitignore 
I like to have no untracked files in my list. This is not going to get into our source repository anyway!
 2020-03-25 16:08:26 +01:00
Jaime van Kessel
dec68002bc
Use patch.object to temporarily replace mock a function call 
CURA-7319
 2020-03-25 12:35:15 +01:00
Jaime van Kessel
d5b58cf3b4
Add missing typing 2020-03-25 11:47:38 +01:00
Ghostkeeper
2b003c30dc
Catch PermissionError when writing workspaces 
We'll want to give a proper error message then. We have no mechanism right now to show a message on the screen particular to this error. Instead we'll let it fail (the user sees a message that writing fails) and put a message in the log why it failed.

Fixes Sentry error CURA-DK.
 2020-03-25 09:12:14 +01:00