Skip to content

Commit

Permalink
Merge branch 'pagefaultgames:main' into luc-update
Browse files Browse the repository at this point in the history
  • Loading branch information
ajhyperbit committed Aug 18, 2024
2 parents d0f9953 + 1b7a161 commit de5fd17
Show file tree
Hide file tree
Showing 46 changed files with 29,596 additions and 1,981 deletions.
Binary file modified public/images/pokemon/back/female/178.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/pokemon/back/female/457.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/pokemon/back/shiny/female/178.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,484 changes: 2,365 additions & 119 deletions public/images/pokemon/exp/670-blue.json

Large diffs are not rendered by default.

2,484 changes: 2,365 additions & 119 deletions public/images/pokemon/exp/670-orange.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions public/images/pokemon/exp/670-red.json
Original file line number Diff line number Diff line change
Expand Up @@ -2513,7 +2513,6 @@
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:edb2df3a947401efb05329a2c96d5d73:f256d83ef4df17c17958acc6e0432ab0:bad05b37c157676604256a043511a6a2$"
"version": "3.0"
}
}
Loading

0 comments on commit de5fd17

Please sign in to comment.