Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ShivaD173 committed Dec 2, 2023
2 parents c62a008 + 603e3cd commit 0c1a877
Show file tree
Hide file tree
Showing 21 changed files with 1,011 additions and 803 deletions.
557 changes: 292 additions & 265 deletions config/formats.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions data/aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ export const Aliases: {[alias: string]: string} = {
gen6ag: "[Gen 6] Anything Goes",
crossevo: "[Gen 9] Cross Evolution",
mayhem: "[Gen 9] Random Battle Mayhem",
omotm: "[Gen 9] Shared Power",
lcotm: "[Gen 9] Protean Palace",
omotm: "[Gen 9] Tier Shift",
lcotm: "[Gen 9] Sketchmons",

// mega evos
fabio: "Ampharos-Mega",
Expand Down
Loading

0 comments on commit 0c1a877

Please sign in to comment.