{"action":"created","issue":{"url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/254","repository_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine","labels_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/254/labels{/name}","comments_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/254/comments","events_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/254/events","html_url":"https://github.com/TeamPorcupine/ProjectPorcupine/pull/254","id":172085181,"number":254,"title":"Power system onupdate rework","user":{"login":"TheRiven","id":3747487,"avatar_url":"https://avatars.githubusercontent.com/u/3747487?v=3","gravatar_id":"","url":"https://api.github.com/users/TheRiven","html_url":"https://github.com/TheRiven","followers_url":"https://api.github.com/users/TheRiven/followers","following_url":"https://api.github.com/users/TheRiven/following{/other_user}","gists_url":"https://api.github.com/users/TheRiven/gists{/gist_id}","starred_url":"https://api.github.com/users/TheRiven/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/TheRiven/subscriptions","organizations_url":"https://api.github.com/users/TheRiven/orgs","repos_url":"https://api.github.com/users/TheRiven/repos","events_url":"https://api.github.com/users/TheRiven/events{/privacy}","received_events_url":"https://api.github.com/users/TheRiven/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2016-08-19T08:57:32Z","updated_at":"2016-08-19T10:12:33Z","closed_at":"2016-08-19T09:31:36Z","pull_request":{"url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/pulls/254","html_url":"https://github.com/TeamPorcupine/ProjectPorcupine/pull/254","diff_url":"https://github.com/TeamPorcupine/ProjectPorcupine/pull/254.diff","patch_url":"https://github.com/TeamPorcupine/ProjectPorcupine/pull/254.patch"},"body":"Ok lets try this again ---\r\n\r\nI have moved the power system check from the furniture update function to its own function so that it is no longer used by ALL the furniture. This function can instead be used in the Lua code for furniture to check if it has power.\r\n\r\nThis will allow alternative behaviour to be scripted in Lua for if the furniture has power or not.\r\n\r\nOnce again the only furniture using this at the moment is the oxygen generator. "},"comment":{"url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/comments/240981125","html_url":"https://github.com/TeamPorcupine/ProjectPorcupine/pull/254#issuecomment-240981125","issue_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/254","id":240981125,"user":{"login":"Mizipzor","id":139879,"avatar_url":"https://avatars.githubusercontent.com/u/139879?v=3","gravatar_id":"","url":"https://api.github.com/users/Mizipzor","html_url":"https://github.com/Mizipzor","followers_url":"https://api.github.com/users/Mizipzor/followers","following_url":"https://api.github.com/users/Mizipzor/following{/other_user}","gists_url":"https://api.github.com/users/Mizipzor/gists{/gist_id}","starred_url":"https://api.github.com/users/Mizipzor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Mizipzor/subscriptions","organizations_url":"https://api.github.com/users/Mizipzor/orgs","repos_url":"https://api.github.com/users/Mizipzor/repos","events_url":"https://api.github.com/users/Mizipzor/events{/privacy}","received_events_url":"https://api.github.com/users/Mizipzor/received_events","type":"User","site_admin":false},"created_at":"2016-08-19T10:12:33Z","updated_at":"2016-08-19T10:12:33Z","body":"I just tried the github desktop client, is that the one your using? Files can show up as changed, they have a checkbox beside them, you can uncheck the ones you dont want to commit.\r\n\r\nIt also appear that you are merging in stuff that you dont need. This should either be fast forward merged or rebased.\r\n\r\nHow about nuking you fork and start over? Copy all source files (that you changed) to desktop or something. Delete the project, delete the fork on github. Refork and download, create a branch again and paste your files. Does that work? I remember doing this _a lot_ when I learned Git. XD "}}
{"actor":{"display_login":"Mizipzor"}}