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

27289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
e6686f2b85 Merge branch '4.12' of github.com:Ultimaker/Cura 2021-10-25 13:13:27 +02:00
Jaime van Kessel
4901b82d48
Merge pull request #10660 from oliof/patch-1 
Update change_log.txt
 2021-10-25 13:13:01 +02:00
Ghostkeeper
0fd84bf1a5
Fix override of combing mode 2021-10-25 02:03:30 +02:00
Sekisback
d725fa8806
Update fdmprinter.def.json.po 
some German translation fixes
 2021-10-23 09:32:17 +02:00
Harald Wagener
ead8e277b6
Update change_log.txt 
fix a tiny typo.
 2021-10-23 02:04:58 +02:00
Ghostkeeper
4f9d2990db
Merge branch 'patch-1' of https://github.com/Hogan-Polaris/Cura into Hogan-Polaris-patch-1 2021-10-22 16:47:09 +02:00
fvrmr
3c995c98a5 Update change log 
Added a header for other new features
4.12-beta 		2021-10-22 11:47:42 +02:00
fvrmr
737890e23a Change log and whats new pages 
Updated change log
Updated whats new pages: text and new images.
 2021-10-22 10:15:58 +02:00
Jelle Spijker
3abbcc99c0
fixed top bottom pattern zigzag in profiles 
The enum value should be placed in single quotes in double quotes
 2021-10-21 17:13:25 +02:00
Remco Burema
0d59e63309
Remove non-default roofing layer count from some UM TPLA profiles. 
V&V approved to be in the BETA.
 2021-10-21 16:40:19 +02:00
Jaime van Kessel
00a01569be Add clarifying comment to pause at height 
It was a bit confusing what was happening, so i've added an extra comment to clarify
what was going on.

CURA-7292
 2021-10-21 15:30:32 +02:00
Jaime van Kessel
bf2b42b0b8 Add clarifying comment to pause at height 
It was a bit confusing what was happening, so i've added an extra comment to clarify
what was going on.

CURA-7292
 2021-10-21 15:29:21 +02:00
Jaime van Kessel
1f6e1942d7 Disable the material sync message again 
CURA-8639
 2021-10-21 10:39:47 +02:00
THeijmans
74c432428b Fixes bug in top bottom pattern settings 
As discussed in CCB, mistake was made which led to no skin being printed. This fixes it.
PP-44
 2021-10-21 09:57:43 +02:00
THeijmans
4e4a5ff382 Fixes bug in ultimaker S3 definition 
setting was configured twice
 2021-10-21 09:52:37 +02:00
THeijmans
04f37e6283 Removes missed line width settings 
As discussed in CCB, now every line width setting will inherit from the right place
 2021-10-21 09:48:55 +02:00
THeijmans
9cc1a24e11 Moves arachne setting changes to ultimaker2 layer 
Fixing a mistake from PP-28,

PP-44
 2021-10-21 09:48:00 +02:00
Ghostkeeper
03492a3a15
Update header of translated files for Cura 4.12 
Contributes to issue CURA-8638.
 2021-10-20 16:52:50 +02:00
Ghostkeeper
f4c5cfbbd0
Update translated files with new translation templates 
There are new translations. This moves all of those new strings into the translation files so that the translators can translate them. Every string that has an empty translation still needs to be translated.

Contributes to issue CURA-8638.
 2021-10-20 16:50:10 +02:00
Ghostkeeper
92e5902163
Update translation templates for Cura 4.12 
These are the new strings introduced in 4.12.

Contributes to issue CURA-8638.
 2021-10-20 16:47:47 +02:00
Remco Burema
8c8ec5391f
Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00
Remco Burema
6d93c651ec
Merge pull request #10639 from Ultimaker/CURA-8514_inconsistent_material_naming 
Use the material name instead of brand + type + color
 2021-10-20 10:47:32 +02:00
Remco Burema
0871870bb6
Merge branch 'merge_main_20211019' into libArachne_rebased 2021-10-20 08:38:52 +02:00
Remco Burema
86046a32b3
Merge branch 'master' into merge_main_20211019 2021-10-20 08:38:01 +02:00
Remco Burema
2fc20fd04a
Prep for merge with main branch. Setting-version 18 to 19. 2021-10-19 18:32:51 +02:00
Jaime van Kessel
2baada8a70 Use the material name instead of brand + type + color 
CURA-8514
Fixes #10421
 2021-10-19 11:23:21 +02:00
mlapkin
7a8168953f
Fix translation for 'nozzle'. 
Update strings having 'nozzle' translated as 'head' and make them more consistent with others where translation is correct.
 2021-10-18 23:12:40 +07:00
Ghostkeeper
7680124f7e
Merge branch 'master' of https://github.com/mlapkin/Cura into mlapkin-master 2021-10-18 17:36:46 +02:00
Jelle Spijker
666880ad20
Only show certain App Switcher icons when account has DF access 
Added a dictionary where additional user rights can be set.
A plugin such as the DigitalFactory can update this dictionary
if certain account rights change. The `account.additionalRights`
is intended to allow us some flexibility, without breaking the API
in the future.

