GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,872 Commits 294 Branches 267 Tags
Commit Graph

15872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
7ffcfa25e9 Merge branch 'CURA-5095_reset_slice_info_collection' of github.com:Ultimaker/Cura into 3.5 2018-10-02 11:17:39 +02:00
Lipu Fei
729f9a69ba
Merge pull request #4455 from Ultimaker/fix_toolbox_download 
Fix toolbox download
 2018-10-02 10:27:00 +02:00
Diego Prado Gesto
77fd05ac70 Disable other buttons while toolbox is downloading to avoid crashes. 
I did it that way to not be risky because we're close to the release.

Contributes to CURA-5778.
 2018-10-01 17:21:34 +02:00
Lipu Fei
d1fce50f60 Add Preferences upgrade 34 to 35 unit test 2018-10-01 16:30:27 +02:00
Lipu Fei
7d537f2c6f Fix data collection message at app start 2018-10-01 16:27:27 +02:00
Diego Prado Gesto
a6e98f344e
Merge pull request #4443 from Ultimaker/bothof_update_3.5 
Update translations by Bothof for Cura 3.5
 2018-10-01 15:30:46 +02:00
drzejkopf
8fa73fc1fb Update fdmprinter.def.json.po 2018-10-01 14:48:31 +02:00
drzejkopf
cc7d64b4f1 Complete Polish translation for version 3.5 2018-10-01 14:48:16 +02:00
Diego Prado Gesto
ee5d647b6d Review the fdmprinter.def.json for Korean, Dutch, Portuguese, Russian, 
Turkish and Simplified Chinese.

Contributes to CURA-5741.
 2018-10-01 14:42:25 +02:00
Diego Prado Gesto
5da1b71e94 Review Simplified Chinese translations. 
Contributes to CURA-5741.
 2018-10-01 13:54:02 +02:00
Diego Prado Gesto
00f1f69e4d Review Turkish translations. 
Contributes to CURA-5741.
 2018-10-01 13:45:55 +02:00
Diego Prado Gesto
c474ceff8f Review Russian translations. 
Contributes to CURA-5741.
 2018-10-01 13:37:26 +02:00
Diego Prado Gesto
638c6facc7 Review portuguese translations. 
Contributes to CURA-5741.
 2018-10-01 13:23:43 +02:00
Diego Prado Gesto
d5ea92059a Fix Dutch translations. 
Contributes to CURA-5741.
 2018-10-01 13:03:00 +02:00
Diego Prado Gesto
f785f888ae Translate the per-model-setting options in Spanish to better explain 
what each item does.

Contributes to CURA-5741.
 2018-10-01 11:55:27 +02:00
Diego Prado Gesto
c2e69dc7b2 Fix Korean translations. 
Contributes to CURA-5741.
 2018-10-01 11:28:37 +02:00
Diego Prado Gesto
91e6897bc7 Fix conficts in French with a couple of keyboard shortcuts. 
Contributes to CURA-5741.
 2018-10-01 11:13:10 +02:00
Diego Prado Gesto
a320720f86 Remove duplicate shortcut in French, so the CI won't fail on it. 
Contributes to CURA-5741.
 2018-10-01 10:57:33 +02:00
Remco Burema
a7001d2f4b Merge branch 'bothof_update_3.5' of https://github.com/Ultimaker/Cura into bothof_update_3.5 2018-09-28 16:36:22 +02:00
Remco Burema
8aa2e0193c [translate] Even smaller corrections for 3.5 Dutch (nl_NL). 2018-09-28 16:33:42 +02:00
Remco Burema
d61dd4987b [translate] Some small corrections for 3.5 Dutch (nl_NL). 2018-09-28 16:17:35 +02:00
Ghostkeeper
72d97a95c2
Fixes for 3.5 translations of DE, ES, FR, IT and JA 
I don't have time to do them all right now.

Contributes to issue CURA-5741.
 2018-09-28 15:32:04 +02:00
Ghostkeeper
44fd0752b6
Update revision dates 
They are being checked today. I'm not that bothered about the exact time.

Contributes to issue CURA-5741.
 2018-09-28 14:28:55 +02:00
Ghostkeeper
b0602e795c
Update translations by Bothof for Cura 3.5 
These are the files that Bothof gave us. I'll check and correct them soon.

Contributes to issue CURA-5741.
 2018-09-28 14:20:12 +02:00
alekseisasin
2a201cef23 Prevent cura crash after setting Print as Support in per object setting 
menu
CURA-5766
 2018-09-26 17:06:24 +02:00
Simon Edwards
baa8064ec7
Merge pull request #4429 from Ultimaker/cura_connect_improvements_3.5 
Cura connect improvements 3.5
 2018-09-25 17:26:55 +02:00
