{"action":"opened","number":17314,"pull_request":{"url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/17314","id":122723714,"html_url":"https://github.com/Baystation12/Baystation12/pull/17314","diff_url":"https://github.com/Baystation12/Baystation12/pull/17314.diff","patch_url":"https://github.com/Baystation12/Baystation12/pull/17314.patch","issue_url":"https://api.github.com/repos/Baystation12/Baystation12/issues/17314","number":17314,"state":"open","locked":false,"title":"Fixes maps (hopefully)","user":{"login":"atlantiscze","id":5147960,"avatar_url":"https://avatars3.githubusercontent.com/u/5147960?v=3","gravatar_id":"","url":"https://api.github.com/users/atlantiscze","html_url":"https://github.com/atlantiscze","followers_url":"https://api.github.com/users/atlantiscze/followers","following_url":"https://api.github.com/users/atlantiscze/following{/other_user}","gists_url":"https://api.github.com/users/atlantiscze/gists{/gist_id}","starred_url":"https://api.github.com/users/atlantiscze/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/atlantiscze/subscriptions","organizations_url":"https://api.github.com/users/atlantiscze/orgs","repos_url":"https://api.github.com/users/atlantiscze/repos","events_url":"https://api.github.com/users/atlantiscze/events{/privacy}","received_events_url":"https://api.github.com/users/atlantiscze/received_events","type":"User","site_admin":false},"body":"- Runs all the maps in repo through my new Java mapmerge version. It is not ready for release yet, but even running through the files should be enough to make old mapmerge working at least for a while. This should allow people that don't use Python mapmerge to commit map changes again (at least until it breaks again)\r\n- The java mapmerge i am working on is still highly in-dev version and isn't ready for open release, but if anyone is interested in a testing copy let me know via IRC.\r\n\r\nFixes the following things:\r\n- Excess newlines either between key block and map block, or at the end of map block (minor, but unifies stuff)\r\n- Duplicate keys with same contents (severe - this is what is causing Java mapmerge to fail currently, as it doesn't realize these keys were merged into one)\r\n\r\n<!-- \r\nDo not forget to add a changelog when you have made admin/player facing changes that can alter gameplay.\r\nExamples which require a changelog entry include:\r\n* Adding/removing objects that players may interact with, or the way they function.\r\n* Adding/removing/altering admin tools.\r\n* Changing the map.\r\n\r\nExamples were changelog entries are optional/not typically required:\r\n* Cosmetic changes such as descriptions, sound effects, etc.\r\n* Optimizations and other changes to underlying systems which do not affect gameplay.\r\n* Minor bug fixes.\r\n\r\nYou find a README and example file in .\\html\\changelogs\\ for further instructions.\r\n-->\r\n","created_at":"2017-05-26T21:33:19Z","updated_at":"2017-05-26T21:33:19Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/17314/commits","review_comments_url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/17314/comments","review_comment_url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Baystation12/Baystation12/issues/17314/comments","statuses_url":"https://api.github.com/repos/Baystation12/Baystation12/statuses/e8b4071e076ffb251e627ee1567aa06035c21ec3","head":{"label":"atlantiscze:2017-05-26-MapmergeFix","ref":"2017-05-26-MapmergeFix","sha":"e8b4071e076ffb251e627ee1567aa06035c21ec3","user":{"login":"atlantiscze","id":5147960,"avatar_url":"https://avatars3.githubusercontent.com/u/5147960?v=3","gravatar_id":"","url":"https://api.github.com/users/atlantiscze","html_url":"https://github.com/atlantiscze","followers_url":"https://api.github.com/users/atlantiscze/followers","following_url":"https://api.github.com/users/atlantiscze/following{/other_user}","gists_url":"https://api.github.com/users/atlantiscze/gists{/gist_id}","starred_url":"https://api.github.com/users/atlantiscze/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/atlantiscze/subscriptions","organizations_url":"https://api.github.com/users/atlantiscze/orgs","repos_url":"https://api.github.com/users/atlantiscze/repos","events_url":"https://api.github.com/users/atlantiscze/events{/privacy}","received_events_url":"https://api.github.com/users/atlantiscze/received_events","type":"User","site_admin":false},"repo":{"id":21876216,"name":"Baystation12","full_name":"atlantiscze/Baystation12","owner":{"login":"atlantiscze","id":5147960,"avatar_url":"https://avatars3.githubusercontent.com/u/5147960?v=3","gravatar_id":"","url":"https://api.github.com/users/atlantiscze","html_url":"https://github.com/atlantiscze","followers_url":"https://api.github.com/users/atlantiscze/followers","following_url":"https://api.github.com/users/atlantiscze/following{/other_user}","gists_url":"https://api.github.com/users/atlantiscze/gists{/gist_id}","starred_url":"https://api.github.com/users/atlantiscze/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/atlantiscze/subscriptions","organizations_url":"https://api.github.com/users/atlantiscze/orgs","repos_url":"https://api.github.com/users/atlantiscze/repos","events_url":"https://api.github.com/users/atlantiscze/events{/privacy}","received_events_url":"https://api.github.com/users/atlantiscze/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/atlantiscze/Baystation12","description":"The code for Baystation12's branch of SS13","fork":true,"url":"https://api.github.com/repos/atlantiscze/Baystation12","forks_url":"https://api.github.com/repos/atlantiscze/Baystation12/forks","keys_url":"https://api.github.com/repos/atlantiscze/Baystation12/keys{/key_id}","collaborators_url":"https://api.github.com/repos/atlantiscze/Baystation12/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/atlantiscze/Baystation12/teams","hooks_url":"https://api.github.com/repos/atlantiscze/Baystation12/hooks","issue_events_url":"https://api.github.com/repos/atlantiscze/Baystation12/issues/events{/number}","events_url":"https://api.github.com/repos/atlantiscze/Baystation12/events","assignees_url":"https://api.github.com/repos/atlantiscze/Baystation12/assignees{/user}","branches_url":"https://api.github.com/repos/atlantiscze/Baystation12/branches{/branch}","tags_url":"https://api.github.com/repos/atlantiscze/Baystation12/tags","blobs_url":"https://api.github.com/repos/atlantiscze/Baystation12/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/atlantiscze/Baystation12/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/atlantiscze/Baystation12/git/refs{/sha}","trees_url":"https://api.github.com/repos/atlantiscze/Baystation12/git/trees{/sha}","statuses_url":"https://api.github.com/repos/atlantiscze/Baystation12/statuses/{sha}","languages_url":"https://api.github.com/repos/atlantiscze/Baystation12/languages","stargazers_url":"https://api.github.com/repos/atlantiscze/Baystation12/stargazers","contributors_url":"https://api.github.com/repos/atlantiscze/Baystation12/contributors","subscribers_url":"https://api.github.com/repos/atlantiscze/Baystation12/subscribers","subscription_url":"https://api.github.com/repos/atlantiscze/Baystation12/subscription","commits_url":"https://api.github.com/repos/atlantiscze/Baystation12/commits{/sha}","git_commits_url":"https://api.github.com/repos/atlantiscze/Baystation12/git/commits{/sha}","comments_url":"https://api.github.com/repos/atlantiscze/Baystation12/comments{/number}","issue_comment_url":"https://api.github.com/repos/atlantiscze/Baystation12/issues/comments{/number}","contents_url":"https://api.github.com/repos/atlantiscze/Baystation12/contents/{+path}","compare_url":"https://api.github.com/repos/atlantiscze/Baystation12/compare/{base}...{head}","merges_url":"https://api.github.com/repos/atlantiscze/Baystation12/merges","archive_url":"https://api.github.com/repos/atlantiscze/Baystation12/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/atlantiscze/Baystation12/downloads","issues_url":"https://api.github.com/repos/atlantiscze/Baystation12/issues{/number}","pulls_url":"https://api.github.com/repos/atlantiscze/Baystation12/pulls{/number}","milestones_url":"https://api.github.com/repos/atlantiscze/Baystation12/milestones{/number}","notifications_url":"https://api.github.com/repos/atlantiscze/Baystation12/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/atlantiscze/Baystation12/labels{/name}","releases_url":"https://api.github.com/repos/atlantiscze/Baystation12/releases{/id}","deployments_url":"https://api.github.com/repos/atlantiscze/Baystation12/deployments","created_at":"2014-07-15T21:17:06Z","updated_at":"2016-11-01T13:27:49Z","pushed_at":"2017-05-26T21:29:57Z","git_url":"git://github.com/atlantiscze/Baystation12.git","ssh_url":"git@github.com:atlantiscze/Baystation12.git","clone_url":"https://github.com/atlantiscze/Baystation12.git","svn_url":"https://github.com/atlantiscze/Baystation12","homepage":"http://baystation12.net/","size":673029,"stargazers_count":1,"watchers_count":1,"language":"DM","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":1,"default_branch":"_BAY-Dev"}},"base":{"label":"Baystation12:dev","ref":"dev","sha":"bc5e19c166b7aeb3d27d05c840a1ddccf9b6ae28","user":{"login":"Baystation12","id":1174322,"avatar_url":"https://avatars3.githubusercontent.com/u/1174322?v=3","gravatar_id":"","url":"https://api.github.com/users/Baystation12","html_url":"https://github.com/Baystation12","followers_url":"https://api.github.com/users/Baystation12/followers","following_url":"https://api.github.com/users/Baystation12/following{/other_user}","gists_url":"https://api.github.com/users/Baystation12/gists{/gist_id}","starred_url":"https://api.github.com/users/Baystation12/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Baystation12/subscriptions","organizations_url":"https://api.github.com/users/Baystation12/orgs","repos_url":"https://api.github.com/users/Baystation12/repos","events_url":"https://api.github.com/users/Baystation12/events{/privacy}","received_events_url":"https://api.github.com/users/Baystation12/received_events","type":"Organization","site_admin":false},"repo":{"id":2715933,"name":"Baystation12","full_name":"Baystation12/Baystation12","owner":{"login":"Baystation12","id":1174322,"avatar_url":"https://avatars3.githubusercontent.com/u/1174322?v=3","gravatar_id":"","url":"https://api.github.com/users/Baystation12","html_url":"https://github.com/Baystation12","followers_url":"https://api.github.com/users/Baystation12/followers","following_url":"https://api.github.com/users/Baystation12/following{/other_user}","gists_url":"https://api.github.com/users/Baystation12/gists{/gist_id}","starred_url":"https://api.github.com/users/Baystation12/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Baystation12/subscriptions","organizations_url":"https://api.github.com/users/Baystation12/orgs","repos_url":"https://api.github.com/users/Baystation12/repos","events_url":"https://api.github.com/users/Baystation12/events{/privacy}","received_events_url":"https://api.github.com/users/Baystation12/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Baystation12/Baystation12","description":"The code for Baystation12's branch of SS13","fork":false,"url":"https://api.github.com/repos/Baystation12/Baystation12","forks_url":"https://api.github.com/repos/Baystation12/Baystation12/forks","keys_url":"https://api.github.com/repos/Baystation12/Baystation12/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Baystation12/Baystation12/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Baystation12/Baystation12/teams","hooks_url":"https://api.github.com/repos/Baystation12/Baystation12/hooks","issue_events_url":"https://api.github.com/repos/Baystation12/Baystation12/issues/events{/number}","events_url":"https://api.github.com/repos/Baystation12/Baystation12/events","assignees_url":"https://api.github.com/repos/Baystation12/Baystation12/assignees{/user}","branches_url":"https://api.github.com/repos/Baystation12/Baystation12/branches{/branch}","tags_url":"https://api.github.com/repos/Baystation12/Baystation12/tags","blobs_url":"https://api.github.com/repos/Baystation12/Baystation12/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Baystation12/Baystation12/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Baystation12/Baystation12/git/refs{/sha}","trees_url":"https://api.github.com/repos/Baystation12/Baystation12/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Baystation12/Baystation12/statuses/{sha}","languages_url":"https://api.github.com/repos/Baystation12/Baystation12/languages","stargazers_url":"https://api.github.com/repos/Baystation12/Baystation12/stargazers","contributors_url":"https://api.github.com/repos/Baystation12/Baystation12/contributors","subscribers_url":"https://api.github.com/repos/Baystation12/Baystation12/subscribers","subscription_url":"https://api.github.com/repos/Baystation12/Baystation12/subscription","commits_url":"https://api.github.com/repos/Baystation12/Baystation12/commits{/sha}","git_commits_url":"https://api.github.com/repos/Baystation12/Baystation12/git/commits{/sha}","comments_url":"https://api.github.com/repos/Baystation12/Baystation12/comments{/number}","issue_comment_url":"https://api.github.com/repos/Baystation12/Baystation12/issues/comments{/number}","contents_url":"https://api.github.com/repos/Baystation12/Baystation12/contents/{+path}","compare_url":"https://api.github.com/repos/Baystation12/Baystation12/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Baystation12/Baystation12/merges","archive_url":"https://api.github.com/repos/Baystation12/Baystation12/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Baystation12/Baystation12/downloads","issues_url":"https://api.github.com/repos/Baystation12/Baystation12/issues{/number}","pulls_url":"https://api.github.com/repos/Baystation12/Baystation12/pulls{/number}","milestones_url":"https://api.github.com/repos/Baystation12/Baystation12/milestones{/number}","notifications_url":"https://api.github.com/repos/Baystation12/Baystation12/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Baystation12/Baystation12/labels{/name}","releases_url":"https://api.github.com/repos/Baystation12/Baystation12/releases{/id}","deployments_url":"https://api.github.com/repos/Baystation12/Baystation12/deployments","created_at":"2011-11-05T16:12:41Z","updated_at":"2017-05-16T13:05:39Z","pushed_at":"2017-05-26T20:48:21Z","git_url":"git://github.com/Baystation12/Baystation12.git","ssh_url":"git@github.com:Baystation12/Baystation12.git","clone_url":"https://github.com/Baystation12/Baystation12.git","svn_url":"https://github.com/Baystation12/Baystation12","homepage":"http://baystation12.net/","size":672244,"stargazers_count":251,"watchers_count":251,"language":"DM","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":849,"mirror_url":null,"open_issues_count":1265,"forks":849,"open_issues":1265,"watchers":251,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/17314"},"html":{"href":"https://github.com/Baystation12/Baystation12/pull/17314"},"issue":{"href":"https://api.github.com/repos/Baystation12/Baystation12/issues/17314"},"comments":{"href":"https://api.github.com/repos/Baystation12/Baystation12/issues/17314/comments"},"review_comments":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/17314/comments"},"review_comment":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/17314/commits"},"statuses":{"href":"https://api.github.com/repos/Baystation12/Baystation12/statuses/e8b4071e076ffb251e627ee1567aa06035c21ec3"}},"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":true,"commits":1,"additions":89,"deletions":361,"changed_files":25}}
{"actor":{"display_login":"atlantiscze"}}