Skip to content

Dino/christmas 2025 #94

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
TalkingDinosaur merged 3 commits into from
Dec 20, 2025
Merged

Dino/christmas 2025 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24f2c7f
Christmas 2025 pre-integrate.py
TalkingDinosaur Dec 20, 2025
1a55eec
Christmas 2025
TalkingDinosaur Dec 20, 2025
8f040a2
Christmas 2025 + Resplendent Brave Dimitri
TalkingDinosaur Dec 20, 2025
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
99 changes: 87 additions & 12 deletions database/feh/artist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,12 @@
"Base Metodey",
"Normal Metodey",
"Regular Metodey",
"metodey"
"metodey",
"Winter Shadow",
"Zelkov: Winter Shadow",
"Christmas Zelkov",
"Winter Zelkov",
"zelkov"
],
"HARD_ALT_NAME": [
"innesR",
Expand Down Expand Up @@ -278,13 +283,19 @@
"Base Metodey",
"Normal Metodey",
"Regular Metodey",
"metodey"
"metodey",
"Winter Shadow",
"Zelkov: Winter Shadow",
"Christmas Zelkov",
"Winter Zelkov",
"zelkov"
],
"heroes": {
"innesR": "<:Colorless_Bow:1124845636659982457>Innes (Resplendent)",
"metodey": "<:Colorless_Dagger:1124845658617155734>Metodey",
"seliph2": "<:Red_Sword:1124846201070698536>Legendary Seliph",
"shez": "<:Red_Sword:1124846201070698536>Male Shez"
"shez": "<:Red_Sword:1124846201070698536>Male Shez",
"zelkov": "<:Colorless_Dagger:1124845658617155734>Christmas Zelkov"
},
"name": "Akira Egawa (\u6c5f\u5ddd\u3042\u304d\u3089)"
},
Expand Down Expand Up @@ -4222,7 +4233,12 @@
"Medeus: Last Earth Dragon",
"Young Medeus",
"Y Medeus",
"medeus2"
"medeus2",
"Midwinter Toil",
"Gatekeeper: Midwinter Toil",
"Christmas Gatekeeper",
"Winter Gatekeeper",
"gatekeeper2"
],
"HARD_ALT_NAME": [
"New Experiences",
Expand Down Expand Up @@ -4529,13 +4545,19 @@
"Medeus: Last Earth Dragon",
"Young Medeus",
"Y Medeus",
"medeus2"
"medeus2",
"Midwinter Toil",
"Gatekeeper: Midwinter Toil",
"Christmas Gatekeeper",
"Winter Gatekeeper",
"gatekeeper2"
],
"heroes": {
"ashnard": "<:Red_Sword:1124846201070698536>Fallen Ashnard",
"blackknight": "<:Red_Sword:1124846201070698536>Black Knight",
"fomortiis": "<:Colorless_Beast:1124845615935918110>Fomortiis",
"fomortiis2": "<:Red_Beast:1124846309208248381>Winter Fomortiis",
"gatekeeper2": "<:Colorless_Tome:1124845725960904734>Christmas Gatekeeper",
"greil": "<:Green_Axe:1124845885277343754>Valentines Greil",
"gustav": "<:Green_Axe:1124845885277343754>Valentines Gustav",
"hardin": "<:Blue_Lance:1124845569496584302>Hardin",
Expand Down Expand Up @@ -9863,7 +9885,13 @@
"I Thea",
"I F Thea",
"I T Thea",
"thea2"
"thea2",
"Flurry Embrace",
"Ivy: Flurry Embrace",
"Christmas Ivy",
"Winter Ivy",
"Harmonic Ivy",
"ivy3"
],
"HARD_ALT_NAME": [
"Honorable Ninja",
Expand Down Expand Up @@ -10067,7 +10095,13 @@
"I Thea",
"I F Thea",
"I T Thea",
"thea2"
"thea2",
"Flurry Embrace",
"Ivy: Flurry Embrace",
"Christmas Ivy",
"Winter Ivy",
"Harmonic Ivy",
"ivy3"
],
"heroes": {
"azuraR": "<:Blue_Lance:1124845569496584302>Azura (Resplendent)",
Expand All @@ -10079,6 +10113,7 @@
"erinys": "<:Blue_Lance:1124845569496584302>Erinys",
"idunn3": "<:Blue_Breath:1124845312637403236>Ascended Idunn",
"ivy": "<:Blue_Tome:1124845593211191297>Attuned Ivy",
"ivy3": "<:Red_Tome:1124846175577710642>Christmas Ivy",
"kageroR": "<:Colorless_Dagger:1124845658617155734>Kagero (Resplendent)",
"lyn3R": "<:Colorless_Bow:1124845636659982457>Brave Lyn (Resplendent)",
"mercedes": "<:Colorless_Staff:1124845704444137592>Mercedes",
Expand Down Expand Up @@ -29511,22 +29546,33 @@
},
"tetsubuta": {
"heroes": {
"morgan2R": "<:Blue_Tome:1124845593211191297>Female Morgan (Resplendent)"
"morgan2R": "<:Blue_Tome:1124845593211191297>Female Morgan (Resplendent)",
"seidr3": "<:Green_Tome:1124845959873036289>Christmas Sei\u00f0r"
},
"name": "\u3066\u3064\u3076\u305f",
"ALT_NAME": [
"Resplendent F Morgan",
"Resplendent Female Morgan",
"Resp Morgan",
"R F Morgan",
"Female Morgan (Resplendent)"
"Female Morgan (Resplendent)",
"Candlelit Hope",
"Sei\u00f0r: Candlelit Hope",
"Christmas Seidr",
"Winter Seidr",
"seidr3"
],
"HARD_ALT_NAME": [
"Resplendent F Morgan",
"Resplendent Female Morgan",
"Resp F Morgan",
"R F Morgan",
"Female Morgan (Resplendent)"
"Female Morgan (Resplendent)",
"Candlelit Hope",
"Sei\u00f0r: Candlelit Hope",
"Christmas Seidr",
"Winter Seidr",
"seidr3"
]
},
"nanahuzi": {
Expand Down Expand Up @@ -29940,6 +29986,7 @@
},
"hanada": {
"heroes": {
"alfred2": "<:Blue_Lance:1124845569496584302>Christmas Alfred",
"marth9": "<:Blue_Lance:1124845569496584302>Gladiator Marth",
"xane3": "<:Blue_Tome:1124845593211191297>Young Xane"
},
Expand All @@ -29962,7 +30009,12 @@
"Gladiator Marth",
"Gladiator Lucina",
"Ferox Marth",
"marth9"
"marth9",
"Joyous Snowdrop",
"Alfred: Joyous Snowdrop",
"Christmas Alfred",
"Winter Alfred",
"alfred2"
],
"HARD_ALT_NAME": [
"Fickle Dragon",
Expand All @@ -29982,7 +30034,12 @@
"Gladiator Marth",
"Gladiator Lucina",
"Ferox Marth",
"marth9"
"marth9",
"Joyous Snowdrop",
"Alfred: Joyous Snowdrop",
"Christmas Alfred",
"Winter Alfred",
"alfred2"
]
},
"tengweiduye": {
Expand Down Expand Up @@ -30194,5 +30251,23 @@
"R Lloyd",
"Lloyd (Resplendent)"
]
},
"bikku": {
"heroes": {
"dimitri2R": "<:Blue_Lance:1124845569496584302>Brave Dimitri (Resplendent)"
},
"name": "bikku",
"ALT_NAME": [
"Resplendent Dimitri",
"Resp Dimitri",
"R Dimitri",
"Dimitri (Resplendent)"
],
"HARD_ALT_NAME": [
"Resplendent Dimitri",
"Resp Dimitri",
"R Dimitri",
"Dimitri (Resplendent)"
]
}
}
Loading