11407 Commits

Author SHA1 Message Date
Lipu Fei
74eb17203d Fix empty containers in stack upgrade 2017-11-20 13:05:18 +01:00
Ghostkeeper
2974c4d7ab
Merge branch 'cura/Cura/master' of https://github.com/maukcc/Cura into maukcc-cura/Cura/master 2017-11-20 13:04:34 +01:00
Diego Prado Gesto
56db10d9cb CURA-4526 Change simulation behavior when clicking on Play button 2017-11-20 11:24:25 +01:00
orel Windows
565574a183 Replace the print temperature setting used in gstart code as layer 0 print temperature seems more relevant. 2017-11-20 10:59:57 +01:00
Ghostkeeper
6932194df7
Add setting to set the maximum mesh resolution
Implements issue CURA-4590.
2017-11-20 10:51:51 +01:00
orel Windows
05b4689bd6 Improve discoeasy200 profile, especially the machine gcode start as it uses 'print_temperature' which is an invalid Cura setting. 2017-11-20 10:40:25 +01:00
ChrisTerBeke
8522fbf6f5 fix merge conflict 2017-11-20 10:24:33 +01:00
Aleksei S
571ebccb89 Fix merge conflict in print information - CURA-4581 2017-11-20 10:21:13 +01:00
Diego Prado Gesto
41d0df5b5b
Merge branch 'master' into print_simulation_view 2017-11-20 09:29:18 +01:00
Diego Prado Gesto
217fb606c4 CURA-4577 Fix the previous change 2017-11-20 09:04:07 +01:00
Ruben D
6d2bcd9b3e
Fix error message when slicing with per-object setting errors
The message was generating a list of settings that had an error state by going through all extruder stacks and the global stack, but didn't bother to check the per-object stacks. I could've added it to the regular message but then the user would be confused because he can't find any errors either. So instead I opted to specify that it happened in per-model settings. It's not perfect, but should narrow down the user's search considerably.

Fixes #2427.
2017-11-20 01:55:57 +01:00
Aleksei S
f484467f86 Clean project name in PrintInformation after removing the last model
CURA-4581
2017-11-17 18:11:22 +01:00
Ghostkeeper
7a42c5bcce
Fix technical mistakes of Japanese translation
There's a lot of keys that weren't added to the Japanese translation. Our program crashes on these because it can't find where it needs to fill in the argument.
2017-11-17 16:49:56 +01:00
Ghostkeeper
568e18f664
Add Japanese translation of cura.po
It's quite bad though so let's see what improvements we can make.
2017-11-17 16:49:47 +01:00
Ghostkeeper
91621497f0
Fix technical mistakes of Japanese translation
There's a lot of keys that weren't added to the Japanese translation. Our program crashes on these because it can't find where it needs to fill in the argument.
2017-11-17 16:38:02 +01:00
ChrisTerBeke
fb2ffb7270 Simplify relative positioning xyz value updates - CURA-4577 2017-11-17 16:31:16 +01:00
Ghostkeeper
37163ec0b4
Add Japanese translation of cura.po
It's quite bad though so let's see what improvements we can make.
2017-11-17 16:30:57 +01:00
Aleksei S
01437b2db1 Merge branch 'master' of github.com:Ultimaker/cura 2017-11-17 15:24:18 +01:00
Aleksei S
93de006271 Remove suffix .curaproject for case "import models" 2017-11-17 15:22:29 +01:00
Diego Prado Gesto
39428991de Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-17 15:07:10 +01:00
Diego Prado Gesto
a0304255d1 CURA-4577 Take into account relative movements in GCodes 2017-11-17 15:05:08 +01:00
Diego Prado Gesto
98d48978a8 CURA-4526 Add the SimulationView plugin to Cura and deleting LayerView
plugin
2017-11-17 14:27:46 +01:00
Diego Prado Gesto
0f6d65950a CURA-4526 Add colors to themes for selected handles 2017-11-17 13:18:44 +01:00
ChrisTerBeke
f48539cc93
Merge pull request #2685 from Ultimaker/container_stack_improvements
Container stack improvements
2017-11-17 13:09:54 +01:00
Lipu Fei
2c39612bc8 Fix UM2 upgrade regarding the variant
CURA-4482

