Merge branch 'card_fixes' into 'master'

GRN fixes

See merge request core-developers/forge!930

forge-gui/res/cardsfolder/upcoming/gateway_plaza.txt

@@ -1,5 +1,4 @@
 Name:Gateway Plaza
-ManaCost:
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you pay {1}.

forge-gui/res/cardsfolder/upcoming/knight_of_autumn.txt

@@ -3,7 +3,7 @@ ManaCost:1 G W
 Types:Creature Dryad Knight
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
-SVar:TrigCharm:DB$ Charm | Cost$ 1 R W | Choices$ DBPump,DBDestroy,DBGainLife
+SVar:TrigCharm:DB$ Charm | Choices$ DBPump,DBDestroy,DBGainLife
 SVar:DBPump:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on CARDNAME.
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 4 | SpellDescription$ You gain 4 life.

forge-gui/tools/EditionTracking.py

@@ -42,6 +42,10 @@ def initializeEditions():
 							settype = line.split("=")[1].rstrip()
 
 					else:
+						if line.startswith("[tokens]"):
+							metadata = True
+							continue
+
 						if line:
 							hasSetNumbers = line.split(" ", 1)[0].isdigit()