diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-14 18:51:44 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-14 18:51:44 (GMT) |
| commit | f03fb976201e17b5512838963c0ed268944c90a3 (patch) | |
| tree | e229e81c484c621c2e05ce6f14433e5bdbd969ac /src/simulation/elements | |
| parent | 5362c56f7e1cdfc7c0c2486bde6bb86fa531b5c7 (diff) | |
| parent | e5feefa41920f5bc32f39122c3235976aabcbadd (diff) | |
| download | powder-f03fb976201e17b5512838963c0ed268944c90a3.zip powder-f03fb976201e17b5512838963c0ed268944c90a3.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/WIRE.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/WIRE.cpp b/src/simulation/elements/WIRE.cpp index 4f59060..d381c73 100644 --- a/src/simulation/elements/WIRE.cpp +++ b/src/simulation/elements/WIRE.cpp @@ -3,7 +3,7 @@ Element_WIRE::Element_WIRE() { Identifier = "DEFAULT_PT_WIRE"; - Name = "WIRE"; + Name = "WWLD"; Colour = PIXPACK(0xFFCC00); MenuVisible = 1; MenuSection = SC_ELEC; @@ -28,7 +28,7 @@ Element_WIRE::Element_WIRE() Temperature = R_TEMP+0.0f +273.15f; HeatConduct = 250; - Description = "WireWorld wires."; + Description = "WireWorld wires, probably not what you want. For normal wires, use METL"; State = ST_SOLID; Properties = TYPE_SOLID; |