{"action":"created","issue":{"url":"https://api.github.com/repos/MovingBlocks/DestinationSol/issues/27","labels_url":"https://api.github.com/repos/MovingBlocks/DestinationSol/issues/27/labels{/name}","comments_url":"https://api.github.com/repos/MovingBlocks/DestinationSol/issues/27/comments","events_url":"https://api.github.com/repos/MovingBlocks/DestinationSol/issues/27/events","html_url":"https://github.com/MovingBlocks/DestinationSol/pull/27","id":84461546,"number":27,"title":"Merge Master in to Hull","user":{"login":"SimonC4","id":7613950,"avatar_url":"https://avatars.githubusercontent.com/u/7613950?v=3","gravatar_id":"","url":"https://api.github.com/users/SimonC4","html_url":"https://github.com/SimonC4","followers_url":"https://api.github.com/users/SimonC4/followers","following_url":"https://api.github.com/users/SimonC4/following{/other_user}","gists_url":"https://api.github.com/users/SimonC4/gists{/gist_id}","starred_url":"https://api.github.com/users/SimonC4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SimonC4/subscriptions","organizations_url":"https://api.github.com/users/SimonC4/orgs","repos_url":"https://api.github.com/users/SimonC4/repos","events_url":"https://api.github.com/users/SimonC4/events{/privacy}","received_events_url":"https://api.github.com/users/SimonC4/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":2,"created_at":"2015-06-03T09:35:21Z","updated_at":"2015-06-04T05:13:47Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/MovingBlocks/DestinationSol/pulls/27","html_url":"https://github.com/MovingBlocks/DestinationSol/pull/27","diff_url":"https://github.com/MovingBlocks/DestinationSol/pull/27.diff","patch_url":"https://github.com/MovingBlocks/DestinationSol/pull/27.patch"},"body":"Merged Master in to Hull and resolved the conflicts caused by PR #20 and PR #24. \r\n"},"comment":{"url":"https://api.github.com/repos/MovingBlocks/DestinationSol/issues/comments/108727963","html_url":"https://github.com/MovingBlocks/DestinationSol/pull/27#issuecomment-108727963","issue_url":"https://api.github.com/repos/MovingBlocks/DestinationSol/issues/27","id":108727963,"user":{"login":"Cervator","id":1063833,"avatar_url":"https://avatars.githubusercontent.com/u/1063833?v=3","gravatar_id":"","url":"https://api.github.com/users/Cervator","html_url":"https://github.com/Cervator","followers_url":"https://api.github.com/users/Cervator/followers","following_url":"https://api.github.com/users/Cervator/following{/other_user}","gists_url":"https://api.github.com/users/Cervator/gists{/gist_id}","starred_url":"https://api.github.com/users/Cervator/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Cervator/subscriptions","organizations_url":"https://api.github.com/users/Cervator/orgs","repos_url":"https://api.github.com/users/Cervator/repos","events_url":"https://api.github.com/users/Cervator/events{/privacy}","received_events_url":"https://api.github.com/users/Cervator/received_events","type":"User","site_admin":false},"created_at":"2015-06-04T05:13:47Z","updated_at":"2015-06-04T05:13:47Z","body":"Thanks for tweaking at this! It does look a little better :-)\r\n\r\nStill seems to be a bit to go, the pirate towers still topple over:\r\n\r\n![destination sol_2015-06-04_00-48-45](https://cloud.githubusercontent.com/assets/1063833/7977221/f9cd2446-0a55-11e5-86f7-bbc7ab8e764e.png)\r\n\r\nAnd some AI ships still like taking naps:\r\n\r\n![destination sol_2015-06-04_00-49-11](https://cloud.githubusercontent.com/assets/1063833/7977224/05e93788-0a56-11e5-88eb-97c203e584db.png)\r\n\r\nAnother that can provoke one of the new quirks is hopping into the heavy fighter you can buy at the starting station (the one where one wing is a kind of stump). Buy that and just bump around the starting station / ships there, the ship boundary doesn't seem right.\r\n\r\nFinally mercenaries are really whacky with this, hadn't noticed that before :D Not that they're super complete and helpful even normally! Just fly to the first planet and buy a pile of the mercs there, see it rain ships!\r\n\r\nOn a Git related note it looks like something went wrong with the merge. You've got the commits you and I have been working on lately showing up as duplicates here, and @LinusVanElswijk's original commits consumed inside the merge rather than shown normally. \r\n\r\nCould be the order of things. Try a fresh version of the master branch from MovingBlocks then make sure to merge hull into *it* rather than the other way around, if that's what happened :-)"}}