Merge branch 'master' into 'master'

Update digital sets

See merge request core-developers/forge!4163

forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java

@@ -142,6 +142,7 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
             lstSets.addGroup("Reprint Sets");
             lstSets.addGroup("Starter Sets");
             lstSets.addGroup("Promo Sets");
+            lstSets.addGroup("Digital Sets");
             lstSets.addGroup("Funny Sets");
             lstSets.addGroup("Custom Sets");
             lstSets.addGroup("Other Sets");
@@ -173,14 +174,17 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
                 case PROMOS:
                     lstSets.addItem(set, 7);
                     break;
-                case FUNNY:
+                case ONLINE:
                     lstSets.addItem(set, 8);
                     break;
+                case FUNNY:
+                    lstSets.addItem(set, 9);
+                    break;
                 case THIRDPARTY:
-                    lstSets.addItem(set, 7);
+                    lstSets.addItem(set, 10);
                     break;
                 default:
-                    lstSets.addItem(set, 10);
+                    lstSets.addItem(set, 11);
                     break;
                 }
             }

forge-gui/res/editions/Amonkhet Remastered.txt

@@ -4,7 +4,7 @@ Date=2020-08-13
 Name=Amonkhet Remastered
 BoosterCovers=1
 Booster=10 Common, 3 Uncommon, 1 RareMythic:!fromSheet("AKR buy a box")
-Type=Expansion
+Type=Online
 
 [cards]
 1 M Angel of Sanctions

forge-gui/res/editions/Arena Beginner Set.txt

@@ -2,7 +2,7 @@
 Code=ANB
 Date=2020-08-13
 Name=Arena Beginner Set
-Type=Other
+Type=Online
 
 [cards]
 U Affectionate Indrik

forge-gui/res/editions/Arena New Player Experience.txt

@@ -2,7 +2,7 @@
 Code=ANA
 Date=2018-07-12
 Name=Arena New Player Experience
-Type=Other
+Type=Online
 
 [cards]
 C Altar's Reap

forge-gui/res/editions/Commander Theme Decks.txt

@@ -3,7 +3,7 @@ Code=TD0
 Date=2009-08-25
 Name=Commander Theme Decks
 MciCode=td0
-Type=Other
+Type=Online
 
 [cards]
 1 C Auramancer

forge-gui/res/editions/Duel Decks Mirrodin Pure vs. New Phyrexia.txt

@@ -3,6 +3,7 @@ Code=TD2
 Date=2013-01-11
 Name=Duel Decks: Mirrodin Pure vs. New Phyrexia
 MciCode=td2
+Type=Online
 Type=Duel_Decks
 
 [cards]

forge-gui/res/editions/Historic Anthology 1.txt

@@ -2,7 +2,7 @@
 Code=HA1
 Date=2019-11-21
 Name=Historic Anthology 1
-Type=Other
+Type=Online
 
 [cards]
 1 R Serra Ascendant

forge-gui/res/editions/Historic Anthology 2.txt

@@ -2,7 +2,7 @@
 Code=HA2
 Date=2020-03-12
 Name=Historic Anthology 2
-Type=Other
+Type=Online
 
 [cards]
 1 U Nyx-Fleece Ram

forge-gui/res/editions/Historic Anthology 3.txt

@@ -2,7 +2,7 @@
 Code=HA3
 Date=2020-05-21
 Name=Historic Anthology 3
-Type=Other
+Type=Online
 
 [cards]
 1 U Honden of Cleansing Fire

forge-gui/res/editions/Historic Anthology 4.txt

@@ -2,7 +2,7 @@
 Code=HA4
 Date=2021-03-11
 Name=Historic Anthology 4
-Type=Other
+Type=Online
 
 [cards]
 1 R Adorned Pouncer

forge-gui/res/editions/Jumpstart Arena Exclusives.txt

@@ -2,7 +2,7 @@
 Code=AJMP
 Date=2020-07-17
 Name=Jumpstart Arena Exclusives
-Type=Other
+Type=Online
 
 [cards]
 R Archon of Sun's Grace

forge-gui/res/editions/Kaladesh Remastered.txt

@@ -4,7 +4,7 @@ Date=2020-11-12
 Name=Kaladesh Remastered
 BoosterCovers=1
 Booster=10 Common, 3 Uncommon, 1 RareMythic:fromSheet("KLR cards")
-Type=Expansion
+Type=Online
 
 [cards]
 1 U Aerial Responder

forge-gui/res/editions/Legendary Cube.txt

@@ -4,7 +4,7 @@ Date=2015-11-18
 Name=Legendary Cube
 Code2=PZ1
 MciCode=pz1
-Type=Other
+Type=Online
 
 [cards]
 1 R Bastion Protector

forge-gui/res/editions/Magic Online Deck Series.txt

@@ -3,7 +3,7 @@ Code=TD1
 Date=2010-11-08
 Name=Magic Online Deck Series
 MciCode=td1
-Type=Other
+Type=Online
 
 [cards]
 1 U Aura of Silence

forge-gui/res/editions/Treasure Chests.txt

@@ -3,7 +3,7 @@ Code=PZ2
 Date=2016-11-16
 Name=Treasure Chests
 MciCode=pz2
-Type=Other
+Type=Online
 
 [cards]
 1 C Throne Warden