From cbd402d8cb6aa699ffde83a1b5b3c2f4fc51baaf Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Fri, 17 May 2013 12:44:18 -0400
Subject: fix CFLM making VIBR unable to explode


diff --git a/.gitignore b/.gitignore
index 9ac6e38..15c661a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,10 @@ Makefile.me
 *.settings
 *.cbp
 *.layout
+*.config
+*.creator
+*.files
+*.includes
 config.log
 *.sconsign.dblite
 *.sconf_temp
diff --git a/src/simulation/elements/VIBR.cpp b/src/simulation/elements/VIBR.cpp
index 0d27702..cf6d2f5 100644
--- a/src/simulation/elements/VIBR.cpp
+++ b/src/simulation/elements/VIBR.cpp
@@ -157,7 +157,7 @@ int Element_VIBR::update(UPDATE_FUNC_ARGS) {
 					{
 						if (!parts[r>>8].life)
 							parts[r>>8].tmp += 45;
-						else if (parts[i].tmp2 && rand()%2)
+						else if (parts[i].tmp2 && parts[i].life > 75 && rand()%2)
 						{
 							parts[r>>8].tmp2 = 1;
 							parts[i].tmp = 0;
--
cgit v0.9.2-21-gd62e

From 5b1389621fd58bdc281c854b62a1a9d027b7e9cb Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Sat, 18 May 2013 23:12:37 -0400
Subject: minor fixes to descriptions (again)


diff --git a/src/simulation/elements/FIRW.cpp b/src/simulation/elements/FIRW.cpp
index aeedaf0..369b5c0 100644
--- a/src/simulation/elements/FIRW.cpp
+++ b/src/simulation/elements/FIRW.cpp
@@ -32,7 +32,7 @@ Element_FIRW::Element_FIRW()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 70;
-	Description = "Fireworks! Colorful, set off by fire";
+	Description = "Fireworks! Colorful, set off by fire.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART|PROP_LIFE_DEC;
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;
diff --git a/src/simulation/elements/PRTI.cpp b/src/simulation/elements/PRTI.cpp
index 2d629a6..aaddb4d 100644
--- a/src/simulation/elements/PRTI.cpp
+++ b/src/simulation/elements/PRTI.cpp
@@ -28,7 +28,7 @@ Element_PRTI::Element_PRTI()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Portal IN. Particles go in here. Also has temperature dependent channels (same as WIFI)";
+	Description = "Portal IN. Particles go in here. Also has temperature dependent channels. (same as WIFI)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PRTO.cpp b/src/simulation/elements/PRTO.cpp
index 218ce78..6ec11b4 100644
--- a/src/simulation/elements/PRTO.cpp
+++ b/src/simulation/elements/PRTO.cpp
@@ -28,7 +28,7 @@ Element_PRTO::Element_PRTO()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Portal OUT. Particles come out here. Also has temperature dependent channels (same as WIFI)";
+	Description = "Portal OUT. Particles come out here. Also has temperature dependent channels. (same as WIFI)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/WIRE.cpp b/src/simulation/elements/WIRE.cpp
index 6d4c1a7..6c5e9d7 100644
--- a/src/simulation/elements/WIRE.cpp
+++ b/src/simulation/elements/WIRE.cpp
@@ -28,7 +28,7 @@ Element_WIRE::Element_WIRE()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 250;
-	Description = "WireWorld wires, conducts based on a set of GOL-like rules";
+	Description = "WireWorld wires, conducts based on a set of GOL-like rules.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;
--
cgit v0.9.2-21-gd62e

From 45f057957b6359190b6b2e150fddf926a525d070 Mon Sep 17 00:00:00 2001
From: jacksonmj <mj-pt@jacksonmj.co.uk>
Date: Sun, 19 May 2013 21:46:55 +0100
Subject: Fix description: METL does not break under pressure


diff --git a/src/simulation/elements/METL.cpp b/src/simulation/elements/METL.cpp
index d504e57..5b2c8fb 100644
--- a/src/simulation/elements/METL.cpp
+++ b/src/simulation/elements/METL.cpp
@@ -28,7 +28,7 @@ Element_METL::Element_METL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "The basic conductor, meltable and breaks under pressure.";
+	Description = "The basic conductor. Meltable.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
--
cgit v0.9.2-21-gd62e