GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 09:15:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,841 Commits 295 Branches 268 Tags
Commit Graph

26841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
c58d03ad4c
Change button to 'done' once USB export has completed 
Also important to keep in mind: It won't change to 'done' if the user cancelled the file dialogue.

Contributes to issue CURA-8609.
 2021-10-29 15:06:44 +02:00
Remco Burema
a82ffa45a0
Merge pull request #10700 from Ultimaker/CURA-8656_error_checking_for_disabled_settings 
Error checking for disabled settings
 2021-10-29 13:39:59 +02:00
Jaime van Kessel
87db24f14c Don't check validation for settings in error state 
CURA-8656
 2021-10-29 10:39:00 +02:00
10r3n20
86875580af add dark themed images to the dark theme 2021-10-28 14:12:15 +02:00
Jaime van Kessel
6c416742fb Merge branch 'dark-theme-images' of github.com:Ultimaker/Cura 2021-10-28 14:11:20 +02:00
Jaime van Kessel
42e066a5a8 Merge branch '4.12' of github.com:Ultimaker/Cura 2021-10-28 13:54:58 +02:00
Jaime van Kessel
61c43fb765 Only show "can't find location message" when it couldn't find location 
Bit of a silly mistake, but easy enough to fix!

CURA-8649
 2021-10-28 13:53:52 +02:00
Jaime van Kessel
59be3e195d Use category as fallback translation for intents instead of "unkown" 2021-10-28 13:48:09 +02:00
Jaime van Kessel
8f1cf4a963 Move openSYncAllWindow to the right class 
CURA-8609
 2021-10-28 09:43:12 +02:00
Remco Burema
ce61f8ef60
Merge branch 'master' into bremco-graphics_buffer_update 2021-10-27 18:47:51 +02:00
Jaime van Kessel
f47738f558
Merge pull request #10607 from Ultimaker/CURA-8609_sync_materials_to_printer 
Sync materials to printers via cloud
 2021-10-27 14:51:16 +02:00
Jaime van Kessel
79117d5898 Fix merge mistakes 
CURA-8609
 2021-10-27 14:48:12 +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
Ghostkeeper
273e933145
Reset sync status when closing and re-opening sync window 
Otherwise when you want to sync again, it'll just say that you're done. Not what a user would expect, I reckon.

Contributes to issue CURA-8609.
 2021-10-27 14:13:49 +02:00
Ghostkeeper
116046a8b2
Fix binding printer_id to response callbacks 
With the lambda it would capture the variable of printer_id. It wouldn't actually store the value of printer_id in teh created lambda. As a result, it was using the current value of printer_id when the lambda executes, rather than the value of printer_id when the lambda is constructed. A bit weird how that works in Python's lambdas.

With partial functions it works properly.

Contributes to issue CURA-8609.
 2021-10-27 14:06:04 +02:00
Ghostkeeper
f99fedc58b
Fix API misalignments with confirm material upload action 
The API endpoint got renamed (without my awareness). It also needed to be a POST request, probably since the beginning. And apparently it needs everything to be in a sub-field called 'data' for some reason.

Contributes to issue CURA-8609.
 2021-10-27 13:38:58 +02:00
Ghostkeeper
1c6ad019a3
Response data is contained in sub-field 'data' 
The entire response is contained in a lone 'data' field in the response. Why this is necessary I don't know, because indeed everything the server can tell us is data so everything would be in a 'data' field. But that's how the API reacts so that's how we'll have to parse it.

Contributes to issue CURA-8609.
 2021-10-27 13:16:39 +02:00
10r3n20
00120870e1 add dark themed images to the dark theme 2021-10-26 13:01:15 +02:00
Jaime van Kessel
b9c9b82052
Merge pull request #10662 from Sekisback/master 
Fix some German translations
 2021-10-25 17:41:39 +02:00
Sekisback
12c5a29d3e
Update fdmprinter.def.json.po 
mistyping fixed
 2021-10-25 16:51:59 +02:00
Ghostkeeper
101056bca6
Simplify description of lightning infill angle settings 
These two have garnered some feedback in that it's wholly unclear what the sentences even mean. Hopefully this correction makes it more clear for next time.

Contributes to issue CURA-8638.
 2021-10-25 15:22:29 +02:00
Ghostkeeper
82441f97b1
Clarify context of error message for translators 
This should improve the translation for next time.

Contributes to issue CURA-8638.
 2021-10-25 15:22:28 +02:00
Ghostkeeper
72f74b2759
Clarify description of Lightning infill 
Two changes have been made:
- Use more consistent terminology for the top side of the model (which could be skin or walls). This is corrected from feedback by our translators.
- Don't add disclaimers about the infill density to this already way-too-long setting description. If anything, a disclaimer should be added to the infill density description that Gradual Infill and some infill patterns might not reach the desired density everywhere. But really, I think it's more in the domain of user documentation like the Ultimaker website or the Settings Guide.
 2021-10-25 15:22:28 +02:00
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
Ghostkeeper
7680124f7e
Merge branch 'master' of https://github.com/mlapkin/Cura into mlapkin-master 2021-10-18 17:36:46 +02:00