Commit 608a627b authored by perfectdicky's avatar perfectdicky

Merge remote-tracking branch 'upstream/master'

parents 0b89a2eb ce8bb838
...@@ -2260,9 +2260,24 @@ $whitelist ...@@ -2260,9 +2260,24 @@ $whitelist
160452014 3 --Voidvelgr Elysium 160452014 3 --Voidvelgr Elysium
160452015 3 --Nobody Scat Thief 160452015 3 --Nobody Scat Thief
# Prereleases # Prereleases
160019000 3 --Injection Fairy Lily (Rush)
160019002 3 --Three Riser
160019004 3 --Volcalize Ifrit
160019022 3 --Animal Doctor Lily
160019026 3 --Love Ange
160019027 3 --I'll Love Ange
160019035 3 --Transamu Assault Rainac 160019035 3 --Transamu Assault Rainac
160019036 3 --Transamu Buster Rainac 160019036 3 --Transamu Buster Rainac
160019037 3 --Alchemicalize Orb
160019039 3 --Volcalizing Salamandeus
160019044 3 --Dark Matter Transcend Dragon
160019045 3 --Dark Matter Galaxy Dragon
160019048 3 --Transamu Nebula Fusion 160019048 3 --Transamu Nebula Fusion
160019049 3 --Maximum Flare Fusion
160019050 3 --Chemicalize Volshield
160019053 3 --Lily's Syringe
160019057 3 --Chemicalizer Wing
160019061 3 --Fairy's Injection
160212002 3 --Pot of Duality (Rush) 160212002 3 --Pot of Duality (Rush)
160212005 3 --Ancient Gear Tyranno 160212005 3 --Ancient Gear Tyranno
160212006 3 --Ancient Gear Powered Soldier 160212006 3 --Ancient Gear Powered Soldier
...@@ -2270,6 +2285,7 @@ $whitelist ...@@ -2270,6 +2285,7 @@ $whitelist
160212008 3 --Ancient Gear Soldier (Rush) 160212008 3 --Ancient Gear Soldier (Rush)
160212009 3 --Ancient Gear Medic 160212009 3 --Ancient Gear Medic
160212010 3 --Ancient Gear Supplier 160212010 3 --Ancient Gear Supplier
160212011 3 --Ancient Gear Crown
160212012 3 --Ancient Gear Workshop (Rush) 160212012 3 --Ancient Gear Workshop (Rush)
160212013 3 --Ancient Gear Change 160212013 3 --Ancient Gear Change
160212014 3 --Gear Section 160212014 3 --Gear Section
...@@ -2281,8 +2297,11 @@ $whitelist ...@@ -2281,8 +2297,11 @@ $whitelist
160212025 3 --Imaginary Reactor 160212025 3 --Imaginary Reactor
160212026 3 --Attraction Golem 160212026 3 --Attraction Golem
160212027 3 --Evil Baller 160212027 3 --Evil Baller
160212028 3 --Phantasm Mask Master
160212029 3 --Imaginary Leading Actor 160212029 3 --Imaginary Leading Actor
160212036 3 --Metarion Fusion 160212036 3 --Metarion Fusion
160212037 3 --Imaginary Arc Talents
160212040 3 --Imaginary Arc Turnover
160212041 3 --Grand Legend Saber 160212041 3 --Grand Legend Saber
160212042 3 --Grand Legend Magician 160212042 3 --Grand Legend Magician
160212043 3 --Grand Legend Priest 160212043 3 --Grand Legend Priest
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment