8344 Commits

Author SHA1 Message Date
Jaime van Kessel
fb09e55b02 Fix typing
CURA-8723
2021-12-02 15:07:50 +01:00
Jaime van Kessel
9f6dacfced Merge branch 'feature_project_thumbnail' of git://github.com/fieldOfView/Cura 2021-12-02 14:37:14 +01:00
Remco Burema
f5604dfb1e
Add 'capabilities' to ignored metadata.
part of CURA-8671
2021-12-02 12:23:57 +01:00
Remco Burema
1253b41537
Only perform materials-sync-job for capable printers.
part of CURA-8671
2021-12-02 12:22:55 +01:00
fieldOfView
0a906accec Add thumbnail to all 3MF files, and add relation and content-type metadata 2021-12-01 21:49:12 +01:00
fieldOfView
0813f27389 Add a thumbnail to 3mf projects 2021-11-30 18:09:41 +01:00
Jaime van Kessel
b7af37022a Fix vesion update for beta 1 to beta 2
WHoops! Reviewed by Jelle ;)
2021-11-26 15:13:50 +01:00
Ghostkeeper
1df859e046
Catch IndexError when logging errors
And log that error too, then.

Fixes Sentry issue CURA-32J.
2021-11-23 19:04:33 +01:00
Ghostkeeper
2f1c157547
Don't attempt writing a workspace before there is a global stack
This is normally not possible from the interface. However on MacOS, the application menu gets carried to the top bar of the operating system. It is not blocked there, and the user could write a project file before they even add a printer. This prevents Cura from crashing when they do that.

Fixes Sentry issue CURA-2ZR.
2021-11-23 17:54:26 +01:00
Ghostkeeper
cecd033430
Merge branch 'CURA-8541_Aborted_state_not_reflected_correctly_in_Cura_Monitor_Page' 2021-11-23 16:28:46 +01:00
Jelle Spijker
8427555d6a
Merge pull request #10901 from Ultimaker/CURA-8539_oauth_via_httprequestmanager
OAuth via HttpRequestManager
2021-11-23 13:59:45 +01:00
Remco Burema
ac8d5fc12c
More explicit float's in shader just to be sure.
CURA-8714
2021-11-23 09:27:25 +01:00
Ghostkeeper
3f92b46ac8
Don't restart refresh token while it's already processing
If two requests to the API occur at the same time, they will both see at the same time that they need an access token, and if it is expired they will both see that it needs refreshing. The server then sees two refreshes, both with the same refresh token. This is not allowed. The second one then gets a failure to refresh the token, which causes the user to log out.
Instead, we'll stop one of the refresh requests. They were fire-and-forget anyway, so it's not needed to actually continue the request.

Contributes to issue CURA-8539.
2021-11-22 18:52:43 +01:00
casper
6be0d58039 Add handling of missing printJob status cases
The `printJob` now also contains a status for detecting aborted prints
that were awaiting cleanup, preventing the need for the additional
checks in the `await_cleanup` status.
2021-11-19 17:22:13 +01:00
fieldOfView
c6b6af668d Fix shader compilation on some GPUs
Some GPUs (rightly) complain about the difference between a float and an int. Fixes #10837
2021-11-18 08:04:14 +01:00
Jaime van Kessel
cefffe62cd Remove most of controls 1 references from networking plugin 2021-11-16 15:26:23 +01:00
Remco Burema
c2ed0a9181
Workaround for if layer is None somehow. 2021-11-16 12:40:56 +01:00
Remco Burema
f0cb9dd39e
Workaround for if layer is None somehow. 2021-11-16 12:33:29 +01:00
Jaime van Kessel
82e2f038ac Convert more items to controls 2 for toolbox 2021-11-16 10:23:32 +01:00
Jaime van Kessel
ef9b5506ce Convert postprocessing plugin to controls 2 2021-11-16 10:07:58 +01:00
Jelle Spijker
cc92a9dc1c
Merge pull request #10841 from Ultimaker/master
Merge master into libArachne
2021-11-16 08:04:41 +01:00
Ghostkeeper
5e60cc6208
Merge branch 'bremco-graphics_buffer_update' 2021-11-15 15:20:10 +01:00
Ghostkeeper
dc28370178
Remove implicit casts and comparisons of int to float
We can't change this index to an integer, because varying variables can't be integer, even though this variable will only really be tested on vertex level. Not sure if varying was the right choice, but I don't want to change that.
This prevents a crash, probably only occurring on certain GPUs.

Contributes to issue CURA-8657.
2021-11-15 15:19:57 +01:00
Ghostkeeper
b8ccb32836
Merge branch 'master' into libArachne_rebased
Conflicts:
	resources/definitions/ultimaker2.def.json -> Additions in Arachne around a place where we fixed an enum setting.
	resources/definitions/ultimaker3.def.json
	resources/definitions/ultimaker_s3.def.json
	resources/definitions/ultimaker_s5.def.json
