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
28,954 Commits 295 Branches 268 Tags
Commit Graph

28954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joey de l'Arago
16804dfeee
Merge pull request #12411 from Ultimaker/CURA-9297_show_custom_intent_names 
Use intent category if no translation is available
 2022-06-02 10:32:08 +02:00
Ghostkeeper
84e3201db4
Merge branch '5.0' 2022-06-01 15:38:37 +02:00
Remco Burema
d35c862bb8 Prevent run of out-of-install executable in secure context. 
SEC-257 | CURA-8968
 2022-06-01 14:26:44 +02:00
Jaime van Kessel
e6551821aa Use intent category if no translation is available 
Previously we would only accept intents that had a translation. If we
could not find one, we would use "unknown" as the intent category. However,
we didn't really do this consistently. In some places it would show unkown
and in others we'd show the intent type.

This should make the behavior the same across the board. It will try to get a
translation for the intent category and show that. If it's unable to find that
it will use the category instead. Note that it will use the python title function
to ensure it has nice capitalisation

CURA-9297
 2022-06-01 11:07:01 +02:00
Remco Burema
8579a6baf3
Merge pull request #12410 from Ultimaker/CURA-8610_save_package_metadata 
[CURA-8610] Remove website link from package metadata
 2022-06-01 10:17:21 +02:00
j.delarago
61332b0845 Remove website 
CURA-8610
 2022-06-01 10:14:24 +02:00
Remco Burema
6640c5e5f2
Merge pull request #12402 from Ultimaker/CURA-8610_save_package_metadata 
[CURA-8610] Save package metadata
 2022-05-31 17:21:20 +02:00
Remco Burema
aa83c68387 This error is not about materials, not uninstalling. 2022-05-31 17:20:51 +02:00
j.delarago
29b6450704 Add some more information for the unhappy route and a message to inform the user. 
CURA-6990
 2022-05-31 16:30:11 +02:00
Joey de l'Arago
094c781b02
Update plugins/XmlMaterialProfile/XmlMaterialProfile.py 
Co-authored-by: Remco Burema <41987080+rburema@users.noreply.github.com>
 2022-05-31 15:49:57 +02:00
Ghostkeeper
d6bd7cce9e
Oops 2022-05-31 13:39:47 +02:00
j.delarago
ca9955c730 Remove metadata exporting to ufp 
CURA-8610
 2022-05-31 12:43:52 +02:00
j.delarago
ec60325a3f Move metadata exporting to 3mf 
CURA-8610
 2022-05-31 12:39:00 +02:00
Remco Burema
6b04c736e9 Revert "Disable the material sync message again" 
This reverts commit 1f6e1942d775d47dd48be4fd83c5346271827a5e.
 2022-05-31 12:34:55 +02:00
Ghostkeeper
35147d7f5e
Don't crash if machine_extruder_trains metadata is missing 
This old function is only necessary for upgrading from before v3.4. Best not let it crash in any other case, even if that would sometimes make very old machine instances corrupt if I made a mistake in thinking here.

Fixes Sentry issue CURA-3XG.
 2022-05-31 11:24:08 +02:00
j.delarago
64478fb17d Fix typo fetching sdk version 
CURA-8610
 2022-05-31 10:04:23 +02:00
j.delarago
cdc08b5d54 Improve GUID check by parsing xml and getting GUID specifically inside the metadata tag. 
Remove exporting materials from disabled extruders

CURA-8610
 2022-05-31 10:00:25 +02:00
Jaime van Kessel
097cc9388a Added orientiation plugin to gitignore 2022-05-31 09:37:58 +02:00
Jaime van Kessel
67dec0dd3a
Update bugreport.yaml 2022-05-31 09:20:53 +02:00
Jaime van Kessel
1ec554ad1c
Add "Status: Triage" to bug report 2022-05-31 09:19:34 +02:00
j.delarago
3dec025cb8 Update comment to clarify function usage. 
CURA-8610
 2022-05-31 08:54:08 +02:00
j.delarago
21d59e9349 Write active material metadata to ufp when saving. 
Add function to fetch package_id using only information from XmlMaterialProfile material container.
The only piece of information associating the material container and the package together is the file_name. To find the package that owns a material we have to search each of the material package paths.