Simon Edwards
e99b376374 Merge remote-tracking branch 'origin/3.5' into cura_connect_improvements_3.5 2018-09-25 16:59:33 +02:00
Lipu Fei
91bcfb9445 Take in account extruders that haven't been loaded yet 
CURA-5751
 2018-09-25 15:29:31 +02:00
Lipu Fei
8837ffc06d Fix mateial management QML reference 
CURA-5682
 2018-09-25 11:52:53 +02:00
Lipu Fei
fe8aa02e7c Fix a direct signal emission that causes max recursion error 
CURA-5682

A max recursion error will occur when the user creates a material on the
material management page. Too many signals get directly triggered and
some of them head back again and causes a max recursion error.
 2018-09-24 11:44:55 +02:00
Aleksei S
b44fb7ca24 Select correct material according to the active extruder 
CURA-5682
 2018-09-21 17:35:46 +02:00
Aleksei S
86d8f8517d In material page was not defined the used extruder nr, for generic materials 
CURA-5682
 2018-09-21 13:48:46 +02:00
Lipu Fei
1bf78c086d Remove import plugins which is not a module 2018-09-21 12:03:15 +02:00
Diego Prado Gesto
4bd5d29970 Don't crash if the plugin is not found (maybe some error while loading). 
In that case it's better not to show the dialog than crashing.
 2018-09-20 18:41:30 +02:00
Diego Prado Gesto
2d300ab395 Revert "Fix plugins import in CuraApplication" 
This reverts commit e87f3d7ca9cf135142bee488f188b9639c8b38fd.
 2018-09-20 18:34:08 +02:00
Lipu Fei
5fc8b95425 Better data handling 
CURA-5095

Avoid missing sections/options
 2018-09-20 12:59:27 +02:00
Lipu Fei
5a235a59dd Reset send slice info and show privacy dialog 
CURA-5095

Because the data Cura collects has been changed.
 2018-09-20 12:55:30 +02:00
Lipu Fei
f912630d17
Merge pull request #4391 from Ultimaker/CURA-5095_collect_user_modified_settings 
Cura 5095 collect user modified settings
 2018-09-20 10:13:27 +02:00
Diego Prado Gesto
4111318c7a Remove duplicate shortcut in French, so the CI won't fail on it. 2018-09-20 08:56:01 +02:00
Ghostkeeper
ea4015c2cf
Fix missing report links 
My IDE crashed while doing a replace all. I see that it missed a few.

Contributes to issue CURA-5741.
 2018-09-19 17:31:39 +02:00
Ghostkeeper
ec42a96179
Update version number and fix reporting link 
I don't know, did we always have it refer to Uranium's issues page?

Contributes to issue CURA-5741.
 2018-09-19 17:25:57 +02:00
Ghostkeeper
91ed1171c2
Update translation sources for Cura 3.5 
This is updated from the new cura.pot template.

Contributes to issue CURA-5741.
 2018-09-19 17:15:09 +02:00
Ghostkeeper
f9923e5fe7
Remove duplicate messages 
These were duplicate because CMake of this plug-in put a copy of the JSON file in the build directory.

Contributes to issue CURA-5741.
 2018-09-19 17:13:53 +02:00
Ghostkeeper
10e0175947
Update translation templates for Cura 3.5 
These are the new strings for Cura 3.5.

Contributes to issue CURA-5741.
 2018-09-19 17:10:58 +02:00
Ghostkeeper
04b74d2285
Fix typo in Extra Infill Wall Count description 
Some very observant user found this small typo. Thanks.
 2018-09-19 13:58:09 +02:00
Ian Paschal
7ad6fc4cad
Merge pull request #4385 from Ultimaker/monitor_confirmation_dialogues 
Add confirmation dialogues before making destructive changes in UM3/S5 monitor
 2018-09-19 13:14:39 +02:00
Ghostkeeper
44d828d137
Merge branch 'CURA-5725_simulation_stop_key_press' into 3.5 2018-09-18 17:29:35 +02:00
Diego Prado Gesto
ed9b0dd41b Add a missing bracket back. 
Contributes to CURA-5725.
 2018-09-18 17:25:35 +02:00
Ghostkeeper
e41361a053
Fan speed override is about supported areas, not bridged areas 
This is a correction suggested by Smartavionics (the author of that setting) on the Ultimaker forum thread about the 3.5 beta.
 2018-09-18 17:18:37 +02:00
Diego Prado Gesto
13cab3653e Remove unworking code that I forgot to remove after explaining a 
possible solution to myself.

Contributes to CURA-5725
 2018-09-18 17:09:57 +02:00