diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt
index c613c0e..dffb71d 100644
--- a/thaumicbees_res/changelog.txt
+++ b/thaumicbees_res/changelog.txt
@@ -1,3 +1,5 @@
+Made greatwood & silverwood planks fireproof by default - added a config option to toggle it.
+
 1.4.3c
 Thaumium Grafter now doubles your chance to get Greatwood & Silverwood saplings.
 Thaumium Grafter now takes extra damage when trying to break Greatwood & Silverwood leaves.
diff --git a/thaumicbees_res/lang/thaumicbees/en_US.xml b/thaumicbees_res/lang/thaumicbees/en_US.xml
index b52e7fd..b89d1b3 100644
--- a/thaumicbees_res/lang/thaumicbees/en_US.xml
+++ b/thaumicbees_res/lang/thaumicbees/en_US.xml
@@ -147,7 +147,7 @@
     <entry key="thaumicbees.speciesBatty">Batty</entry>
     <entry key="thaumicbees.speciesBatty.description">They tend to attract bats to their hives through means unknown.|Apinomicon</entry>
     <entry key="thaumicbees.speciesGhastly">Ghastly</entry>
-    <entry key="thaumicbees.speciesGhastly.description">"*sigh*... Really, Myst?"|Taveria</entry>
+    <entry key="thaumicbees.speciesGhastly.description">"*sigh*... Really, Myst?"|Taveria, irritated Apiarist</entry>
     <entry key="thaumicbees.speciesTimely">Timely</entry>
     <entry key="thaumicbees.speciesTimely.description">"An apiarist is never late. He arrives precicely when he means to!"|Sengir, Mad Apiarist</entry>
     <entry key="thaumicbees.speciesLordly">Lordly</entry>
diff --git a/thaumicbees_src/thaumicbees/block/BlockEffectJar.java b/thaumicbees_src/thaumicbees/block/BlockEffectJar.java
new file mode 100644
index 0000000..e83209c
--- /dev/null
+++ b/thaumicbees_src/thaumicbees/block/BlockEffectJar.java
@@ -0,0 +1,20 @@
+package thaumicbees.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+
+public class BlockEffectJar extends Block
+{
+	public BlockEffectJar(int id)
+	{
+		super(id, Material.glass);
+	}
+
+}
diff --git a/thaumicbees_src/thaumicbees/block/BlockPlanks.java b/thaumicbees_src/thaumicbees/block/BlockPlanks.java
index a24feee..ccc84d3 100644
--- a/thaumicbees_src/thaumicbees/block/BlockPlanks.java
+++ b/thaumicbees_src/thaumicbees/block/BlockPlanks.java
@@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumicbees.item.types.PlankType;
 import thaumicbees.main.CommonProxy;
+import thaumicbees.main.ThaumicBees;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockWood;
 import net.minecraft.block.material.Material;
@@ -22,7 +23,10 @@ public class BlockPlanks extends Block
 		this.setBlockName("tb.planks");
 		this.setCreativeTab(CreativeTabs.tabBlock);
 		this.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE);
-		Block.setBurnProperties(id, 5, 20);
+		if (ThaumicBees.getConfig().AreMagicPlanksFlammable)
+		{
+			Block.setBurnProperties(id, 5, 20);
+		}
 	}
 
 	@Override
diff --git a/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java b/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java
index 85bfdd8..3d81de2 100644
--- a/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java
+++ b/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java
@@ -6,6 +6,7 @@ import java.util.Random;
 import thaumicbees.item.types.PlankType;
 import thaumicbees.main.CommonProxy;
 import thaumicbees.main.Config;
+import thaumicbees.main.ThaumicBees;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -26,7 +27,10 @@ public class BlockWoodSlab extends BlockHalfSlab
 		this.setCreativeTab(CreativeTabs.tabBlock);
 		this.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE);
 		this.setLightOpacity(doubleSlab ? 255 : 0);
-		Block.setBurnProperties(id, 5, 20);
+		if (ThaumicBees.getConfig().AreMagicPlanksFlammable)
+		{
+			Block.setBurnProperties(id, 5, 20);
+		}
 	}
 
 	@Override
diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java
index ae508b5..78278f9 100644
--- a/thaumicbees_src/thaumicbees/main/Config.java
+++ b/thaumicbees_src/thaumicbees/main/Config.java
@@ -57,6 +57,7 @@ public class Config
 	public boolean ExtraBeesInstalled;
 	public boolean AddThaumcraftItemsToBackpacks;
 	public boolean SkipUpdateCheck;
+	public boolean AreMagicPlanksFlammable;
 	public String ThaumaturgeExtraItems;
 	public int capsuleStackSizeMax;
 
@@ -269,6 +270,10 @@ public class Config
 		p = tbConfig.get("general", "disableVersionCheck", false);
 		p.comment = "Set to true to stop ThaumicBees from checking for updates.";
 		this.SkipUpdateCheck = p.getBoolean(false);
+		
+		p = tbConfig.get("general", "areMagicPlanksFlammable", false);
+		p.comment = "Set to true to allow Greatwood & Silverwood planks to burn in a fire.";
+		this.AreMagicPlanksFlammable = p.getBoolean(false);
 	}
 
 }