diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-17 16:44:25 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-17 16:44:25 (GMT) |
| commit | 981f6984c2c0f87d54a9c90f4518c69c9ef02ae0 (patch) | |
| tree | 757bd699a23c1fad61e60700265a25feb1a3042c /src/simulation/elements/FRAY.cpp | |
| parent | cbd402d8cb6aa699ffde83a1b5b3c2f4fc51baaf (diff) | |
| parent | 77bf649fb4482c86ac1fd9b3233f062b53226007 (diff) | |
| download | powder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.zip powder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.tar.gz | |
Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/simulation/elements/FRAY.cpp')
| -rw-r--r-- | src/simulation/elements/FRAY.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/FRAY.cpp b/src/simulation/elements/FRAY.cpp index c529b87..8eed23c 100644 --- a/src/simulation/elements/FRAY.cpp +++ b/src/simulation/elements/FRAY.cpp @@ -28,7 +28,7 @@ Element_FRAY::Element_FRAY() Temperature = 20.0f+0.0f +273.15f; HeatConduct = 0; - Description = "Force Emitter. Pushes or pulls objects based on its temp value, use like ARAY."; + Description = "Force Emitter. Pushes or pulls objects based on its temp value. Use like ARAY."; State = ST_SOLID; Properties = TYPE_SOLID|PROP_LIFE_DEC; |