matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jacob1 2012-12-14 13:51:44 -05:00
commit f03fb97620
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simulation/elements/WIRE.cpp
View File

@ -3,7 +3,7 @@
Element_WIRE::Element_WIRE() Element_WIRE::Element_WIRE()
{ {
Identifier = "DEFAULT_PT_WIRE"; Identifier = "DEFAULT_PT_WIRE";
Name = "WIRE"; Name = "WWLD";
Colour = PIXPACK(0xFFCC00); Colour = PIXPACK(0xFFCC00);
MenuVisible = 1; MenuVisible = 1;
MenuSection = SC_ELEC; MenuSection = SC_ELEC;
@ -28,7 +28,7 @@ Element_WIRE::Element_WIRE()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 250; HeatConduct = 250;
Description = "WireWorld wires."; Description = "WireWorld wires, probably not what you want. For normal wires, use METL";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID; Properties = TYPE_SOLID;