Commit 8867a0fe authored by perfectdicky's avatar perfectdicky

Merge remote-tracking branch 'upstream/master'

parents 4a724c5a 7ec21002
......@@ -2271,6 +2271,7 @@ $whitelist
160212047 3 --Legend Scout
160212052 3 --Legend Slash
160212053 3 --Legend Emblem
160212066 3 --Guardian of Order (Rush)
160402043 3 --Bikuribot
# Legends
160001000 3 --Blue-Eyes White Dragon (Rush)
......
#[2024.01 Traditional]
!2024.01 Traditional
#[2024.09 Traditional]
!2024.09 Traditional
62320425 1 --Agido the Ancient Sentry
25862681 1 --Ancient Fairy Dragon
58921041 1 --Anti-Spell Fragrance
4280258 1 --Apollousa, Bow of the Goddess
4280259 1 --Apollousa, Bow of the Goddess
43262273 1 --Appointer of the Red Lotus
6728559 1 --Archnemeses Protos
28985331 1 --Armageddon Knight
20292186 1 --Artifact Scythe
76794549 1 --Astrograph Sorcerer
84815190 1 --Baronne de Fleur
73356503 1 --Barrier Statue of the Stormwinds
27552504 1 --Beatrice, Lady of Eternal
61901281 1 --Black Dragon Collapserpent
9929398 1 --Blackwing - Gofu the Vague Shadow
53804307 1 --Blaster, Dragon Ruler of Infernos
94689206 1 --Block Dragon
27548199 1 --Borreload Savage Dragon
1041278 1 --Branded Expulsion
44362883 1 --Branded Fusion
7394770 1 --Brilliant Fusion
69243953 1 --Butterfly Dagger - Elma
33854624 1 --Bystial Magnamhut
......@@ -38,7 +41,6 @@
99745551 1 --Danger!? Tsuchinoko?
14536035 1 --Dark Grepher
44763025 1 --Deliquent Duo
65536818 1 --Denglong, First of the Yang Zing
23557835 1 --Dimension Fusion
15854426 1 --Divine Wind of the Mist Valley
8903700 1 --Djinn Releaser of Rituals
......@@ -49,6 +51,7 @@
33396948 1 --Exodia the Forbidden One
55623480 1 --Fairy Tail - Snow
78706415 1 --Fiber Jar
46640168 1 --Fiendsmith's Lacrima
95308449 1 --Final Countdown
93369354 1 --Fishborg Blaster
81439173 1 --Foolish Burial
......@@ -65,7 +68,7 @@
18144506 1 --Harpie's Feather Duster
19613556 1 --Heavy Storm
24094258 1 --Heavymetalfoes Electrumite
94677445 1 --Ib the World Chalice Justiciar
62242678 1 --Hot Red Dragon Archfiend King Calamity
61740673 1 --Imperial Order
66957584 1 --Infernity Launcher
1845204 1 --Instant Fusion
......@@ -84,12 +87,11 @@
44519536 1 --Left Leg of the forbidden one
57421866 1 --Level Eater
85243784 1 --Linkross
83190280 1 --Lunalight Tiger
41999284 1 --Linkuriboh
4423206 1 --M-X-Saber Invoker
32723153 1 --Magical Explosion
71650854 1 --Magical Mid-Breaker Field
34206604 1 --Magical Scientist
31178212 1 --Majespecter Unicorn - Kirin
34906152 1 --Mass Driver
21377582 1 --Master Peace, The True Dracoslaying King
36521307 1 --Mathmech Circular
......@@ -107,31 +109,30 @@
76375976 1 --Mystic Mine
3734202 1 --Naturia Sacred Tree
54719828 1 --Number 16: Shock Master
75433814 1 --Number 40: Gimmick Puppet of Strings
10389142 1 --Number 42: Galaxy Tomahawk
63504681 1 --Number 86: Heroic Champion - Rhongomyniad
95474755 1 --Number 89: Diablosis the Mind Hacker
58820923 1 --Number 95: Galaxy-Eyes Dark Matter Dragon
69170557 1 --Number C40: Gimmick Puppet of Dark Strings
52653092 1 --Number S0: Utopic ZEXAL
33782437 1 --One Day of Peace
2295440 1 --One for One
57835716 1 --Orcust Harp Horror
80312545 1 --Opening of the Spirit Gates
34945480 1 --Outer Entity Azathot
38814750 1 --PSY-Framegear Gamma
74191942 1 --Painful Choice
7563579 1 --Performage PlushFire
17330916 1 --Performapal Monkeyboard
12958919 1 --Phantom Skyblaster
23558733 1 --Phoenixian Cluster Amaryllis
84211599 1 --Pot of Prosperity
55144522 1 --Pot of greed
25725326 1 --Prank-Kids Meow-Meow-Mu
70369116 1 --Predaplant Verte Anaconda
70828912 1 --Premature Burial
74586817 1 --Psy-Framelord Omega
55584558 1 --Purrely Delicious Memory
58577036 1 --Reasoning
23002292 1 --Red Reboot
26118970 1 --Red Rose Dragon
90411554 1 --Redox, Dragon Ruler of Boulders
32807846 1 --Reinforcement of the Army
65734501 1 --Rescue-ACE Air Lifter
27174286 1 --Return from the Different Dimension
......@@ -141,19 +142,24 @@
1357146 1 --Ronintoadin
93016201 1 --Royal Oppression
91258852 1 --SPYRAL Master Plan
30336082 1 --Sangen Summoning
24940422 1 --Sekka's Light
57585212 1 --Self-Destruct Button
73468603 1 --Set Rotation
72330894 1 --Simorgh, Bird of Sovereignty
3280747 1 --Sixth Sense
82732705 1 --Skill Drain
52340444 1 --Sky Striker Mecha - Hornet Drones
71344451 1 --Slash Draw
63789924 1 --Smoke Grenade of the Thief
9674034 1 --Snake-Eye Ash
90241276 1 --Snake-Eyes Poplar
45986603 1 --Snatch Steal
54447022 1 --Soul Charge
27381364 1 --Spright Elf
73539069 1 --Striker Dragon
20663556 1 --Substitoad
23516703 1 --Summon Limit
61665245 1 --Summon Sorceress
93896655 1 --Sunavalon Dryas
65563871 1 --Sunvine Healer
......@@ -165,15 +171,11 @@
74078255 1 --Tearlaments Merrli
572850 1 --Tearlaments Scheiren
63101919 1 --Tempest Magician
89399912 1 --Tempest, Dragon Ruler of Storms
73628505 1 --Terraforming
11110587 1 --That Grass Looks Greener
42829885 1 --The Forceful Sentry
88071625 1 --The Tyrant Neptune
24207889 1 --There Can Be Only One
15291624 1 --Thunder Dragon Colossus
26400609 1 --Tidal, Dragon Ruler of Waterfalls
35316708 1 --Time Seal
22593417 1 --Topologic Gumblar Dragon
64697231 1 --Trap Dustshot
88581108 1 --True King of All Calamities
......@@ -189,10 +191,15 @@
85115440 1 --Zoodiac Broadbull
48905153 1 --Zoodiac Drident
78872731 1 --Zoodiac Ratpier
9411399 2 --Destiny HERO - Malicious
53804307 2 --Blaster, Dragon Ruler of Infernos
82385847 2 --Dinowrestler Pankratops
94677445 2 --Ib the World Chalice Justiciar
14532163 2 --Lightning Storm
83190280 2 --Lunalight Tiger
55584558 2 --Purrely Delicious Memory
21347668 2 --Purrely Sleepy Memory
90411554 2 --Redox, Dragon Ruler of Boulders
92107604 2 --Runick Fountain
63166095 2 --Sky Striker Mobilize - Engage!
81275020 2 --Speedroid Terrortop
89399912 2 --Tempest, Dragon Ruler of Storms
15291624 2 --Thunder Dragon Colossus
26400609 2 --Tidal, Dragon Ruler of Waterfalls
#[2024.07 World]
!2024.07 World
#[2024.09 World]
!2024.09 World
#Forbidden
62320425 0 --Agido the Ancient Sentry
91869203 0 --Amazoness Archer
4280259 0 --Apollousa, Bow of the Goddess
4280258 0 --Apollousa, Bow of the Goddess
43262273 0 --Appointer of the Red Lotus
20292186 0 --Artifact Scythe
84815190 0 --Baronne de Fleur
73356503 0 --Barrier Statue of the Stormwinds
27552504 0 --Beatrice, Lady of Eternal
9929398 0 --Blackwing - Gofu the Vague Shadow
94689206 0 --Block Dragon
27548199 0 --Borreload Savage Dragon
......@@ -31,9 +34,9 @@
8903700 0 --Djinn Releaser of Rituals
51858306 0 --Eclipse Wyvern
17412721 0 --Elder Entity Norden
40177746 0 --Eva
55623480 0 --Fairy Tail - Snow
78706415 0 --Fiber Jar
46640168 0 --Fiendsmith's Lacrima
93369354 0 --Fishborg Blaster
42703248 0 --Giant Trunade
67441435 0 --Glow-up Bulb
......@@ -79,7 +82,6 @@
52653092 0 --Number S0: Utopic ZEXAL
34945480 0 --Outer Entity Azathot
74191942 0 --Painful Choice
7563579 0 --Performage PlushFire
7563589 0 --Performage PlushFire (Pre-errata)
23558733 0 --Phoenixian Cluster Amaryllis
55144522 0 --Pot of greed
......@@ -107,7 +109,6 @@
43387895 0 --Supreme King Dragon Starving Venom
92731385 0 --Tearlaments Kitkallos
63101919 0 --Tempest Magician
11110587 0 --That Grass Looks Greener
42829885 0 --The Forceful Sentry
88071625 0 --The Tyrant Neptune
90809975 0 --Toadally Awesome
......@@ -115,8 +116,8 @@
22593417 0 --Topologic Gumblar Dragon
64697231 0 --Trap Dustshot
88581108 0 --True King of All Calamities
80604092 0 --Ultimate Offering
80604091 0 --Ultimate Offering
80604092 0 --Ultimate Offering
83152482 0 --Union Carrier
5851097 0 --Vanity's Emptiness
44910027 0 --Victory Dragon
......@@ -127,13 +128,10 @@
85115440 0 --Zoodiac Broadbull
48905153 0 --Zoodiac Drident
#Limited
25862681 1 --Ancient Fairy Dragon
58921041 1 --Anti-Spell Fragrance
6728559 1 --Archnemeses Protos
76794549 1 --Astrograph Sorcerer
27552504 1 --Beatrice, Lady of Eternal
61901281 1 --Black Dragon Collapserpent
53804307 1 --Blaster, Dragon Ruler of Infernos
6602300 1 --Blaze Fenix, The Burning Bombardment Bird
44362883 1 --Branded Fusion
36637374 1 --Branded Opening
......@@ -153,12 +151,12 @@
43694650 1 --Danger!? Jackalope?
99745551 1 --Danger!? Tsuchinoko?
14536035 1 --Dark Grepher
65536818 1 --Denglong, First of the Yang Zing
82385847 1 --Dinowrestler Pankratops
90448279 1 --Divine Arsenal AA-ZEUS - Sky Thunder
15854426 1 --Divine Wind of the Mist Valley
13035077 1 --Dragonic Diagram
61292243 1 --EMERGENCY!
40177746 1 --Eva
33396948 1 --Exodia the Forbidden One
95308449 1 --Final Countdown
81439173 1 --Foolish Burial
......@@ -169,7 +167,6 @@
53334471 1 --Gozen Match
18144506 1 --Harpie's Feather Duster
17266660 1 --Herald of Orange Light
94677445 1 --Ib the World Chalice Justiciar
66957584 1 --Infernity Launcher
1845204 1 --Instant Fusion
93946239 1 --Into the Void
......@@ -177,22 +174,24 @@
63542003 1 --Keldo the Sacred Protector
7902349 1 --Left Arm of the forbidden one
44519536 1 --Left Leg of the forbidden one
83190280 1 --Lunalight Tiger
92746535 1 --Luster Pendulum
71650854 1 --Magical Mid-Breaker Field
31178212 1 --Majespecter Unicorn - Kirin
93600443 1 --Mask Change 2
38572779 1 --Miscellaneousaurus
43040603 1 --Monster Gate
83764719 1 --Monster Reborn
83764718 1 --Monster Reborn
83764719 1 --Monster Reborn
33508719 1 --Morphing Jar
99937011 1 --Mudora the Sword Oracle
3734202 1 --Naturia Sacred Tree
75433814 1 --Number 40: Gimmick Puppet of Strings
69170557 1 --Number C40: Gimmick Puppet of Dark Strings
33782437 1 --One Day of Peace
2295440 1 --One for One
80312545 1 --Opening of the Spirit Gates
38814750 1 --PSY-Framegear Gamma
7563579 1 --Performage PlushFire
17330916 1 --Performapal Monkeyboard
12958919 1 --Phantom Skyblaster
84211599 1 --Pot of Prosperity
......@@ -202,8 +201,6 @@
74586817 1 --Psy-Framelord Omega
21347668 1 --Purrely Sleepy Memory
58577036 1 --Reasoning
26118970 1 --Red Rose Dragon
90411554 1 --Redox, Dragon Ruler of Boulders
32807846 1 --Reinforcement of the Army
65734501 1 --Rescue-ACE Air Lifter
70903634 1 --Right Arm of the forbidden one
......@@ -218,6 +215,7 @@
52340444 1 --Sky Striker Mecha - Hornet Drones
71344451 1 --Slash Draw
9674034 1 --Snake-Eye Ash
90241276 1 --Snake-Eyes Poplar
81275020 1 --Speedroid Terrortop
76145933 1 --Spright Blue
13533678 1 --Spright Jet
......@@ -232,32 +230,35 @@
74078255 1 --Tearlaments Merrli
73956664 1 --Tearlaments Reinoheart
572850 1 --Tearlaments Scheiren
89399912 1 --Tempest, Dragon Ruler of Storms
73628505 1 --Terraforming
11110587 1 --That Grass Looks Greener
32731036 1 --The Bystial Lubellion
24207889 1 --There Can Be Only One
15291624 1 --Thunder Dragon Colossus
26400609 1 --Tidal, Dragon Ruler of Waterfalls
35316708 1 --Time Seal
21076084 1 --Trickstar Reincarnation
41165831 1 --Unchained Soul of Sharvara
80845034 1 --WANTED: Seeker of Sinful Spoils
99234526 1 --White Dragon Wyverburster
78872731 1 --Zoodiac Ratpier
#Semi-limited
28985331 2 --Armageddon Knight
92714517 2 --Big Welcome Labrynth
53804307 2 --Blaster, Dragon Ruler of Infernos
85106525 2 --Bonfire
9411399 2 --Destiny HERO - Malicious
91800273 2 --Dimension Shifter
67723438 2 --Emergency Teleport
2526224 2 --Fire King High Avatar Kirin
35726888 2 --Foolish Burial Goods
94677445 2 --Ib the World Chalice Justiciar
14532163 2 --Lightning Storm
83190280 2 --Lunalight Tiger
56700100 2 --My Friend Purrely
35261759 2 --Pot of Desires
49238328 2 --Pot of Extravagance
55584558 2 --Purrely Delicious Memory
12580477 2 --Raigeki
90411554 2 --Redox, Dragon Ruler of Boulders
78080961 2 --SPYRAL Quik-Fix
48130397 2 --Super Polymerization
\ No newline at end of file
48130397 2 --Super Polymerization
89399912 2 --Tempest, Dragon Ruler of Storms
15291624 2 --Thunder Dragon Colossus
26400609 2 --Tidal, Dragon Ruler of Waterfalls
\ No newline at end of file
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