Skip to content

[pull] main from cwjoshuak:main #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jun 22, 2026
Merged

[pull] main from cwjoshuak:main #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/data.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"4001":["Proving Grounds Competitive Match","achieve_13_5.webp",null],"4002":["Proving Grounds Team Deathmatch","achieve_13_5.webp",null],"4004":["Proving Grounds Team Elimination Match","achieve_13_5.webp",null],"4006":["Proving Grounds Three Champions","achieve_13_5.webp",null],"7051":["Cruel Toy Castle","island_icon_124.webp",250],"7047":["Drumbeat Island","island_icon_95.webp",250],"7038":["Forpe","island_icon_26.webp",250],"7042":["Harmony Island","island_icon_55.webp",250],"7052":["Lailai Island","island_icon_114.webp",250],"7049":["Lush Reed Island","island_icon_43.webp",250],"7040":["Medeia","island_icon_41.webp",250],"7041":["Monte Island","island_icon_52.webp",250],"7044":["Opportunity Isle","island_icon_70.webp",250],"7048":["Snowpang Island","island_icon_98.webp",250],"7037":["Volare Island","island_icon_8.webp",250],"7046":["Asura Island","island_icon_76.webp",635],"7039":["Oblivion Isle","island_icon_35.webp",635],"7050":["Phantomwing Island","island_icon_81.webp",635],"7045":["Tranquil Isle","island_icon_74.webp",805],"7043":["Lagoon Island","island_icon_58.webp",960],"1101":["Twisting Demon Legion (Anikka)","achieve_13_11.webp",0],"1102":["Twisting Demon Legion (Arthetine)","achieve_13_11.webp",0],"1107":["Twisting Demon Legion (Feiton)","achieve_13_11.webp",0],"1112":["Twisting Demon Legion (North Kurzan)","achieve_13_11.webp",0],"1103":["Twisting Demon Legion (North Vern)","achieve_13_11.webp",0],"1108":["Twisting Demon Legion (Punika)","achieve_13_11.webp",0],"1105":["Twisting Demon Legion (Rohendel)","achieve_13_11.webp",0],"1104":["Twisting Demon Legion (Shushire)","achieve_13_11.webp",0],"1111":["Twisting Demon Legion (South Kurzan)","achieve_13_11.webp",0],"1113":["Twisting Demon Legion (South Rimeria)","achieve_13_11.webp",0],"1109":["Twisting Demon Legion (South Vern)","achieve_13_11.webp",0],"1110":["Twisting Demon Legion (Voldis)","achieve_13_11.webp",0],"1106":["Twisting Demon Legion (Yorn)","achieve_13_11.webp",0],"70007":["Wandering Merchant: Anikka","island_icon_84.webp",0],"70008":["Wandering Merchant: Arthetine","island_icon_84.webp",0],"70004":["Wandering Merchant: East Luterra 1","island_icon_84.webp",0],"70005":["Wandering Merchant: East Luterra 2","island_icon_84.webp",0],"70009":["Wandering Merchant: North Vern","island_icon_84.webp",0],"70001":["Wandering Merchant: Rethramis","island_icon_84.webp",0],"70010":["Wandering Merchant: Shushire","island_icon_84.webp",0],"70006":["Wandering Merchant: Tortoyk","island_icon_84.webp",0],"70003":["Wandering Merchant: West Luterra","island_icon_84.webp",0],"70002":["Wandering Merchant: Yudia","island_icon_84.webp",0],"7033":["Alakkir","island_icon_69.webp",250],"7005":["Death's Hold Island","island_icon_65.webp",250],"7016":["Illusion Isle","island_icon_4.webp",250],"7013":["Lullaby Island","island_icon_5.webp",250],"7018":["Spida Island","island_icon_23.webp",250],"7014":["Tooki Island","island_icon_9.webp",250],"7036":["Witch's House","island_icon_126.webp",250],"3011":["Erasmo","island_icon_38.webp",460],"6001":["Ocean Co-op: Anikka","achieve_06_55.webp",500],"6000":["Ocean Co-op: Arthetine","achieve_06_55.webp",500],"6002":["Ocean Co-op: Vern","achieve_06_55.webp",500],"6003":["Ocean Co-op: Rohendel","achieve_06_55.webp",635],"7019":["Shangra","island_icon_83.webp",635],"7020":["Unknown Island","island_icon_86.webp",635],"70011":["Wandering Merchant: Rohendel","island_icon_84.webp",635],"7035":["Gesbroy","island_icon_87.webp",805],"6004":["Ocean Co-op: Yorn","achieve_06_55.webp",805],"70012":["Wandering Merchant: Yorn","island_icon_84.webp",805],"6005":["Ocean Co-op: Feiton","achieve_06_55.webp",960],"70013":["Wandering Merchant: Feiton","island_icon_84.webp",960],"70014":["Wandering Merchant: Punika","island_icon_84.webp",1100],"6006":["Ocean Co-op: Punika","achieve_06_55.webp",1250],"70015":["Wandering Merchant: South Vern","island_icon_84.webp",1340],"70016":["Wandering Merchant: Rowen","island_icon_84.webp",1445],"9002":["[Siege] Liebertane VS. Preigelli","achieve_14_154.webp",1445],"9001":["[Siege] Preigelli VS. Liebertane","achieve_14_153.webp",1445],"70017":["Wandering Merchant: Elgacia","island_icon_84.webp",1460],"70018":["Wandering Merchant: Pleccia","island_icon_84.webp",1475],"7100":["Battle Arena","island_icon_131.webp",1490],"7101":["Trial of Honor","island_icon_143.webp",1520],"70019":["Wandering Merchant: Voldis","island_icon_84.webp",1520],"70020":["Wandering Merchant: South Kurzan","island_icon_84.webp",1580],"70021":["Wandering Merchant: North Kurzan","island_icon_84.webp",1600],"3025":["Sevek Atun","achieve_14_142.webp",1640],"70023":["Wandering Merchant: South Rimeria","island_icon_84.webp",1640]}
{"4001":["Proving Grounds Competitive Match","achieve_13_5.webp",null],"4002":["Proving Grounds Team Deathmatch","achieve_13_5.webp",null],"4004":["Proving Grounds Team Elimination Match","achieve_13_5.webp",null],"4006":["Proving Grounds Three Champions","achieve_13_5.webp",null],"7051":["Cruel Toy Castle","island_icon_124.webp",250],"7047":["Drumbeat Island","island_icon_95.webp",250],"7038":["Forpe","island_icon_26.webp",250],"7042":["Harmony Island","island_icon_55.webp",250],"7052":["Lailai Island","island_icon_114.webp",250],"7049":["Lush Reed Island","island_icon_43.webp",250],"7040":["Medeia","island_icon_41.webp",250],"7041":["Monte Island","island_icon_52.webp",250],"7044":["Opportunity Isle","island_icon_70.webp",250],"7048":["Snowpang Island","island_icon_98.webp",250],"7037":["Volare Island","island_icon_8.webp",250],"7046":["Asura Island","island_icon_76.webp",635],"7039":["Oblivion Isle","island_icon_35.webp",635],"7050":["Phantomwing Island","island_icon_81.webp",635],"7045":["Tranquil Isle","island_icon_74.webp",805],"7043":["Lagoon Island","island_icon_58.webp",960],"1101":["Twisting Demon Legion (Anikka)","achieve_13_11.webp",0],"1102":["Twisting Demon Legion (Arthetine)","achieve_13_11.webp",0],"1107":["Twisting Demon Legion (Feiton)","achieve_13_11.webp",0],"1112":["Twisting Demon Legion (North Kurzan)","achieve_13_11.webp",0],"1103":["Twisting Demon Legion (North Vern)","achieve_13_11.webp",0],"1108":["Twisting Demon Legion (Punika)","achieve_13_11.webp",0],"1105":["Twisting Demon Legion (Rohendel)","achieve_13_11.webp",0],"1104":["Twisting Demon Legion (Shushire)","achieve_13_11.webp",0],"1111":["Twisting Demon Legion (South Kurzan)","achieve_13_11.webp",0],"1113":["Twisting Demon Legion (South Rimeria)","achieve_13_11.webp",0],"1109":["Twisting Demon Legion (South Vern)","achieve_13_11.webp",0],"1110":["Twisting Demon Legion (Voldis)","achieve_13_11.webp",0],"1106":["Twisting Demon Legion (Yorn)","achieve_13_11.webp",0],"70007":["Wandering Merchant: Anikka","island_icon_84.webp",0],"70008":["Wandering Merchant: Arthetine","island_icon_84.webp",0],"70004":["Wandering Merchant: East Luterra 1","island_icon_84.webp",0],"70005":["Wandering Merchant: East Luterra 2","island_icon_84.webp",0],"70009":["Wandering Merchant: North Vern","island_icon_84.webp",0],"70001":["Wandering Merchant: Rethramis","island_icon_84.webp",0],"70010":["Wandering Merchant: Shushire","island_icon_84.webp",0],"70006":["Wandering Merchant: Tortoyk","island_icon_84.webp",0],"70003":["Wandering Merchant: West Luterra","island_icon_84.webp",0],"70002":["Wandering Merchant: Yudia","island_icon_84.webp",0],"7033":["Alakkir","island_icon_69.webp",250],"7005":["Death's Hold Island","island_icon_65.webp",250],"7016":["Illusion Isle","island_icon_4.webp",250],"7013":["Lullaby Island","island_icon_5.webp",250],"7018":["Spida Island","island_icon_23.webp",250],"7014":["Tooki Island","island_icon_9.webp",250],"7036":["Witch's House","island_icon_126.webp",250],"3011":["Erasmo","island_icon_38.webp",460],"6001":["Ocean Co-op: Anikka","achieve_06_55.webp",500],"6000":["Ocean Co-op: Arthetine","achieve_06_55.webp",500],"6002":["Ocean Co-op: Vern","achieve_06_55.webp",500],"6003":["Ocean Co-op: Rohendel","achieve_06_55.webp",635],"7019":["Shangra","island_icon_83.webp",635],"7020":["Unknown Island","island_icon_86.webp",635],"70011":["Wandering Merchant: Rohendel","island_icon_84.webp",635],"7035":["Gesbroy","island_icon_87.webp",805],"6004":["Ocean Co-op: Yorn","achieve_06_55.webp",805],"70012":["Wandering Merchant: Yorn","island_icon_84.webp",805],"6005":["Ocean Co-op: Feiton","achieve_06_55.webp",960],"70013":["Wandering Merchant: Feiton","island_icon_84.webp",960],"70014":["Wandering Merchant: Punika","island_icon_84.webp",1100],"6006":["Ocean Co-op: Punika","achieve_06_55.webp",1250],"70015":["Wandering Merchant: South Vern","island_icon_84.webp",1340],"70016":["Wandering Merchant: Rowen","island_icon_84.webp",1445],"9002":["[Siege] Liebertane VS. Preigelli","achieve_14_154.webp",1445],"9001":["[Siege] Preigelli VS. Liebertane","achieve_14_153.webp",1445],"70017":["Wandering Merchant: Elgacia","island_icon_84.webp",1460],"70018":["Wandering Merchant: Pleccia","island_icon_84.webp",1475],"7100":["Battle Arena","island_icon_131.webp",1490],"7101":["Trial of Honor","island_icon_143.webp",1520],"70019":["Wandering Merchant: Voldis","island_icon_84.webp",1520],"70020":["Wandering Merchant: South Kurzan","island_icon_84.webp",1580],"70021":["Wandering Merchant: North Kurzan","island_icon_84.webp",1600],"3025":["Sevek Atun","achieve_14_142.webp",1640],"70023":["Wandering Merchant: South Rimeria","island_icon_84.webp",1640],"994":["[Event] Tranquil Night","island_icon_152.webp",1640]}
Loading