Add missing enum values from Celestial Forge expansion

src/models/Item.java

@@ -55,7 +55,7 @@ public class View extends ImageView implements Comparable<View>{
 
         //hack used to turn token pairs into an Enum for use with other classes
         public static enum Pair{
-            None_None,Minor_None,Minor_Minor,Major_None,Major_Minor,Major_Major;//,Great_None,Great_Major,Great_Great,Ultimate_None,Ultimate_Great,Ultimate_Ultimate;
+            None_None,Minor_None,Minor_Minor,Major_None,Major_Minor,Major_Major,Great_Major;//,Great_None,Great_Major,Great_Great,Ultimate_None,Ultimate_Great,Ultimate_Ultimate;
             public static Pair get(Token t1,Token t2){return Pair.valueOf(t1+"_"+t2);}
             public View getView(){return new View();}
             public HView getHView(){return new HView();}

src/models/Set.java

@@ -1,7 +1,7 @@
 package models;
 
 public enum Set{
-    Base,AotA,Cit,AA,AI,CM;
+    Base,AotA,Cit,AA,AI,CM,_,CF;
     private final static Set[]values=Set.values();
     public static Set value(int i){return values[i];}
 }

src/models/Trigger.java

@@ -20,5 +20,5 @@ public Trigger(Integer trigger, Integer keep, Effect effect, String text) {
         this.amountRight = 0;
     }    
 
-    public enum Effect{Armor,Block,Boost,Handicap,Move,Special}
+    public enum Effect{Armor,Attack,Block,Boost,Handicap,Move,Special}
 }