Commit graph

14099 commits

Author SHA1 Message Date
Ghostkeeper
1af56871e2
Don't crash if the number of extruders in setting doesn't match
...with the actual number of extruders. These could misalign with Custom FDM Printer or when any of the extruders was deleted because of a configuration format error.

Contributes to issue #3570.
2018-04-25 09:58:10 +02:00
Lipu Fei
585888f84a Merge remote-tracking branch 'origin/3.3' 2018-04-24 14:28:50 +02:00
Lipu Fei
fca14eeef3 Fix optional arguments in MA _onChanged 2018-04-24 13:56:09 +02:00
Lipu Fei
4d7bf579e6 Do not keep triggering on changed in MA 2018-04-24 13:49:07 +02:00
Diego Prado Gesto
06b9e5240e Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-24 12:43:49 +02:00
Diego Prado Gesto
0fa4df4193 Adjust Spanish and French translations to correctly fit in the space for
the compatibility message.

Contributes to CURA-5166.
2018-04-24 12:42:12 +02:00
Diego Prado Gesto
f68ab9ac03 Add the 'auto slice disabled by default' line to the changelog 2018-04-24 12:42:03 +02:00
Lipu Fei
9b77484e96 Translate adhesion sheet warning text
CURA-5166
2018-04-24 11:59:43 +02:00
LukeChen-Ultimaker
10616bd4a0
Chinese translation for one string 2018-04-24 11:58:48 +02:00
Diego Prado Gesto
d6dcb995bf Add Spanish and Italian translations to a string added after the string
freeze.

Contributes to issue CURA-5166.
2018-04-24 11:35:21 +02:00
Ghostkeeper
fad7885ba7
Add Dutch, German and French translations of string that broke freeze
These are the languages other than English that I trust myself to translate properly...

Contributes to issue CURA-5166.
2018-04-24 11:01:38 +02:00
Ghostkeeper
db0288fec4
Merge branch '3.3' 2018-04-24 10:49:30 +02:00
Ghostkeeper
403051e0b2
Merge branch 'CURA-5143_3.3_send_gz' into 3.3 2018-04-24 10:48:31 +02:00
Ghostkeeper
16de8cac0f
Fix undefined variable
Contributes to issue CURA-5143.
2018-04-24 10:38:50 +02:00
Lipu Fei
0852cd2c20 WIP: Fix hanging upon send gz 2018-04-24 10:34:08 +02:00
Ghostkeeper
55e3c5c6d2
Update template with string break
This new string broke the string freeze. We'll translate it for our most commonly used languages.
2018-04-24 10:22:53 +02:00
Diego Prado Gesto
41e3ba528b Merge branch 'smartavionics-mb-fix-gcode-reader-start-position' 2018-04-23 14:52:29 +02:00
Diego Prado Gesto
609d51e52e CURA-5250 Remove buildplate menu entry temporary. Add back when the
whole feature is back again.
2018-04-23 14:41:43 +02:00
Diego Prado Gesto
f328926be3 CURA-5275 Add the end point of the previous path also when there is a
change in the tool.
2018-04-23 14:24:25 +02:00
Ghostkeeper
acd38b365a
Merge branch '3.3' 2018-04-23 14:15:38 +02:00
Ghostkeeper
dd408d559b
Fix translation of Support Blocker plug-in name
It was in the wrong catalogue. This means that our template picks it up but our actual code couldn't find the translation in that catalogue.

