14850 Commits

Author SHA1 Message Date
fieldOfView
846c55a99d Simplify detection of url-encoded filepatch 2018-07-31 09:47:18 +02:00
fieldOfView
65ada30c9c Fix flashing "default" firmware
The url is not QUrl encoded if the "default" firmware is flashed
2018-07-17 09:01:06 +02:00
fieldOfView
7e90546163 Fix firmware upload on Windows...
by correctly creating a local path from a url-encoded path

Fixes #3731 and #3987
2018-06-29 10:34:15 +02:00
Ghostkeeper
8e6b5a0d6a
Decimate UMS5 platform mesh
This mesh has a lot of structure underneath the build plate which can't even be seen really. We can reduce the resolution of that so that it falls under the norm of 1MB per build plate mesh that we hold for all our printers.
2018-06-26 15:56:13 +02:00
Mark
5fe812b4a4 Add downloadnumber to model and plugin view 2018-06-26 15:29:35 +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
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
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
Diego Prado Gesto
66845a3985 Add Spanish translations.
Contributes to CURA-5451.
2018-06-21 13:08:15 +02:00
Diego Prado Gesto
1a5f7cb46c Add German translations.
Contributes to CURA-5451.
2018-06-21 13:03:45 +02:00
Diego Prado Gesto
5bd64aae16 Add traditional chinese translations.
Contributes to CURA-5451
2018-06-21 13:00:52 +02:00
Diego Prado Gesto
6b233db9ea Add Portuguese translations
Contributes to CURA-5451
2018-06-21 11:56:37 +02:00
Alexander Rössler
fa79cf5ee8 adding the UNI-PRINT-3D config from TheCoolTool 2018-06-20 18:03:19 +02:00