Skip to content

Commit

Permalink
Merge pull request #880 from EmmaRamirez/release/1.11.0
Browse files Browse the repository at this point in the history
Release 1.11.0
  • Loading branch information
EmmaRamirez authored Jan 16, 2023
2 parents 4b886b0 + 8ad3581 commit 21c62dd
Show file tree
Hide file tree
Showing 155 changed files with 2,258 additions and 419 deletions.
1,499 changes: 1,101 additions & 398 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuzlocke-generator",
"version": "1.10.0",
"version": "1.11.0",
"description": "A tool for generating nuzlocke team pics from data",
"main": "dist/bundle.js",
"scripts": {
Expand Down Expand Up @@ -145,7 +145,7 @@
"eslint": "^8.2.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"file-loader": "^6.2.0",
"history": "^4.7.2",
"husky": "^1.0.0-rc.12",
Expand Down
Binary file added src/assets/icons/pokemon/regular/annihilape.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 added src/assets/icons/pokemon/regular/arboliva.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 added src/assets/icons/pokemon/regular/arctibax.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 added src/assets/icons/pokemon/regular/armarouge.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 added src/assets/icons/pokemon/regular/baxcalibur.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 added src/assets/icons/pokemon/regular/bellibolt.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 added src/assets/icons/pokemon/regular/bombirdier.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 added src/assets/icons/pokemon/regular/brambleghast.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 added src/assets/icons/pokemon/regular/bramblin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/brute-bonnet.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 added src/assets/icons/pokemon/regular/capsakid.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 added src/assets/icons/pokemon/regular/ceruledge.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 added src/assets/icons/pokemon/regular/cetitan.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 added src/assets/icons/pokemon/regular/cetoddle.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 added src/assets/icons/pokemon/regular/charcadet.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 added src/assets/icons/pokemon/regular/chi-yu.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 added src/assets/icons/pokemon/regular/chien-pao.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 added src/assets/icons/pokemon/regular/clodsire.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 added src/assets/icons/pokemon/regular/crocalor.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 added src/assets/icons/pokemon/regular/cyclizar.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 added src/assets/icons/pokemon/regular/dachsbun.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/pokemon/regular/dolliv.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 added src/assets/icons/pokemon/regular/dondozo.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 added src/assets/icons/pokemon/regular/espathra.png
Binary file added src/assets/icons/pokemon/regular/fidough.png
Binary file added src/assets/icons/pokemon/regular/finizen.png
Binary file added src/assets/icons/pokemon/regular/firagarif.png
Binary file added src/assets/icons/pokemon/regular/flamigo.png
Binary file added src/assets/icons/pokemon/regular/flittle.png
Binary file added src/assets/icons/pokemon/regular/floragato.png
Binary file added src/assets/icons/pokemon/regular/frigibax.png
Binary file added src/assets/icons/pokemon/regular/fuecoco.png
Binary file added src/assets/icons/pokemon/regular/garganacl.png
Binary file added src/assets/icons/pokemon/regular/gholdengo.png
Binary file added src/assets/icons/pokemon/regular/gimmighoul.png
Binary file added src/assets/icons/pokemon/regular/glimmet.png
Binary file added src/assets/icons/pokemon/regular/glimmora.png
Binary file added src/assets/icons/pokemon/regular/grafaiai.png
Binary file added src/assets/icons/pokemon/regular/great-tusk.png
Binary file added src/assets/icons/pokemon/regular/greavard.png
Binary file added src/assets/icons/pokemon/regular/houndstone.png
Binary file added src/assets/icons/pokemon/regular/iron-bundle.png
Binary file added src/assets/icons/pokemon/regular/iron-hands.png
Binary file added src/assets/icons/pokemon/regular/iron-jugulis.png
Binary file added src/assets/icons/pokemon/regular/iron-moth.png
Binary file added src/assets/icons/pokemon/regular/iron-thorns.png
Binary file added src/assets/icons/pokemon/regular/iron-valiant.png
Binary file added src/assets/icons/pokemon/regular/kilowattrel.png
Binary file added src/assets/icons/pokemon/regular/kingambit.png
Binary file added src/assets/icons/pokemon/regular/klawf.png
Binary file added src/assets/icons/pokemon/regular/koraidon.png
Binary file added src/assets/icons/pokemon/regular/lechonk.png
Binary file added src/assets/icons/pokemon/regular/lokix.png
Binary file added src/assets/icons/pokemon/regular/mabosstiff.png
Binary file added src/assets/icons/pokemon/regular/maschiff.png
Binary file added src/assets/icons/pokemon/regular/maushold.jpg
Binary file added src/assets/icons/pokemon/regular/maushold.png
Binary file added src/assets/icons/pokemon/regular/meowscarada.png
Binary file added src/assets/icons/pokemon/regular/miraidon.png
Binary file added src/assets/icons/pokemon/regular/nacli.png
Binary file added src/assets/icons/pokemon/regular/naclstack.png
Binary file added src/assets/icons/pokemon/regular/nymble.png
Binary file added src/assets/icons/pokemon/regular/oinkologne.png
Binary file added src/assets/icons/pokemon/regular/orthworm.png
Binary file added src/assets/icons/pokemon/regular/palafin.png
Binary file added src/assets/icons/pokemon/regular/pawmi.png
Binary file added src/assets/icons/pokemon/regular/pawmo.png
Binary file added src/assets/icons/pokemon/regular/pawmot.png
Binary file added src/assets/icons/pokemon/regular/quaquaval.png
Binary file added src/assets/icons/pokemon/regular/quaquavel.png
Binary file added src/assets/icons/pokemon/regular/quaxly.png
Binary file added src/assets/icons/pokemon/regular/quaxwell.png
Binary file added src/assets/icons/pokemon/regular/rabsca.png
Binary file added src/assets/icons/pokemon/regular/rellor.png
Binary file added src/assets/icons/pokemon/regular/revavroom.png
Binary file added src/assets/icons/pokemon/regular/roaring-moon.png
Binary file added src/assets/icons/pokemon/regular/sandy-shocks.png
Binary file added src/assets/icons/pokemon/regular/scovillain.png
Binary file added src/assets/icons/pokemon/regular/scream-tail.png
Binary file added src/assets/icons/pokemon/regular/shroodle.png
Binary file added src/assets/icons/pokemon/regular/skeledirge.png
Binary file added src/assets/icons/pokemon/regular/smoliv.png
Binary file added src/assets/icons/pokemon/regular/spidops.png
Binary file added src/assets/icons/pokemon/regular/sprigatito.png
Binary file added src/assets/icons/pokemon/regular/squawkabilly.png
Binary file added src/assets/icons/pokemon/regular/tadbulb.png
Binary file added src/assets/icons/pokemon/regular/tandemaus.png
Binary file added src/assets/icons/pokemon/regular/tarantoula.png
Binary file added src/assets/icons/pokemon/regular/taroluntula.png
Binary file added src/assets/icons/pokemon/regular/tatsugiri.png
Binary file added src/assets/icons/pokemon/regular/ting-lu.png
Binary file added src/assets/icons/pokemon/regular/tinkatink.png
Binary file added src/assets/icons/pokemon/regular/tinkaton.png
Binary file added src/assets/icons/pokemon/regular/tinkatuff.png
Binary file added src/assets/icons/pokemon/regular/toedscool.png
Binary file added src/assets/icons/pokemon/regular/toedscruel.png
Binary file added src/assets/icons/pokemon/regular/varoom.png
Binary file added src/assets/icons/pokemon/regular/veluza.png
Binary file added src/assets/icons/pokemon/regular/wattrel.png
Binary file added src/assets/icons/pokemon/regular/wiglett.png
Binary file added src/assets/icons/pokemon/regular/wo-chien.png
Binary file added src/assets/icons/pokemon/regular/wugtrio.png
Binary file added src/assets/icons/pokemon/regular/wyrdeer.png
326 changes: 325 additions & 1 deletion src/components/Credits/credits.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
{
"name": "Tsaoshin",
"link": "https://www.deviantart.com/tsaoshin",
"role": "Arcanine"
"role": "Arcanine, Feucoco"
},
{
"name": "Nintendojr",
Expand Down Expand Up @@ -494,6 +494,330 @@
"role": "Wyrdeer",
"name": "D-O-9 Bessa",
"link": "https://www.deviantart.com/d-o-9-bessa/art/Lord-Wyrdeer-Legends-Arceus-889187951"
},

{
"role": "Sprigatito",
"name": "Mayday",
"link": "https://twitter.com/maydaydraws?ref_src=twsrc%5Egoogle%7Ctwcamp%5Eserp%7Ctwgr%5Eauthor"
},

{
"role": "Floragato",
"name": "Siplick",
"link": "https://www.deviantart.com/siplick/art/Floragato-939928346"
},
{
"role": "Crocalor",
"name": "D-Invasion",
"link": "https://www.deviantart.com/d-invasion/"
},
{
"role": "Skeledirge",
"name": "Pookadoodle",
"link": "https://www.deviantart.com/pookadoodle/"
},
{
"role": "Quaxly",
"name": "Hanneartworks",
"link": "https://www.instagram.com/hanneartworks/"
},
{
"role": "Quaxwell, Pawmo",
"name": "Nolwenmnc",
"link": "https://www.deviantart.com/nolwennmnc/art/N08-Quaxwell-942028368"
},
{
"role": "Quaquaval",
"name": "FrozenFlareDe",
"link": "https://www.deviantart.com/frozenflarede/art/Quaquaval-940048509"
},
{
"role": "Lechonk",
"name": "PekroZ",
"link": "https://www.artstation.com/artwork/PekroZ"
},
{
"role": "Tarountula",
"name": "artsy-mii",
"link": "https://www.deviantart.com/artsy-mii/art/Chibi-Tarountula-939220814"
},
{
"role": "Oinkologne",
"name": "Pokefuseme",
"link": "https://pokefuseme.tumblr.com/post/701694837270953984/finished-version-of-oinklonge-cleaned-them-up-a"
},
{
"role": "Koraidon",
"name": "Kingarcana",
"link": "https://www.artstation.com/kingarcana"
},
{
"role": "Miraidon",
"name": "Midnight Dragonfire",
"link": "https://www.deviantart.com/midnight-dragonfire/art/Miraidon-917932287"
},
{
"role": "Pawmi",
"name": "sodasquids",
"link": "https://www.deviantart.com/sodasquids/art/Pawmi-940119431"
},
{
"role": "Clodsire, Maushold, Flutter Mane, Tinkatink, Cetoddle, Scream Tail, Smoliv, Dachsbun, Pawmot",
"name": "AngelRoseStar",
"link": "https://www.deviantart.com/angelrosestar/"
},
{
"role": "Gholdengo",
"name": "Erroring",
"link": "https://www.deviantart.com/erroring/art/totally-tubular-938472137"
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},

{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
},
{
"role": "",
"name": "",
"link": ""
}
]
}
Loading

0 comments on commit 21c62dd

Please sign in to comment.