UM2 by default doesn't have variants, but if the user enables Olsson
Block, the variant option will become available. This commit fixes the
following cases:

- Make sure that the variant is set on the extruder stack but not the
  global stack
- Extruder stacks don't contain information such as has_variant. Such
  info should be retrieved from the global stack and not just from the
  definition container because they can be overriden by other
  containers.
2017-11-17 12:47:30 +01:00
Lipu Fei
e246784df2 Use parseBool() for metadata bool values
CURA-4482
2017-11-17 12:43:30 +01:00
Ghostkeeper
aa92d4d0f9
Add to all installation to lib/ folders
Some systems have a suffix there to indicate the address size, such as lib64.
2017-11-17 11:46:55 +01:00
Lipu Fei
9b102f9a7e Remove unused function in StartSliceJob
CURA-4482
2017-11-17 11:03:13 +01:00
Lipu Fei
cd37f91a0a Remove unnecessary code in BuildVolume
CURA-4482
2017-11-17 11:02:41 +01:00
Ghostkeeper
f27494d60a
Move ironing into shell category
It is no longer considered experimental.
2017-11-17 10:59:14 +01:00
Ghostkeeper
15a50511b7
Don't crash if support density is 0
Found while working on CURA-4523.
2017-11-17 10:57:23 +01:00
Diego Prado Gesto
b868f913c4 CURA-4577 Adding relative positioning to GCodeReader 2017-11-16 10:27:52 +01:00
Aleksei S
ce0510cee3 Hide icons if they overlap monitor button
CURA-4527
2017-11-15 16:34:22 +01:00
Andreea Scorojitu
9bcc4da4a1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-15 13:40:56 +01:00
Andreea Scorojitu
7aeaf661ae Change_Color_UI_elements_CURA-4548 2017-11-15 13:40:46 +01:00
Diego Prado Gesto
50308c6e39 CURA-4526 Calculate the line width from the GCode 2017-11-15 13:03:36 +01:00
Thomas Karl Pietrowski
b2da4894b1
CuraApplication: Rename file --> file_name
'file' is a built-in function!
2017-11-15 01:21:08 +01:00
Ruben D
8dd91519a6
Move Support Chunk Size out of children of skip_some_zags
The rule is that leaf settings are the ones that are used by the engine. The support_skip_some_zags setting is used by the engine.
2017-11-15 00:54:08 +01:00
Aleksei S
3d2868c336 Added icons
CURA-4527
2017-11-15 00:43:17 +01:00
Diego Prado Gesto
99319b223c CURA-4526 GCodeReader now reads the feedrate and layer thickness 2017-11-14 15:28:31 +01:00
MaukCC
b081b686a8
Merge branch 'master' into cura/Cura/master 2017-11-14 11:59:35 +01:00
Mark
913bcf45b1 Add stderr to send errors to 2017-11-14 11:53:24 +01:00
MaukCC
38882c6d13
Update cartesio.def.json 2017-11-14 10:53:51 +01:00
maukcc
ef2d9b0468 Cartesio profiles
updated prime tower
update PC profiles
2017-11-14 10:30:10 +01:00
Diego Prado Gesto
1008789364 Merge branch 'master' into print_simulation_view 2017-11-13 11:28:27 +01:00
Diego Prado Gesto
720b9ebdfa CURA-4556 Add profiles for AA0.25 and BAM material 2017-11-13 11:06:27 +01:00
Ruben D
6d05c320a8
Remove disfunctional initial layer z offset settings
The pull request for the engine wasn't merged. It looks like the pull request for the front-end settings wasn't merged either, but here they are. They shouldn't be here.

Fixes #2744.
2017-11-11 17:51:33 +01:00
Diego Prado Gesto
aa9f9d5b88 Add line thickness and feedrate to the data sent from the backend 2017-11-10 16:59:06 +01:00
ChrisTerBeke
88cf40e2d7 Merge branch 'master' into container_stack_improvements 2017-11-10 14:35:13 +01:00
ChrisTerBeke
6f298d1602 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-10 14:34:28 +01:00