The Application Switcher now queries the additional account rights,
which is updated by the DF plugin to only show `My printers`,
`Digital Library` and `Print jobs` when the user has access to the
DF.

Contributes to CURA-8624
 2021-10-18 15:37:06 +02:00
Jelle Spijker
629f695ef7
Only show certain Application Switcher links when logged in 
Some links in the application only make sense to
forward a user when they are logged into the DF.
Since we don't expose yet if the user has access
to the DF it will now only check if they are
logged in.

Contributes to CURA-8624
 2021-10-18 15:37:06 +02:00
Ghostkeeper
8bd6fe7c2b
API changed: material_profile_name instead of file_name 
Contributes to issue CURA-8609.
 2021-10-18 15:15:37 +02:00
Ghostkeeper
c9d53cbbde
Renamed OAuth scope 
This got renamed since the API was communicated to us.

Contributes to issue CURA-8609.
 2021-10-18 15:15:05 +02:00
mlapkin
efa292e28d
Update fdmprinter.def.json.po 
Fix translation of 'order'.
 2021-10-18 18:37:56 +07:00
Ghostkeeper
0d350b5f96
Merge branch '4.12' into CURA-8609_sync_materials_to_printer 2021-10-18 13:23:29 +02:00
Ghostkeeper
5ed57e403c
Delete existing log-in information to force the user to log in again 
Otherwise they won't be able to sync material profiles.

Contributes to issue CURA-8609.
 2021-10-18 13:17:22 +02:00
Ghostkeeper
bf6dd443b2
Add material profile writing permission 
The API needs this new scope name.

Contributes to issue CURA-8609.
 2021-10-18 12:59:32 +02:00
Ghostkeeper
89c5a38afa
Use a neutral e-mail address 
If I end up under a bus, these e-mails will then still arrive somewhere.
 2021-10-16 11:52:29 +02:00
Ghostkeeper
a349606fef
Make my name more anonymous 
Yes, it's my name. I'm okay with people learning that if they are really looking. I'm less okay with search engines learning that. Removing my name here linked to my nickname will eventually cause search engines to unlink it too.
 2021-10-16 11:45:48 +02:00
Ghostkeeper
0378531f13
Handle QML exposing of filterConnectionType if not filtering 
It should expose it as -1 then.

Contributes to issue CURA-8609.
 2021-10-15 16:24:43 +02:00
Ghostkeeper
a1a4d421ca
Consistent user-visible naming of Arjun Pro printers 
Contributes to issue CURA-8580.
 2021-10-15 16:13:31 +02:00
Ghostkeeper
57f4807f98
Update setting_version to 19 
This was committed before we implemented that version upgrade. But we do it now. This requires that we update references to the FLSun SR printer, but obviously there are none in here.

Contributes to issue CURA-8580.
 2021-10-15 16:12:27 +02:00
Ghostkeeper
41e662fb6a
Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master 2021-10-15 16:07:59 +02:00
Ghostkeeper
0583814dfa
Fix HttpNetworkManager not providing error parameter if there is no error 
Contributes to issue CURA-8609.
 2021-10-15 16:00:54 +02:00
Ghostkeeper
f56e438747
Fix broken references 
Just some things that the QML is complaining about. This actually did fix the spinning of the spinners.

Contributes to issue CURA-8609.
 2021-10-15 15:52:54 +02:00
Ghostkeeper
889000242d
Document UploadMaterialsJob class better 
Including all of its signals and methods.

Contributes to issue CURA-8609.
 2021-10-15 15:42:12 +02:00
Ghostkeeper
e05fa87b48
Handle errors reading material archive back in 
It could be that this archive is not accessible any more for whatever reason. Write-only file systems, quarantined files, etc. Whatever the reason, Cura shouldn't crash on this because it's not in Cura's control.

Contributes to issue CURA-8609.
 2021-10-15 15:24:05 +02:00
Ghostkeeper
4262dfaf5d
Better handle errors in local part of upload job 
It could be that the archive fails to save because the user doesn't have access to its own temporary folder, the firewall quarantines the archive, there's not enough disk space, whatever. These errors need to be handled and not crash Cura.

Contributes to issue CURA-8609.
 2021-10-15 15:17:59 +02:00
Ghostkeeper
dfcefe11cc
Use enum for printer status constants 
This indicates how we're using it, and also allows for use of symbols in the code rather than strings, which integrate better with tooling.

Contributes to issue CURA-8609.
 2021-10-15 14:51:07 +02:00
Ghostkeeper
2b4a31c9de
Change type of filter to Optional[ConnectionType] 
It's a bit more semantic this way.

Contributes to issue CURA-8609.
 2021-10-15 14:35:07 +02:00
AnnaKang0219
34c531123b remove wrong bed_temperature setting 
remove wrong bed_temperature setting
 2021-10-14 13:52:07 +08:00