It would be great to find a cleaner solution (preferable one that doesn't require invalidating the cached containers).

CURA-8610
 2022-05-30 17:29:59 +02:00
Ghostkeeper
ac50bb0e2b
Merge branch 'main' of github.com:Ultimaker/Cura into main 2022-05-30 16:41:46 +02:00
Ghostkeeper
8cf1afc770
Update master branch to main in XML file link 
Because the default branch name changed.
 2022-05-30 16:41:30 +02:00
Ghostkeeper
593f8ad4db
Merge branch 'appdata.xml' of https://github.com/Tim453/Cura into Tim453-appdata.xml 2022-05-30 16:39:51 +02:00
Jaime van Kessel
fc63edb779
Merge pull request #11745 from Ultimaker/PP-3_improved_experimental_bridge_settings 
Better default for the experimental bridge settings. See PP-3 for det…
 2022-05-30 13:25:16 +02:00
p.kuiper
0db75501a3 Merge remote-tracking branch 'origin/main' into PP-3_improved_experimental_bridge_settings 
# Conflicts:
#	resources/definitions/ultimaker.def.json
 2022-05-30 07:59:50 +02:00
Remco Burema
c33a2b66cc
Merge pull request #12337 from Ultimaker/SEC-253_resource_preference_injection_5.0.0 
[SEC-253] [CURA-8964] resource preference injection 5.0.0
 2022-05-27 16:01:11 +02:00
Ghostkeeper
596c24657d
Merge branch 'master' 2022-05-25 11:52:34 +02:00
Ghostkeeper
528af5826a
Merge branch 'master' of github.com:Ultimaker/Cura 2022-05-25 11:51:38 +02:00
j.delarago
be25029aca This fix will stop enterprise versions from searching the user config folder for non storage type resources. 
Refer to SEC-253 for more information

SEC-253
 2022-05-24 13:10:08 +02:00
Jaime van Kessel
becf5cb53a Update no-response to use GH actions instead of a bot 2022-05-23 15:10:13 +02:00
Jaime van Kessel
5fdd0c6e74 Update no-response to use GH actions instead of a bot 2022-05-23 13:02:18 +02:00
Ghostkeeper
1af2a75138
Also send short OpenGL version 
This is the one we're more likely to be interested in.

Done as a 5 minute fix.
 2022-05-23 11:54:53 +02:00
Ghostkeeper
0cb2b3e2cb
Fix translation containing HTML tags 
Let's not confuse the translators by requiring to translate these in the future.

Done as a 5 minute fix.
 2022-05-23 11:54:26 +02:00
Joey de l'Arago
4e5f826a8a
Merge pull request #12274 from Ultimaker/SEC-255_fix_theme_5.0 
In secure version: disable loading themes from unbundled folders.
 2022-05-23 11:38:11 +02:00
Jaime van Kessel
f130eb2e7c
Merge pull request #11623 from cbc02009/fix-voron-retraction 
fix retraction speed and amount for direct drive afterburner.
 2022-05-20 16:54:01 +02:00
Remco Burema
050a731663 In secure version: disable loading themes from unbundled folders. 
This was a bit more tricky then it at first seemed, since the information wether this is a 'secure version' comes from the user-application and is not known in the Uranium library. This is not normally such a point, but both the theme and the preferences objects are loaded _very_ early in the process, and that information needs to be injected before then. (Well, in the case of the Theme object it's less important, since in the implementation choseen that is now security wise at least only in charge of wheter or not to even show the theme as selectable in the interface, so that it only needs to be aware of the 'security' status any time before the user can see a preference screen, but not nescesarily earlier.)

SEC-255 | CURA-8966
 2022-05-20 14:32:28 +02:00
Ghostkeeper
b5e3479c1c
Catch UnicodeDecodeErrors when parsing error messages from server 
Stupid recursive errors.

Fixes Sentry issue CURA-3VB.
 2022-05-20 12:55:59 +02:00
Ghostkeeper
64b29779ca
Fix crash when server sends invalid JSON data 
If readJSON fails, it puts an entry in the log and then returns None. This then crashes with a TypeError because you can't check for things to be in None.

Fixes Sentry issue CURA-3V5.
 2022-05-19 11:36:16 +02:00
Jaime van Kessel
c41c59da13
Merge pull request #12188 from Ultimaker/CURA-8708_remove_travel_acceleration_jerk 
Add setting to no longer use different jerk/acc for travels
 2022-05-18 16:32:50 +02:00
Jaime van Kessel
8b02b4161b Merge branch 'fix_tall_toolbar' of https://github.com/fieldOfView/Cura 2022-05-18 13:29:42 +02:00
Jaime van Kessel
21fdaa70dd Merge branch '4.13' of github.com:Ultimaker/Cura 2022-05-17 15:32:48 +02:00
Remco Burema
bf9c3cbc83 Secure another 'environment-settable via Qt' DLL. 
SEC-258 a.k.a. CURA-8969
 2022-05-17 11:45:14 +02:00
Remco Burema
4d3f312cb6 Secure another 'environment-settable via Qt' DLL. 
SEC-258 a.k.a. CURA-8969
 2022-05-17 11:42:43 +02:00
Jelle Spijker
71f256830d
Merge pull request #12225 from Ultimaker/change_log_update 
Update change_log.txt
5.0.0 		2022-05-17 10:08:13 +02:00
fvrmr
37ca436cad Update change_log.txt 
Added one more bug fix
 2022-05-17 10:05:28 +02:00
c.lamboo
13a75827ce Fix "view user manuals online" link 2022-05-16 21:49:09 +02:00
Ghostkeeper
dd251b5117
Merge branch '5.0' 2022-05-16 16:32:12 +02:00
Ghostkeeper
ae630a70a0
Merge branch 'change_log_update' into 5.0 2022-05-16 16:31:50 +02:00