3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
16095 commits 340 branches 299 tags 734 MiB
Commit graph

16095 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
18361b9434 Ensure that CuraAPI can be called in the same way as before 
This should prevent another API break.

CURA-5744
 2018-10-02 10:42:15 +02:00
Diego Prado Gesto
4f9661b7f5 Merge branch 'traditional_chinese_3.5' into 3.5 2018-10-02 10:35:59 +02:00
Diego Prado Gesto
6212bcbc33 Add traditional chinese translations to Cura. 
Contributes to CURA-5741.
 2018-10-02 10:34:37 +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
Mark
b412a259af
Merge pull request #4410 from Ghostkeeper/fix_initial_startup_model_argument 
Fix initial start-up when providing model parameter
 2018-10-02 10:14:07 +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
d81cdee9b9
Merge branch 'master' into top_bottom_settings_enabled_function 2018-10-01 17:07:57 +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
ChrisTerBeke
acb7df710c Fix getting cura application instance 2018-10-01 15:37:28 +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
Jaime van Kessel
feaa10094e
Merge pull request #4441 from Ultimaker/resolve_dependencies_oauth 
Resolve circular imports for CuraAPI
 2018-10-01 15:15:14 +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
93061d67eb
Merge pull request #4414 from drzejkopf/patch-3 
Complete Polish translation for version 3.5
 2018-10-01 14:46:13 +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
Aleksei S
98c3f497d8 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-01 11:32:39 +02:00
Aleksei S
3f8b7fb6af Fix: Switches to 'Prepare' always go through 'Recomended' mode 
CURA-5731
 2018-10-01 11:30:21 +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
Diego Prado Gesto
046fca5d0f Align the "Enable Gradual" text with the corresponding checkbox. 2018-10-01 10:46:45 +02:00
Lipu Fei
6ac48a82c4
Merge pull request #4452 from Ultimaker/M&P-Setting-Optimization 
S5 profile optimizations
 2018-10-01 10:38:09 +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
Aleksei S
cbad60898a Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-28 16:10:50 +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
Lipu Fei
8584af415a Merge remote-tracking branch 'origin/CURA-5744-move-oauth-login' into resolve_dependencies_oauth 2018-09-28 14:32:16 +02:00
Lipu Fei
c04c7654c1 Make Backup._application private 2018-09-28 14:31:36 +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
Lipu Fei
1bee201cfd Remove unused code 2018-09-28 14:24:40 +02:00
Lipu Fei
5761d28f7f Use old data dict code style, more readable 2018-09-28 14:24:21 +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
Lipu Fei
3bc91f15c3 Fix mypy complains 2018-09-28 14:17:00 +02:00
Lipu Fei
7ae6800a14 Fix imports in QualityManager 2018-09-28 14:01:28 +02:00
Ghostkeeper
3e7021d729
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2018-09-28 13:48:14 +02:00
Ghostkeeper
bfc3c5d8d8
Merge branch 'feature_mesh_names' of https://github.com/paukstelis/Cura into paukstelis-feature_mesh_names 2018-09-28 13:26:15 +02:00
Remco Burema
a68a591c18 Correct typo leading to infinite recursion. 2018-09-28 13:07:18 +02:00
Lipu Fei
6e2f7e72b6 Fix missing argument 2018-09-28 12:34:00 +02:00
Lipu Fei
3a01b63343 Fix refactor and tests 2018-09-28 12:33:16 +02:00
Lipu Fei
6e46772170 Fix imports in Backup 2018-09-28 12:25:03 +02:00
Lipu Fei
dd150bbab9 Resolve circular imports for CuraAPI 2018-09-28 12:07:00 +02:00
Ghostkeeper
ef5f9bb0d4
Improve warning when saving g-code before slicing 
This terminology is more consistent with what the rest of the interface uses.

Discovered during work on #4112.
 2018-09-28 12:01:20 +02:00