Merge branch 'master' into master

Browse source

...

This commit is contained in:

IamCarbonMan 2017-06-25 11:17:58 -07:00 committed by GitHub

parent b8c7197c1c 6bf97a0e3d

commit 97ce1dafc7

1064 changed files with 81 additions and 51 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

Images/Extra/arceus-special.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 75 KiB

BIN

Images/Extra/arceus-special.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 63 KiB

BIN

Images/Extra/burmy-sandy.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 24 KiB

BIN

Images/Extra/burmy-sandy.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 38 KiB

BIN

Images/Extra/burmy-trash.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 22 KiB

BIN

Images/Extra/burmy-trash.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 39 KiB

BIN

Images/Extra/castform-hail.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 38 KiB

BIN

Images/Extra/castform-hail.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 61 KiB

BIN

Images/Extra/castform-rain.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 25 KiB

BIN

Images/Extra/castform-rain.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 40 KiB

BIN

Images/Extra/castform-sun.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 26 KiB

BIN

Images/Extra/castform-sun.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 43 KiB

BIN

Images/Extra/deoxys-attack.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 36 KiB

BIN

Images/Extra/deoxys-attack.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 66 KiB

BIN

Images/Extra/deoxys-defense.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 27 KiB

BIN

Images/Extra/deoxys-defense.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 47 KiB

BIN

Images/Extra/deoxys-speed.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 37 KiB

BIN

Images/Extra/deoxys-speed.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 66 KiB

BIN

Images/Extra/dunsparce-alt.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 40 KiB

BIN

Images/Extra/dunsparce-alt.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 73 KiB

BIN

Images/Extra/gastradon-west.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 41 KiB

BIN

Images/Extra/gastradon-west.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 64 KiB

BIN

Images/Extra/giratina-origin.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 46 KiB

BIN

Images/Extra/giratina-origin.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 64 KiB

BIN

Images/Extra/groudon-alt.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 43 KiB

BIN

Images/Extra/groudon-alt.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 62 KiB

BIN

Images/Extra/kyogre-alt.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 64 KiB

BIN

Images/Extra/kyogre-alt.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 88 KiB

BIN

Images/Extra/pikachu-playboy.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 104 KiB

BIN

Images/Extra/rayquaza-alt.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 38 KiB

BIN

Images/Extra/rayquaza-alt.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 52 KiB

BIN

Images/Extra/rotom-fan.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 36 KiB

BIN

Images/Extra/rotom-fan.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 60 KiB

BIN

Images/Extra/rotom-frost.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 30 KiB

BIN

Images/Extra/rotom-frost.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 59 KiB

BIN

Images/Extra/rotom-heat.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 24 KiB

BIN

Images/Extra/rotom-heat.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 48 KiB

BIN

Images/Extra/rotom-mow.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 28 KiB

BIN

Images/Extra/rotom-mow.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 54 KiB

BIN

Images/Extra/rotom-wash.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 45 KiB

BIN

Images/Extra/rotom-wash.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 73 KiB

BIN

Images/Extra/shaymin-sky.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 45 KiB

BIN

Images/Extra/shaymin-sky.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 62 KiB

BIN

Images/Extra/shellos-west.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 28 KiB

BIN

Images/Extra/shellos-west.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 49 KiB

BIN

Images/Extra/wormadam-sandy.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 28 KiB

BIN

Images/Extra/wormadam-sandy.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 46 KiB

BIN

Images/Extra/wormadam-trash.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 24 KiB

BIN

Images/Extra/wormadam-trash.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 45 KiB

BIN

Images/Generation I - Kanto/001.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 16 KiB

BIN

Images/Generation I - Kanto/001.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 35 KiB

BIN

Images/Generation I - Kanto/002.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 25 KiB

BIN

Images/Generation I - Kanto/002.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 42 KiB

BIN

Images/Generation I - Kanto/003.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 60 KiB

BIN

Images/Generation I - Kanto/003.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 100 KiB

BIN

Images/Generation I - Kanto/004.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 18 KiB

BIN

Images/Generation I - Kanto/004.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 27 KiB

BIN

Images/Generation I - Kanto/005.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 19 KiB

BIN

Images/Generation I - Kanto/005.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 43 KiB

BIN

Images/Generation I - Kanto/006.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 20 KiB

BIN

Images/Generation I - Kanto/006.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 44 KiB

BIN

Images/Generation I - Kanto/007.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 19 KiB

BIN

Images/Generation I - Kanto/007.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 31 KiB

BIN

Images/Generation I - Kanto/008.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 26 KiB

BIN

Images/Generation I - Kanto/008.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 52 KiB

BIN

Images/Generation I - Kanto/009.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 32 KiB

BIN

Images/Generation I - Kanto/009.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 52 KiB

BIN

Images/Generation I - Kanto/010.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 32 KiB

BIN

Images/Generation I - Kanto/010.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 56 KiB

BIN

Images/Generation I - Kanto/011.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 24 KiB

BIN

Images/Generation I - Kanto/011.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 57 KiB

BIN

Images/Generation I - Kanto/012.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 45 KiB

BIN

Images/Generation I - Kanto/012.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 72 KiB

BIN

Images/Generation I - Kanto/013.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 18 KiB

BIN

Images/Generation I - Kanto/013.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 31 KiB

BIN

Images/Generation I - Kanto/014.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 25 KiB

BIN

Images/Generation I - Kanto/014.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 54 KiB

BIN

Images/Generation I - Kanto/015.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 30 KiB

BIN

Images/Generation I - Kanto/015.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 47 KiB

BIN

Images/Generation I - Kanto/016.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 49 KiB

BIN

Images/Generation I - Kanto/016.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 84 KiB

BIN

Images/Generation I - Kanto/017.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 43 KiB

BIN

Images/Generation I - Kanto/017.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 72 KiB

BIN

Images/Generation I - Kanto/018.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 38 KiB

BIN

Images/Generation I - Kanto/018.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 65 KiB

BIN

Images/Generation I - Kanto/019.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 24 KiB

BIN

Images/Generation I - Kanto/019.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 34 KiB

BIN

Images/Generation I - Kanto/020.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 34 KiB

BIN

Images/Generation I - Kanto/020.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 60 KiB

BIN

Images/Generation I - Kanto/021.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 34 KiB

BIN

Images/Generation I - Kanto/021.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 77 KiB

BIN

Images/Generation I - Kanto/022.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 44 KiB

BIN

Images/Generation I - Kanto/022.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 97 KiB

BIN

Images/Generation I - Kanto/023.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 16 KiB

BIN

Images/Generation I - Kanto/023.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 26 KiB

BIN

Images/Generation I - Kanto/024.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 53 KiB

BIN

Images/Generation I - Kanto/024.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 87 KiB

BIN

Images/Generation I - Kanto/025.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 30 KiB

BIN

Images/Generation I - Kanto/025.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 54 KiB

BIN

Images/Generation I - Kanto/026.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 29 KiB

Some files were not shown because too many files have changed in this diff Show more