2021-11-12 15:08:29 +01:00
Jaime van Kessel
75cd792b00 Convert Layerview component to controls 2 2021-11-11 16:51:03 +01:00
Jaime van Kessel
99a5aa363f Remove unused controls imports 2021-11-11 16:28:20 +01:00
Jaime van Kessel
c22db1e654 Convert FW updater to controls2 2021-11-11 16:25:25 +01:00
Jaime van Kessel
980ac986df Let DiscoverUM3Action use controls 2 2021-11-11 15:59:51 +01:00
Jaime van Kessel
a68584cda1 Replace more instances of label with UM.Label 2021-11-10 17:42:23 +01:00
Jaime van Kessel
8195b9be28 Remove more references to old controls 2021-11-10 17:30:42 +01:00
Jaime van Kessel
ea8969fe4e Remove multiple references to controls 1 2021-11-10 17:24:28 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jaime van Kessel
0bb09a4783 Replace all old controls 1 comboboxes with UM.Combobox 2021-11-10 14:57:01 +01:00
Remco Burema
51c5572f0f
Add draw-range behaviour to legacy-mode shaders. 2021-11-08 21:39:12 +01:00
Remco Burema
f486177465
Remove dead (shader) code.
These shader (files) are now only used for compatability mode. The 'modern' code is found in the '...3d.shader' versions of these files.
2021-11-08 21:37:57 +01:00
Ghostkeeper
dcf78b4885
Merge branch '4.12'
Conflicts:
	resources/i18n/de_DE/fdmprinter.def.json.po -> German translations got some fixes in master while we also updated the new translations for 4.12.
2021-11-08 13:55:09 +01:00
Ghostkeeper
db637802bd
First translate, then process replacement keys
If we first process the replacement keys, the replaced string can't be found in the translation database, so you don't get a translation of the phrase 'Finishes x at y'.

Fixes #10718.
2021-11-08 13:49:54 +01:00
Jaime van Kessel
561d0784f8 Merge branch 'CURA-8522_pause_extrusion_interruption' of github.com:Ultimaker/Cura 2021-11-08 10:23:49 +01:00
Remco Burema
4f20dc4c5d
Add documentation. 2021-11-07 22:26:34 +01:00
Remco Burema
6dff2bebb5
Merge branch 'master' into bremco-graphics_buffer_update 2021-11-07 22:12:17 +01:00
Ghostkeeper
fd5b248296
Don't register a new layer if not extruding a line
We do retracts/unretracts on different heights sometimes, for instance after a pause. This would get seen as a new layer. It's quite safe to say that purely retracts and unretracts on a different height do not constitute a layer in a normal g-code file. There would be nothing to draw anyway.

Contributes to issue CURA-8522. Fixes #10282.
2021-11-05 21:04:37 +01:00
Ghostkeeper
74ff28cbea
Only unretract/retract when necessary for priming
Otherwise this is quite a useless move and would only cause blobs on the print.

Found during work on CURA-8522.
2021-11-05 21:03:03 +01:00
Jelle Spijker
64271d0a0c
Merge pull request #10712 from Ultimaker/fix_undo_redo_support_blocker
Fix undo and redo for support blocker
2021-11-05 09:22:11 +01:00
Remco Burema
89ab394dc0
Code-style, revert unilateral descisions.
- Capitalization for camelCase.
- Indentation.
- We don't really even _have_ a concept of what a 'Beta' for a script is, and this was a unilateral descision from a single contributor instead of validated by the proper channels like QA, V&V, etc.
- Pretty sure that while those labels aren't used _within_ Cura proper, other people (and maybe plugins?) rely on them for (further)post-processing. Also the distinction between CAZO and CAZD was lost.

part of CURA-8655
2021-11-02 09:09:02 +01:00
Remco Burema
e286b17bd9
Merge branch 'master' of https://github.com/legend069/Cura into legend069-master 2021-11-02 08:45:27 +01:00
Jaime van Kessel
cd68434611 Merge branch '4.12' of github.com:Ultimaker/Cura 2021-11-01 11:50:47 +01:00
Jaime van Kessel
366ef4ca06 Fix undo and redo for support blocker
The translate wasn't done via an operation, so it wouldn't go back to the same
state after an undo / redo

Fixes #10648
2021-10-31 17:21:51 +01:00
Jaime van Kessel
87db24f14c Don't check validation for settings in error state
CURA-8656
2021-10-29 10:39:00 +02:00
Remco Burema
ce61f8ef60
Merge branch 'master' into bremco-graphics_buffer_update 2021-10-27 18:47:51 +02:00
Ghostkeeper
88d08b27d1
Merge branch 'master' into CURA-8609_sync_materials_to_printer
Conflicts:
	cura/Machines/Models/MaterialManagementModel.py -> On Master we had temporarily reverted the action of this button because it became apparent that the sync wasn't going to be in 4.12. That revert is no longer necessary if this is merged.
2021-10-27 14:21:05 +02:00