From c3ee3f4ccdcdc37020e57a360f01be452b16c7b0 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 09:11:40 +0000
Subject: [PATCH] add Timbermare (from Planar Chaos)

---
 .gitattributes                       |  1 +
 res/cardsfolder/timbermare.txt       | 10 ++++++++++
 src/forge/CardFactory_Creatures.java |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 res/cardsfolder/timbermare.txt

diff --git a/.gitattributes b/.gitattributes
index 06e5c0ea8e3..4d7b6e20d23 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4207,6 +4207,7 @@ res/cardsfolder/tiger_claws.txt -text svneol=native#text/plain
 res/cardsfolder/tigereye_cameo.txt -text svneol=native#text/plain
 res/cardsfolder/timber_protector.txt -text svneol=native#text/plain
 res/cardsfolder/timberland_ruins.txt -text svneol=native#text/plain
+res/cardsfolder/timbermare.txt -text svneol=native#text/plain
 res/cardsfolder/timbermaw_larva.txt -text svneol=native#text/plain
 res/cardsfolder/timberwatch_elf.txt -text svneol=native#text/plain
 res/cardsfolder/time_ebb.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/timbermare.txt b/res/cardsfolder/timbermare.txt
new file mode 100644
index 00000000000..894ad156797
--- /dev/null
+++ b/res/cardsfolder/timbermare.txt
@@ -0,0 +1,10 @@
+Name:Timbermare
+ManaCost:3 G
+Types:Creature Elemental Horse
+Text:no text
+PT:5/5
+K:Haste
+K:Echo:5 G
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/timbermare.jpg
+End
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 0eb286fa5d1..bda2e73b357 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -20149,7 +20149,7 @@ public class CardFactory_Creatures {
         }//*************** END ************ END **************************
         
         //*************** START *********** START **************************
-        else if(cardName.equals("Thundermare")) {
+        else if(cardName.equals("Thundermare") || cardName.equals("Timbermare")) {
         	/*
         	 * When Thundermare enters the battlefield, tap all other creatures.
         	 */