GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-20 10:19:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
35,982 Commits 295 Branches 268 Tags
Commit Graph

7710 Commits

Author SHA1 Message Date
Jaime van Kessel
8269ae9501
Use base_file to check if a material is known 
Fixes #7490
 2020-04-14 09:49:34 +02:00
fieldOfView
dbc4c69142 Show correct number of settings for support and anti overhang meshes 2020-04-13 09:51:54 +02:00
fieldOfView
a3dea81d7d Fix typing 2020-04-12 16:11:52 +02:00
fieldOfView
4f0c24fecb Reorder code for readability 2020-04-12 09:24:41 +02:00
fieldOfView
ea805d9a02 Hide extruder swatch for groups 2020-04-11 20:55:35 +02:00
fieldOfView
e13a0bca4a Add extruder swatches to object selector 2020-04-11 20:48:06 +02:00
fieldOfView
2eeabec317 Show support extruder for support meshes 2020-04-11 20:39:21 +02:00
fieldOfView
bba07d01fb Show mesh type and number of per model settings in ObjectSelector 2020-04-10 19:13:36 +02:00
Jaime van Kessel
d0901c91f7
Update some documentation to the new style 2020-04-10 14:05:17 +02:00
Jaime van Kessel
2e9dca71ce
Remove a number of unused imports 2020-04-10 13:58:10 +02:00
Jaime van Kessel
fe27da5e8a
Remove a number of unused variables 2020-04-10 13:46:19 +02:00
Nino van Hooff
ea00ff3c47 Update wording for authorization server error message 
CURA-7346
 2020-04-09 16:59:43 +02:00
Ghostkeeper
54b6c2a54e
Merge branch '4.6' 2020-04-09 12:55:50 +02:00
Ghostkeeper
953630ad0b
Be robust against some objects not having an extruder assigned 
This could happen for instance when a plug-in adds a model.

Fixes Sentry issue CURA-GR.
 2020-04-09 12:55:07 +02:00
Ghostkeeper
c79d7d89b3
Merge branch '4.6' 2020-04-09 11:29:27 +02:00
Jaime van Kessel
cfc2cc3692
Fix crash when printer definition could not be found 2020-04-08 17:14:58 +02:00
Jaime van Kessel
7a11a183a8
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-08 17:02:26 +02:00
Jaime van Kessel
caa348265d
Add check to prevent unknown materials from being active 
This should really resolve the key error for anycubics
 2020-04-08 17:00:11 +02:00
Jaime van Kessel
e21262f0b3
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-08 16:33:20 +02:00
Nino van Hooff
74253e420a
Merge pull request #7441 from Ultimaker/xray_in_solid_sidequest 
CURA-7262 X-Ray in solid-view (colors instead)
 2020-04-08 15:45:00 +02:00
Jaime van Kessel
849e012756
Gracefully handle binding erorr for local OAUTH2 Server 
CURA-7346
 2020-04-08 13:08:12 +02:00
Nino van Hooff
e43768ebde Revert "Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"" 
This reverts commit 4f55c8d8
 2020-04-08 11:06:31 +02:00
Ghostkeeper
3d399672d0
Select default extruder if a setting has an extruder nr that's not available 
Fixes Sentry issue CURA-G2.
 2020-04-07 13:45:41 +02:00
Ghostkeeper
ea31d9d41b
Don't crash on moving empty groups down to build plate 
Empty groups don't have a bounding box. I don't know how an empty group could've gotten there but maybe there is something happening with a plug-in or something.

Fixes Sentry issue CURA-FM.
 2020-04-07 13:16:48 +02:00
Ghostkeeper
01ec607d40
Merge branch '4.6' 
Conflicts:
	resources/texts/change_log.txt: Both modified but had different wording for the pause-at-height bugfix with motor timeout. I used the wording in 4.6 since it was more extensive.
 2020-04-06 09:20:18 +02:00
Ghostkeeper
de220a74bc
Don't update build volume when prime Z position is changed 
It doesn't affect the build volume, since we don't need to move the prime blob disallowed area. It is projected onto the build plate after all.
Most likely this won't affect anyone since the prime Z position is a machine setting that can't normally be modified. But hey, it's a bit more precise anyway.

Found during work on the Settings Guide.
 2020-04-06 00:29:48 +02:00
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
Jaime van Kessel
ecd24cb446
Merge branch 'simplify_test_v2' of github.com:Ultimaker/Cura 2020-04-03 13:25:01 +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
Jaime van Kessel
c6dfb6e4cf
Set FirmwareUpdater in error state if file is empty 
CURA-6Q
 2020-04-02 16:44:18 +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
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
Ghostkeeper
e2e69f6646
Increment setting version to 13 
Contributes to issue CURA-7282.
 2020-04-01 15:14:01 +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
Ghostkeeper
2ee3e5b386
Don't remove machines that don't exist 
Fixes Sentry issue CURA-EM.
 2020-03-30 14:10: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
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
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
Ghostkeeper
0150f37937
Merge branch 'master' into xray_in_solid_view 2020-03-24 21:45:48 +01:00
Remco Burema
c20b2c6ee0
Merge pull request #7211 from Ultimaker/CURA-7150_proper_http_request_headers 
CURA-7150_proper_http_request_headers
 2020-03-24 11:25:07 +01:00
Ghostkeeper
566af8be2e
Don't crash when importing definition files as materials 
Reproduction steps:
* In the Material Manager, click on 'Import material'.
* Change the file type in the file dialogue to 'All files'.
* Select any .def.json file, for example from Cura's own resources/definitions folder.

Previously this crashed the application. Now it shows the user an error message instead.

Fixes Sentry error CURA-D4.
 2020-03-23 09:06:20 +01:00
fieldOfView
d00ec619f5 Remove unused imports 2020-03-22 18:58:16 +01:00
fieldOfView
138dbddb10 Restore the SettingDefinition relations without killing a puppy 2020-03-22 18:51:43 +01:00
fieldOfView
6e09e9821f Show support settings when support meshes are present in the scene 2020-03-22 18:23:32 +01:00