14396 Commits

Author SHA1 Message Date
Lipu Fei
d79bbe5725 Remove unnecessary check for plugins_showcase models creation
Already created in __init__()
2018-04-25 16:48:01 +02:00
Lipu Fei
3ea80c7c7c Compare ints instead of floats for progress check 2018-04-25 16:46:20 +02:00
Lipu Fei
48eda4d0dc Remove unused import 2018-04-25 16:44:32 +02:00
Lipu Fei
cbc45bffd0 Should use .gcode.gz 2018-04-25 16:43:59 +02:00
Jack Ha
efdccb593f Merge branch '3.3' 2018-04-25 16:35:20 +02:00
Lipu Fei
df1e15b1e5 Move the definition_changes fix to CuraContainerStack
CURA-5281
3.3.1
2018-04-25 16:12:47 +02:00
Lipu Fei
50e2db47c8 Fix can_upgrade flag for non-working plugins
CURA-5287
2018-04-25 14:24:49 +02:00
Ghostkeeper
4aec316b48
Prevent homing twice on printers that don't support X/Y specialisation
If the X Y is ignored and it just executes G28, it still executes it only once now.
2018-04-25 13:29:07 +02:00
Lipu Fei
ec9be7a103 Merge remote-tracking branch 'origin/3.3' 2018-04-25 12:55:21 +02:00
Lipu Fei
1d8c2bea98 Do not reset quality if the current custom quality is based on not supported
CURA-5285
2018-04-25 12:40:10 +02:00
Lipu Fei
491e0c83ba Allow to select custom profiles based-on not supported
CURA-5285
2018-04-25 12:38:57 +02:00
Lipu Fei
a6b62656c7 Fix quality profiles for Vertex Delta K8800
CURA-5284

quality_type "extreme" is used but not defined.
2018-04-25 12:01:41 +02:00
Lipu Fei
c4994918c8 Make sure all stacks in a loaded machine have non-empty definition_changes container
CURA-5281
2018-04-25 11:16:02 +02:00
Diego Prado Gesto
3b499edac5 Add back the setAcceptsCommands function with a deprecated decorator. 2018-04-25 10:20:48 +02:00
Ghostkeeper
4fc29554ef
Don't process inheritance before there is an active global container
This could be called after an extruder was disabled by a broken configuration.

Fixes #3570.
2018-04-25 09:59:25 +02:00
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
kerog777
9d9a238b2c Update start gcode
bed_temperature should have been print_bed_temperature.  Refined
heating steps and added a purge line.
2018-04-24 21:30:54 -07:00
kerog777
616d3f9ea8 Fixed version numbers and moved hardware_type = nozzle to metadata
section.
2018-04-24 17:11:17 -07:00
Ian Paschal
236e2db47e CURA-5035 Fixed selection header 2018-04-24 16:59:23 +02:00
Ian Paschal
f2301eec31 CURA-5035 Simplify selection 2018-04-24 15:34:05 +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 3.3.0 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
kerog777
930b716cc2 Fix brackets in start_gcode
Had square brackets instead of curly brackets in M109 commands.  Still
worked OK from SD, but not from Octoprint.
2018-04-23 21:06:52 -07:00
kerog777
e8b37ea39c Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile 2018-04-23 21:05:34 -07:00
THeijmans
2db98c18cd PP formula based temperatures fix 2018-04-23 17:07:31 +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