Skip to content

Dino/new year #96

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 28, 2025
Merged

Dino/new year #96

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
1bd7f0e
New Year + Emblem Edelgard pre integrate
TalkingDinosaur Dec 28, 2025
ca3cd35
New Year + Emblem Edelgard
TalkingDinosaur Dec 28, 2025
e648d21
New Year + Emblem Edelgard
TalkingDinosaur Dec 28, 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
93 changes: 81 additions & 12 deletions database/feh/artist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,13 @@
"Resplendent Catria",
"Resp Catria",
"R Catria",
"Catria (Resplendent)"
"Catria (Resplendent)",
"Of Rivals",
"Edelgard: Of Rivals",
"Emblem Edelgard",
"Engage Edelgard",
"E Edelgard",
"edelgard8"
],
"HARD_ALT_NAME": [
"T Laila",
Expand Down Expand Up @@ -367,11 +373,18 @@
"Resplendent Catria",
"Resp Catria",
"R Catria",
"Catria (Resplendent)"
"Catria (Resplendent)",
"Of Rivals",
"Edelgard: Of Rivals",
"Emblem Edelgard",
"Engage Edelgard",
"E Edelgard",
"edelgard8"
],
"heroes": {
"altina3": "<:Green_Axe:1124845885277343754>Nabata Altina",
"catriaR": "<:Blue_Lance:1124845569496584302>Catria (Resplendent)",
"edelgard8": "<:Green_Axe:1124845885277343754>Emblem Edelgard",
"leila2": "<:Red_Tome:1124846175577710642>Thief Leila",
"lucina4R": "<:Blue_Lance:1124845569496584302>Brave Lucina (Resplendent)"
},
Expand Down Expand Up @@ -6591,7 +6604,12 @@
"Brides of Light",
"Julia: Brides of Light",
"Bridal Julia",
"julia5"
"julia5",
"New Year's Elite",
"Baldr: New Year's Elite",
"New Year Baldr",
"duo baldr",
"baldr3"
],
"HARD_ALT_NAME": [
"effie",
Expand Down Expand Up @@ -6689,9 +6707,15 @@
"Bridal Julia",
"julia5",
"B Julia",
"Duo Julia"
"Duo Julia",
"New Year's Elite",
"Baldr: New Year's Elite",
"New Year Baldr",
"duo baldr",
"baldr3"
],
"heroes": {
"baldr3": "<:Blue_Lance:1124845569496584302>New Year Baldr",
"edelgard2": "<:Green_Axe:1124845885277343754>Legendary Edelgard",
"effie": "<:Blue_Lance:1124845569496584302>Effie",
"eir3": "<:Green_Dagger:1124845796169351320>Ascended Eir",
Expand Down Expand Up @@ -8410,7 +8434,11 @@
"Rearmed Nuibaba",
"Rearm Nuibaba",
"Arm Nuibaba",
"nuibaba"
"nuibaba",
"New Year's Vision",
"Heimdallr: New Year's Vision",
"New Year Heimdallr",
"heimdallr2"
],
"HARD_ALT_NAME": [
"eremiya",
Expand All @@ -8431,10 +8459,15 @@
"Rearmed Nuibaba",
"Rearm Nuibaba",
"Arm Nuibaba",
"nuibaba"
"nuibaba",
"New Year's Vision",
"Heimdallr: New Year's Vision",
"New Year Heimdallr",
"heimdallr2"
],
"heroes": {
"eremiya": "<:Colorless_Staff:1124845704444137592>Eremiya",
"heimdallr2": "<:Green_Tome:1124845959873036289>New Year Heimdallr",
"nuibaba": "<:Blue_Tome:1124845593211191297>Rearmed Nuibaba"
},
"name": "Homare (\u8a89)"
Expand Down Expand Up @@ -17343,7 +17376,11 @@
"Resplendent Henry",
"Resp Henry",
"R Henry",
"Henry (Resplendent)"
"Henry (Resplendent)",
"Festive Horseman",
"Sedgar: Festive Horseman",
"New Year Sedgar",
"sedgar2"
],
"HARD_ALT_NAME": [
"Petrine",
Expand Down Expand Up @@ -17453,7 +17490,11 @@
"Resplendent Henry",
"Resp Henry",
"R Henry",
"Henry (Resplendent)"
"Henry (Resplendent)",
"Festive Horseman",
"Sedgar: Festive Horseman",
"New Year Sedgar",
"sedgar2"
],
"heroes": {
"arion": "<:Blue_Lance:1124845569496584302>Arion",
Expand All @@ -17468,7 +17509,8 @@
"ludveck": "<:Green_Axe:1124845885277343754>Ludveck",
"pandreo": "<:Colorless_Staff:1124845704444137592>Pandreo",
"petrine": "<:Blue_Lance:1124845569496584302>Petrine",
"sedgar": "<:Green_Bow:1124845936426897428>Sedgar"
"sedgar": "<:Green_Bow:1124845936426897428>Sedgar",
"sedgar2": "<:Colorless_Bow:1124845636659982457>New Year Sedgar"
},
"name": "motsutsu"
},
Expand Down Expand Up @@ -29396,7 +29438,8 @@
},
"eku": {
"heroes": {
"leila3": "<:Colorless_Dagger:1124845658617155734>Rearmed Leila"
"leila3": "<:Colorless_Dagger:1124845658617155734>Rearmed Leila",
"v\u00e1li2": "<:Red_Tome:1124846175577710642>New Year V\u00e1li"
},
"name": "\u3048\u304f",
"ALT_NAME": [
Expand All @@ -29405,15 +29448,23 @@
"Rearmed Leila",
"Rearm Leila",
"Arm Leila",
"leila3"
"leila3",
"Devoted Sister",
"V\u00e1li: Devoted Sister",
"New Year V\u00e1li",
"v\u00e1li2"
],
"HARD_ALT_NAME": [
"Superb Shadow",
"Leila: Superb Shadow",
"Rearmed Leila",
"Rearm Leila",
"Arm Leila",
"leila3"
"leila3",
"Devoted Sister",
"V\u00e1li: Devoted Sister",
"New Year V\u00e1li",
"v\u00e1li2"
]
},
"aiwo": {
Expand Down Expand Up @@ -30269,5 +30320,23 @@
"R Dimitri",
"Dimitri (Resplendent)"
]
},
"sakanahen": {
"heroes": {
"myrrhR": "<:Green_Breath:1124845770978361425>Myrrh (Resplendent)"
},
"name": "\u3055\u304b\u306a\u3078\u3093",
"ALT_NAME": [
"Resplendent Myrrh",
"Resp Myrrh",
"R Myrrh",
"Myrrh (Resplendent)"
],
"HARD_ALT_NAME": [
"Resplendent Myrrh",
"Resp Myrrh",
"R Myrrh",
"Myrrh (Resplendent)"
]
}
}
Loading