Merge remote-tracking branch 'upstream/master'

2016-12-24 00:13:54 -05:00 · 2016-12-24 00:13:54 -05:00 · 8a807c888c
commit 8a807c888c
parent a40a67c2b8 d0249716c2
11 changed files with 843 additions and 335 deletions
--- a/Mage/src/main/java/mage/counters/CounterType.java
+++ b/Mage/src/main/java/mage/counters/CounterType.java
@ -94,6 +94,7 @@ public enum CounterType {
    PETAL("petal"),
    PETRIFICATION("petrification"),
    PLAGUE("plague"),
+    PLOT("plot"),
    POLYP("polyp"),
    POISON("poison"),
    PRESSURE("pressure"),