Contributes to issue CURA-5166.
2018-04-23 14:15:23 +02:00
Ghostkeeper
47101cc1ca
Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-23 14:14:12 +02:00
Diego Prado Gesto
a3dc94aedd Merge branch 'mb-fix-gcode-reader-start-position' of https://github.com/smartavionics/Cura into smartavionics-mb-fix-gcode-reader-start-position 2018-04-23 14:11:07 +02:00
Ghostkeeper
5648bc82e7
Merge branch '3.3' 2018-04-23 14:07:46 +02:00
Lipu Fei
0a1fd51b2f Prefer gcode for UM3
CURA-5143
2018-04-23 13:40:19 +02:00
Ian Paschal
e0d4395950 CURA-5238 Added a bugfix 2018-04-23 13:39:52 +02:00
Diego Prado Gesto
5333ca5aa8
Merge pull request #3666 from Ultimaker/CURA-5204_send_anonymous_data
Show information dialogue on what usage data is sent
2018-04-23 13:32:22 +02:00
Ian Paschal
e5a3dffceb CURA-5238 Updated release notes from Google Docs 2018-04-23 13:31:30 +02:00
Lipu Fei
4c61e190ae Add exclude materials for UMO, UM2, and UM2+
CURA-5271
2018-04-23 12:51:06 +02:00
Lipu Fei
37bcf1694d Remove translation wrapper for unnecessary parts
CURA-5221
2018-04-23 12:00:05 +02:00
Lipu Fei
f92985b4ac Add Ultimaker S5 for printer type detection
CURA-5221
2018-04-23 11:57:01 +02:00
Diego Prado Gesto
95a26837b6 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-23 11:35:45 +02:00
Diego Prado Gesto
b85b39ff35 CURA-5188 If the auto_slice option was enabled in previous version,
keep it like this in the new version.
Since the default value of this preference changed, we don't want to
confuse users that still use the auto_slice option. Those users with
clean install or intalling Cura for the first time will have this
preference disabled.
2018-04-23 11:29:18 +02:00
Ghostkeeper
7c3fe6ac93
Publish Tough PLA profiles
The Tough PLA material is now published, so we can publish these files too.

Contributes to issue CURA-5272.
2018-04-23 11:28:33 +02:00
Ghostkeeper
aec2b9dafe
Add Ultimaker S5 resources
The Ultimaker S5 has now been published, so these files may be published as well.

Contributes to issue CURA-5272.
2018-04-23 11:27:13 +02:00
Lipu Fei
f62ce1966b Fix material manager to use dict as a fallback
CURA-5266
2018-04-23 11:22:44 +02:00
Ian Paschal
54c32c52f6 CURA-5221 Added S5 ID code 2018-04-23 11:22:11 +02:00
Ghostkeeper
d857541677
Update PO headers
We're releasing 3.3 now.
2018-04-23 10:29:59 +02:00
Ian Paschal
5809cc949f
Update ISSUE_TEMPLATE.md 2018-04-23 09:35:19 +02:00
Cláudio Sampaio (Patola)
b4ddeab47e updated pt-br translations 2018-04-21 21:16:03 -03:00
Diego Prado Gesto
dbd30abd86 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-20 17:06:09 +02:00
Diego Prado Gesto
b8a26f3187 CURA-5218 Disable the Activate and Duplicate button in the management
page if the selected profile is not supported
2018-04-20 17:04:51 +02:00
Ghostkeeper
ac2301a8fd
Fix code style: Brackets on new line
And one comma without a space after it.

Contributes to issue CURA-5204.
2018-04-20 15:36:32 +02:00
Ghostkeeper
e13c3b1f13
Merge branch '3.3' 2018-04-20 15:34:06 +02:00
Ghostkeeper
f675b0b858
Fix 'Setting up scene...' translation
This was replaced with its English term, even though it's not really an industry term or anything.

Contributes to issue CURA-5166.
2018-04-20 15:33:48 +02:00
Diego Prado Gesto
626c424a02 CURA-5246 Just update the job name when it must be updated. 2018-04-20 15:00:40 +02:00
Lipu Fei
d0c6d87417 Fix Rigid3D Mucit definition
CURA-5257

 - Remove extra trailing spaces
 - Replace TABs with SPACEs
 - "value"s should use quotes ""
2018-04-20 14:52:52 +02:00
Lipu Fei
addcf5236a
Merge pull request #3642 from Rigid3D/master
Printer Definitions for Rigid3D Mucit
2018-04-20 14:43:58 +02:00
Ghostkeeper
70aed244ca
Merge branch '3.3' 2018-04-20 14:36:51 +02:00
Ghostkeeper
74016f0fb3
Merge branch 'jbkim-3.3' into 3.3 2018-04-20 14:19:03 +02:00