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

6834 Commits

Author SHA1 Message Date
Ian Paschal
9caeddf824 Merge branch 'master' of https://github.com/Ultimaker/Cura into clean_print_job_info_block 2018-10-03 09:08:26 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Diego Prado Gesto
afccd38a5d Add preposition to be consistent with other strings. 
Contributes to CURA-5741.
 2018-10-02 17:48:25 +02:00
Diego Prado Gesto
04c72c0875 Merge branch '3.5' of git://github.com/Patola/Cura into Patola-3.5 2018-10-02 17:26:14 +02:00
Diego Prado Gesto
a99241d20b Add missing quote. 
Contributes to CURA-5741.
 2018-10-02 15:53:06 +02:00
Jaime van Kessel
9970f0e752 Merge branch 'fix_polygon_connector_setting' of https://github.com/BagelOrb/Cura 2018-10-02 13:12:21 +02:00
Cláudio 'Patola' Sampaio
e457b2e67c Merge branch '3.5' of https://github.com/Ultimaker/Cura into 3.5 
Updated to push to upstream
 2018-10-02 07:01:39 -03:00
Cláudio 'Patola' Sampaio
6d17144766 Updated strings to Cura 3.5 2018-10-02 07:00:14 -03:00
alekseisasin
84c667265d
Merge pull request #4200 from BagelOrb/top_bottom_settings_enabled_function 
JSON fix: only enable skin settings when there is skin
 2018-10-02 11:21:15 +02:00
Mark
d39f6d061b
Merge pull request #4365 from smartavionics/mb-gyroid-infill 
Add gyroid infill pattern.
 2018-10-02 10:43:41 +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
d81cdee9b9
Merge branch 'master' into top_bottom_settings_enabled_function 2018-10-01 17:07:57 +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
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
Jaime van Kessel
c2f0a33b42
Merge branch 'master' into full_screen_test 2018-09-28 11:24:22 +02:00
Ian Paschal
302f9a95b3 Cleaned-up printe job info block 
Contributes to CL-897, CL-1051
 2018-09-27 13:40:46 +02:00
Ghostkeeper
80804b232f
Merge branch 'refactor_singleton_settingsbase' 2018-09-27 11:53:11 +02:00
THeijmans
d5c86365f8 S5 profile optimizations 
Removing the prime blob, equalizing flows and avoiding supports.
 2018-09-26 15:02:25 +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
Ghostkeeper
3127108d00
Only set top/bottom pattern to concentric for initial layer 
I'm taking responsibility for this. I'm changing it as a reaction to #4167 since I think concentric is good for the first layer but not so good for the rest of the layers. That user seems to agree but it hasn't been tested thoroughly. It's my intuition, sorry if it went wrong.
 2018-09-25 13:17:32 +02:00
Diego Prado Gesto
987ae73078 Remove call to undefined function. 2018-09-25 13:15:26 +02:00
Lipu Fei
51f2386db1 Merge remote-tracking branch 'origin/3.5' 2018-09-25 11:56:12 +02:00
Lipu Fei
8837ffc06d Fix mateial management QML reference 
CURA-5682
 2018-09-25 11:52:53 +02:00
Diego Prado Gesto
b52c28321a Merge branch 'master' into refactor_singleton_settingsbase 2018-09-25 09:38:55 +02:00
Diego Prado Gesto
e31f35ec95 Merge branch '3.5' 2018-09-25 09:36:08 +02:00
Ghostkeeper
7d7227cfc8
Merge branch 'master' into refactor_singleton_settingsbase 2018-09-24 17:25:15 +02:00
drzejkopf
79cd9f332d
Update fdmprinter.def.json.po 2018-09-23 15:28:14 +02:00
drzejkopf
8c6f2dc86a
Complete Polish translation for version 3.5 2018-09-23 15:21:14 +02:00
Aleksei S
b44fb7ca24 Select correct material according to the active extruder 
CURA-5682
 2018-09-21 17:35:46 +02:00