Commit graph

11171 commits

Author SHA1 Message Date
fieldOfView
c7f190bb26 Remove (ancient) commented out code 2017-11-18 11:30:17 +01:00
fieldOfView
1924946b59 Merge branch 'master' into feature_mesh_types
# Conflicts:
#	plugins/SolidView/SolidView.py
2017-11-18 11:28:15 +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
ChrisTerBeke
fb2ffb7270 Simplify relative positioning xyz value updates - CURA-4577 2017-11-17 16:31:16 +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
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
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
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
Mark
913bcf45b1 Add stderr to send errors to 2017-11-14 11:53:24 +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
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
fieldOfView
dcdd1f8650 Tweak descriptions of mesh type options 2017-11-10 12:27:15 +01:00
fieldOfView
e00ac591bf Use material color for cutting_mesh and infill_mesh 2017-11-10 12:24:32 +01:00
fieldOfView
ac27b3f811 Add infill_mesh as an option to the dropdown 2017-11-10 10:08:27 +01:00
fieldOfView
69b707cbfe Fix coloring support_mesh with the color of the support_extruder 2017-11-09 22:02:20 +01:00
fieldOfView
a1320939e8 Update mesh type dropdown when to reflect the selected object 2017-11-09 21:42:10 +01:00
fieldOfView
9c3e50c494 Ignore models without a convex hull when auto arranging 2017-11-09 19:21:05 +01:00
fieldOfView
316ae49b0b Fix setting mesh type through Per Model Settings combobox 2017-11-09 18:25:09 +01:00
fieldOfView
7bf40ef82b Add dropdown to per object settings for quick access to mesh types
(not yet functional)
2017-11-09 17:15:56 +01:00
fieldOfView
3251e5915b Show the support material for support_mesh 2017-11-09 16:06:27 +01:00
Jaime van Kessel
41acedd4c1 Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-09 13:52:20 +01:00
Jaime van Kessel
f2e7fef747 Update PreviewPass so that only slicable objects are rendered 2017-11-09 13:51:47 +01:00
fieldOfView
8f8bdc059a Render non-printing objects as semi transparent objects in Solid View 2017-11-09 12:55:03 +01:00
fieldOfView
0b11117d6d Set a property for non-printing-meshes
Remove code duplication
2017-11-09 12:28:55 +01:00
Andreea Scorojitu
723d593827 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-09 12:02:13 +01:00
Andreea Scorojitu
477e295e70 Change_Color_UI_elements_CURA-4548 2017-11-09 12:02:01 +01:00
fieldOfView
ff14db9133 Remove convex hull for meshes that don't print geometry
Anti-overhang, Infill and Cutting meshes don't print geometry, so they don't need to push other objects away.
2017-11-09 11:29:50 +01:00
Lipu Fei
637d1a1da3 Fix Vertex Delta K8800 definition file 2017-11-09 10:37:51 +01:00
Lipu Fei
b0144c7f10
Merge pull request #2740 from kaleidoscopeit/master
New machine definition : Deltacomb 3D
2017-11-09 10:33:53 +01:00
kaleidoscopeit
714c0f25da Set all "setting_version" in qualitites to 4 2017-11-09 10:25:30 +01:00
Lipu Fei
78456d5bc3 Fix clusterSize property check in QML 2017-11-09 09:06:46 +01:00
Andreea Scorojitu
d6f856e900 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-09 08:47:09 +01:00
Lipu Fei
183c63f765
Merge pull request #2720 from Ultimaker/Update_Infill_Patern_Description
Add_tri-hexagon_and_cross_to_pattern_description
2017-11-09 08:14:35 +01:00
Lipu Fei
cb6c6d51b4
Merge pull request #2751 from Ultimaker/fix_clustersize_null
Also check if base.selectedPrinter is null
2017-11-09 08:05:31 +01:00