diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-20 15:27:18 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-20 15:27:18 (GMT) |
| commit | 35f84a09422e5243432530e6239bfc3de5e9846c (patch) | |
| tree | 27eef690fbb6bb8908bac0848fa76f12361b2518 /src/simulation/elements/FRAY.cpp | |
| parent | 826b966668fe37d836de91cf29a6db0d1afee1f4 (diff) | |
| parent | d29b001d82547e3c2f2e5ef4cf30b84ce59934b7 (diff) | |
| download | powder-35f84a09422e5243432530e6239bfc3de5e9846c.zip powder-35f84a09422e5243432530e6239bfc3de5e9846c.tar.gz | |
Merge remote-tracking branch 'origin/master'
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 8eed23c..c20e1a3 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 temperature. Use like ARAY."; State = ST_SOLID; Properties = TYPE_SOLID|PROP_LIFE_DEC; |