{"action":"created","issue":{"url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/issues/40","labels_url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/issues/40/labels{/name}","comments_url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/issues/40/comments","events_url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/issues/40/events","html_url":"https://github.com/RigsOfRods/rigs-of-rods/pull/40","id":56141046,"number":40,"title":"Merge with my edits","user":{"login":"Max98","id":4823878,"avatar_url":"https://avatars.githubusercontent.com/u/4823878?v=3","gravatar_id":"","url":"https://api.github.com/users/Max98","html_url":"https://github.com/Max98","followers_url":"https://api.github.com/users/Max98/followers","following_url":"https://api.github.com/users/Max98/following{/other_user}","gists_url":"https://api.github.com/users/Max98/gists{/gist_id}","starred_url":"https://api.github.com/users/Max98/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Max98/subscriptions","organizations_url":"https://api.github.com/users/Max98/orgs","repos_url":"https://api.github.com/users/Max98/repos","events_url":"https://api.github.com/users/Max98/events{/privacy}","received_events_url":"https://api.github.com/users/Max98/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/labels/NextStable","name":"NextStable","color":"66FFFF"}],"state":"open","locked":false,"assignee":null,"milestone":{"url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/milestones/1","labels_url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/milestones/1/labels","id":937168,"number":1,"title":"RoR 0.4.5 (Nextstable)","description":"","creator":{"login":"Max98","id":4823878,"avatar_url":"https://avatars.githubusercontent.com/u/4823878?v=3","gravatar_id":"","url":"https://api.github.com/users/Max98","html_url":"https://github.com/Max98","followers_url":"https://api.github.com/users/Max98/followers","following_url":"https://api.github.com/users/Max98/following{/other_user}","gists_url":"https://api.github.com/users/Max98/gists{/gist_id}","starred_url":"https://api.github.com/users/Max98/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Max98/subscriptions","organizations_url":"https://api.github.com/users/Max98/orgs","repos_url":"https://api.github.com/users/Max98/repos","events_url":"https://api.github.com/users/Max98/events{/privacy}","received_events_url":"https://api.github.com/users/Max98/received_events","type":"User","site_admin":false},"open_issues":10,"closed_issues":4,"state":"open","created_at":"2015-01-15T17:59:33Z","updated_at":"2015-01-31T21:52:35Z","due_on":null,"closed_at":null},"comments":10,"created_at":"2015-01-31T21:52:22Z","updated_at":"2015-02-04T05:36:06Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/pulls/40","html_url":"https://github.com/RigsOfRods/rigs-of-rods/pull/40","diff_url":"https://github.com/RigsOfRods/rigs-of-rods/pull/40.diff","patch_url":"https://github.com/RigsOfRods/rigs-of-rods/pull/40.patch"},"body":"I think it's time we merge the GUI (and all of my edits) and the upstream together. It's still not complete, but it's usable.\r\nThe main reason i'm asking for this it's because each time i have to update my local with the upstream, github just gets a lot of conflicts and few errors.. It's simply because of the big difference between my local and the upstream. So it's simply to save myself from headaches, and to make you guys code with the new GUI on mind.\r\n\r\nAs far as i tested, it compiles, and it works correctly.\r\n\r\nThis includes all of the things listed here: http://www.rigsofrods.com/threads/117424-Test-build-Project-GUI-NextStable\r\n\r\nAdditional downloads to be able to compile:  (Only under windows if not mistaken)\r\n1/ http://www.softagalleria.net/dirent.php"},"comment":{"url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/issues/comments/72793606","html_url":"https://github.com/RigsOfRods/rigs-of-rods/pull/40#issuecomment-72793606","issue_url":"https://api.github.com/repos/RigsOfRods/rigs-of-rods/issues/40","id":72793606,"user":{"login":"Max98","id":4823878,"avatar_url":"https://avatars.githubusercontent.com/u/4823878?v=3","gravatar_id":"","url":"https://api.github.com/users/Max98","html_url":"https://github.com/Max98","followers_url":"https://api.github.com/users/Max98/followers","following_url":"https://api.github.com/users/Max98/following{/other_user}","gists_url":"https://api.github.com/users/Max98/gists{/gist_id}","starred_url":"https://api.github.com/users/Max98/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Max98/subscriptions","organizations_url":"https://api.github.com/users/Max98/orgs","repos_url":"https://api.github.com/users/Max98/repos","events_url":"https://api.github.com/users/Max98/events{/privacy}","received_events_url":"https://api.github.com/users/Max98/received_events","type":"User","site_admin":false},"created_at":"2015-02-04T05:36:06Z","updated_at":"2015-02-04T05:36:06Z","body":"@Aperion We can, let's say, separate the features into 3 parts. \r\n1/ GUI Overhaul\r\n2/ Bug fixing (Skid marks for example)\r\n3/ Little new feautres (Engturbo section for example/Electric engines..) \r\n\r\nAnd that's the reason why i wanted to merge, because i felt that my source edits are getting bigger and bigger and only_a_ptr's work is also getting bigger and i was kinda of scared that if we merge things at the same time, we will both have headaches fixing and converting everything."}}