Commit graph

17030 commits

Author SHA1 Message Date
Mark
5fe812b4a4 Add downloadnumber to model and plugin view 2018-06-26 15:29:35 +02:00
fieldOfView
3546af86e8 Select the current profile when showing the profiles page 2018-06-26 12:02:41 +02:00
fieldOfView
05b3654346 Fix color of selected items in Profiles and Materials pages 2018-06-26 11:45:07 +02:00
Mark
8c3d4f1011 Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-26 11:29:46 +02:00
Mark
0f258bd680
Merge pull request #3958 from machinekoder/uni-print-3d-support
adding the UNI-PRINT-3D config from TheCoolTool
2018-06-26 09:29:18 +02:00
Mark
feeb00618d Merge branch 'uni-print-3d-support' of https://github.com/machinekoder/Cura 2018-06-26 09:28:05 +02:00
Alexander Rössler
88197c4978 definitions/UNI-PRINT-3D: add to Other category 2018-06-25 20:37:25 +02:00
Aleksei S
c4fa50a8fc Added icon for custom Menu items 2018-06-25 16:51:40 +02:00
Diego Prado Gesto
9689104a2d CURA-5496 Change the ultimaker original profiles by removing the 0.3 and
adding the 0.6mm. layer heigh.
2018-06-25 15:58:13 +02:00
Diego Prado Gesto
62ca661d0e CURA-5496 Remove wrong settings from the UM2 global profiles. 2018-06-25 15:27:53 +02:00
Lipu Fei
140e38ac1c Fix merge conflicts
CURA-5496
2018-06-25 14:26:13 +02:00
Lipu Fei
65f696a14f Simplify the case of UMO Dual
CURA-5496
2018-06-25 14:24:25 +02:00
Lipu Fei
8d0b364b44 UMO+ shares the same quality profiles as UMO
CURA-5496
2018-06-25 14:21:02 +02:00
Ghostkeeper
e8573dfe3b
Merge branch '3.4' 2018-06-25 13:44:21 +02:00
Ghostkeeper
cfa5d88faf
Merge branch '3.4' of https://github.com/Patola/Cura into Patola-3.4 2018-06-25 13:41:46 +02:00
Diego Prado Gesto
cb2097eafc CURA-5496 Use setting_version 5 in the UMO and UMODual global quality
profiles.
2018-06-25 11:52:48 +02:00
Diego Prado Gesto
2a75aebab9 Merge branch '3.4' 2018-06-25 11:51:48 +02:00
Diego Prado Gesto
9f1ad08bc2 CURA-5496 Add global profiles for the UMO, UMO+ and UMODual. 2018-06-25 11:35:17 +02:00
twosilly
ac49e3cf39 Update Chinese translation 2018-06-25 09:15:00 +08:00
Aleksei S
f577789859 Added extra SettingsModel for a QML 2018-06-23 16:22:33 +02:00
Aleksei S
0906e3f1e7 Store custom Menu items in CuraApplication 2018-06-23 16:16:06 +02:00
Aleksei S
0cf46ca48e Changed SettingView to show custom menu items 2018-06-23 16:14:50 +02:00
Cláudio 'Patola' Sampaio
a94256d0b1 Updated pt_BR translations for 3.4 2018-06-23 06:43:54 -03:00
Diego Prado Gesto
e087a05195 CURA-5496 Change the setting_version to the current version 5 of the global UM2+
profiles.
2018-06-22 15:37:30 +02:00
Diego Prado Gesto
571e3cec7f Merge branch '3.4' 2018-06-22 15:33:04 +02:00
Diego Prado Gesto
86531a85b0 Add fixed Korean translations.
Contributes to CURA-5484.
2018-06-22 15:21:38 +02:00
Diego Prado Gesto
c76ffb8a72 Revert Korean translations.
Contributes to CURA-5484.
2018-06-22 14:38:57 +02:00
Diego Prado Gesto
1164779762 CURA-5496 Add global quality profiles to UM2+ that will act as a
fallback instead of using the general global profiles.
2018-06-22 14:07:46 +02:00
Diego Prado Gesto
ff06edf21d Fix and put capital letters in the axis for some languages.
Contributes to CURA-5451.
2018-06-21 17:20:00 +02:00
Diego Prado Gesto
2a3f18b3bb Fix X3D to X3G bad translations in some languages.
Contributes to CURA-5451.
2018-06-21 17:10:10 +02:00
Diego Prado Gesto
0f5707d3b3 Fix Korean translations.
Contributes to CURA-5451.
2018-06-21 17:02:01 +02:00
Diego Prado Gesto
2fc5c217ee Fix Turkish translations.
Contributes to CURA-5451.
2018-06-21 16:55:45 +02:00
Diego Prado Gesto
3830195dad Fix some issues with the character : in many languages.
Contributes to CURA-5451.
2018-06-21 16:42:41 +02:00
Mark
10dce33b83
Merge pull request #3934 from nean-and-i/master
Create tevo_tornado.def.json
2018-06-21 16:37:43 +02:00
Diego Prado Gesto
9da87206bf Fix Italian translations.
Contributes to CURA-5451.
2018-06-21 16:35:32 +02:00
Mark
8c3b6b8606
Merge pull request #3911 from mkroman/master
Add Creality CR-10S machine definition
2018-06-21 16:31:45 +02:00
Diego Prado Gesto
7d3c5fd552 Fix Japanese translations.
Also remove ':' from the German translations.

Contributes to CURA-5451.
2018-06-21 16:30:42 +02:00
Mark
924f0359f9
Merge pull request #3884 from FricoRico/feature_wanhao_profiles
Added definitions for all Wanhao Duplicator FDM printers
2018-06-21 16:20:39 +02:00
Ghostkeeper
d4ca3d144e
Use latest temperature instead of a manual resume temperature
We don't need the user to fill this in. We can just track the resume temperature ourselves.

Contributes to issue CURA-5491.
2018-06-21 16:07:29 +02:00
Diego Prado Gesto
1dcdc934a5 Fix German translations.
Contributes to CURA-5451.
2018-06-21 15:44:23 +02:00
Diego Prado Gesto
3b369bc1ca Fix Spanish translations.
Contributes to CURA-5451.
2018-06-21 15:41:53 +02:00
Diego Prado Gesto
c38d396976 Fix Portuguese translations.
Contributes to CURA-5451.
2018-06-21 15:14:05 +02:00
Diego Prado Gesto
0fe96a6096 Add French translations.
Contributes to CURA-5451.
2018-06-21 13:28:48 +02:00
Diego Prado Gesto
8596f8a5b0 Add Chinese translations.
Contributes to CURA-5451.
2018-06-21 13:23:57 +02:00
Diego Prado Gesto
50206c82bd Add Turkish translations.
Contributes to CURA-5451.
2018-06-21 13:18:46 +02:00
Diego Prado Gesto
d753fcec19 Add Russian translations.
Contributes to CURA-5451.
2018-06-21 13:16:31 +02:00
Diego Prado Gesto
0ca245a2f0 Add Dutch translations.
Contributes to CURA-5451.
2018-06-21 13:15:18 +02:00
Diego Prado Gesto
b8ce651286 Add Korean translations.
Contributes to CURA-5451.
2018-06-21 13:12:54 +02:00
Diego Prado Gesto
cddae95d4a Add Japanese translations.
Contributes to CURA-5451.
2018-06-21 13:11:42 +02:00
Diego Prado Gesto
d52511a1cc Add Italian translations.
Contributes to CURA-5451.
2018-06-21 13:09:27 +02:00