Commit graph

13920 commits

Author SHA1 Message Date
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
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
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
Ghostkeeper
74016f0fb3
Merge branch 'jbkim-3.3' into 3.3 2018-04-20 14:19:03 +02:00
Ghostkeeper
132efba272
Undo some of the changes that we thought were wrong
In these cases we trust the original translation of Bothof better.

Contributes to issue CURA-5166.
2018-04-20 14:18:45 +02:00
Ghostkeeper
1578a76aa4
Merge branch '3.3' of https://github.com/jbkim/Cura into jbkim-3.3 2018-04-20 13:32:48 +02:00
Diego Prado Gesto
f003adeb1e CURA-5250 Add color to the text so it also works fine with other themes. 2018-04-20 10:19:25 +02:00
Diego Prado Gesto
5567d6f168 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-19 10:24:04 +02:00
Diego Prado Gesto
cdc297c87e CURA-5250 Temporary hide buildplate selector.
Put back again when the whole feature is ready.
2018-04-19 10:23:01 +02:00
Diego Prado Gesto
62b586a6ff CURA-5250 Add hint when the buildplate is just usable but not the
recommended.
2018-04-19 10:21:19 +02:00
Lipu Fei
aab87a5558
Merge pull request #3584 from ohrn/zyyx
Add ZYYX Agile printer.
2018-04-19 09:38:19 +02:00
Lipu Fei
f24e1da934 Always update job name for gcode files
CURA-5246
2018-04-19 09:17:22 +02:00
Jinbuhm Kim
0a5f1878b7 Update Korean translation for Cura 3.3 2018-04-19 16:13:40 +09:00
Lipu Fei
d56e726507
Merge pull request #3685 from Ultimaker/fix_support_eraser_3.3
[3.3] Fix support eraser
2018-04-19 08:34:24 +02:00
fieldOfView
57404deba6 Prevent scaling support eraser with scaled parent 2018-04-19 08:32:50 +02:00
fieldOfView
a52eaa98f1 When multiplying a parented node, multiply the parent instead (like groups) 2018-04-19 08:32:50 +02:00
fieldOfView
ea6d4d96f9 Exclude non-printing-meshes from bounding box of parents
Non-printing-meshes inside a group should not affect push apart or drop to build plate
2018-04-19 08:32:50 +02:00
fieldOfView
0e85802f9c Only respond to left mouse button 2018-04-19 08:32:50 +02:00
Jinbuhm Kim
76211fc07b Fix and add Korean translation 2018-04-19 12:31:13 +09:00
Diego Prado Gesto
9a389bdcdd Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-18 16:55:18 +02:00
Diego Prado Gesto
ee359571c0 CURA-5246 Start the timer for updating the platform activity also when
the node that changed is a GCode, that has layer data.
2018-04-18 16:53:33 +02:00
Lipu Fei
2ba7a6e462 Revert "Fix gcode.gz double extension problem on Mac"
This reverts commit fa90fcf18e.

CURA-5228
2018-04-18 16:00:08 +02:00
Lipu Fei
340916179a Small typo fixes for preheat timeout
CURA-5227
2018-04-18 12:00:50 +02:00
Lipu Fei
dc52678c05
Merge pull request #3620 from fieldOfView/fix_preheat_end_during_print
[3.3] Prevent preheat timeout from occurring during a print
2018-04-18 11:59:54 +02:00
Lipu Fei
372419c223 Fix fallback quality setting
CURA-5218
2018-04-18 11:24:09 +02:00
Lipu Fei
650638fcdd Fix setting default quality
CURA-5218
2018-04-18 11:20:43 +02:00
Lipu Fei
7326ee8c40 Fix typo
CURA-5218
2018-04-18 11:19:04 +02:00
Lipu Fei
bae1d2a59d Switch to a default quality if the specified is not available
CURA-5218
2018-04-18 11:16:19 +02:00
Ghostkeeper
7ce7b53098
Merge branch '3.3' of https://github.com/jbkim/Cura into jbkim-3.3 2018-04-18 11:03:28 +02:00
Lipu Fei
1fefc05698 Fix UM2 custom profile upgrade from 2.7
CURA-5218
2018-04-18 10:54:54 +02:00
Ghostkeeper
2f14274b87
Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-18 10:41:17 +02:00
Ghostkeeper
f19b717503
Corrections to Polish translations
One small correction that seems to have been a typo (and the header wasn't up to date yet).

Contributes to issue CURA-5166.
2018-04-18 10:40:49 +02:00
Ghostkeeper
921ef993c7
Update Polish translations for Cura 3.3
These are the translations received from Anraf1001, the unmodified files.

Contributes to issue CURA-5166.
2018-04-18 10:37:39 +02:00
Lipu Fei
1d4a70e839 Show all quality_changes on the quality management page
CURA-5218
2018-04-18 10:35:53 +02:00
Lipu Fei
83c728c89e Update job name when pre-sliced flag changes
CURA-5246
2018-04-18 10:24:58 +02:00
Ghostkeeper
407b453ba5
Corrections to European Portuguese translation
These corrections are necessary to make the text fit better.
2018-04-18 09:41:54 +02:00
Ghostkeeper
d28c94a000
Make corrections from Utopica3D
Paulo made a bunch of corrections to our European Portuguese translation. These are his files.

Contributes to issue CURA-5166.
2018-04-18 09:40:23 +02:00
Lipu Fei
fa90fcf18e Fix gcode.gz double extension problem on Mac
CURA-5228
2018-04-17 15:03:17 +02:00
Ghostkeeper
1b173e8119
Correct translation of 'Affects'
Apparently 'touché' means something more like a human touching it, rather than something affecting something else.

Fixes #3489.
2018-04-17 14:32:02 +02:00
Ghostkeeper
0f39b36bd6
Correction to French translation of 'Hollow Out Objects'
Fixes #3489.
2018-04-17 14:30:08 +02:00
Ghostkeeper
b744302557
Merge branch 'M&P-Setting-Optimization' into 3.3 2018-04-17 13:56:11 +02:00
Diego Prado Gesto
94cad851a4 Use the correct filament diameter to calculate line width in the gcode
parser.
2018-04-17 13:39:22 +02:00
Diego Prado Gesto
2ebf6e8d51 CURA-5232 Renaming variable since it was on conflict with a new variable
introduced in 4cabcb3632fe7a2c987e70197767a6a4bf88349b
2018-04-17 13:07:15 +02:00
Ghostkeeper
4c75d78f26
Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-17 11:36:45 +02:00
Diego Prado Gesto
96dcff8ba5 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-17 11:25:01 +02:00