Merge remote-tracking branch 'origin/master' into countio

This commit is contained in:
dusty@dustyreagan.com 2017-09-15 15:40:08 -05:00
commit 33f4a84a24
3 changed files with 11 additions and 2 deletions

View File

@ -274,6 +274,7 @@ API | Description | Auth | HTTPS | Link |
| Games | Minecraft and other server info & user info) | No | Yes | [Go!](https://docs.gameapis.net/) |
| Giant Bomb | Video Games | No | Yes | [Go!](https://www.giantbomb.com/api/documentation) |
| Guild Wars 2 | Guild Wars 2 Game Information | `apiKey` | Yes | [Go!](https://wiki.guildwars2.com/wiki/API:Main) |
| Halo | Halo 5 and Halo Wars 2 Information | `apiKey` | Yes | [Go!](https://developer.haloapi.com/) |
| Jservice | Jeopardy Question Database | No | No | [Go!](http://jservice.io) |
| Magic The Gathering | Magic The Gathering Game Information | No | No | [Go!](http://magicthegathering.io/) |
| Marvel | Marvel Comics | `apiKey` | No | [Go!](http://developer.marvel.com) |

View File

@ -1,5 +1,5 @@
{
"count": 412,
"count": 413,
"entries": [
{
"API": "Dogs",
@ -1137,6 +1137,14 @@
"HTTPS": true,
"Link": "https://wiki.guildwars2.com/wiki/API:Main"
},
{
"API": "Halo",
"Auth": "apiKey",
"Category": "Games & Comics",
"Description": "Halo 5 and Halo Wars 2 Information",
"HTTPS": true,
"Link": "https://developer.haloapi.com/"
},
{
"API": "Jservice",
"Auth": null,

File diff suppressed because one or more lines are too long