{"action":"created","issue":{"url":"https://api.github.com/repos/jmackereth/eaglestuff/issues/16","repository_url":"https://api.github.com/repos/jmackereth/eaglestuff","labels_url":"https://api.github.com/repos/jmackereth/eaglestuff/issues/16/labels{/name}","comments_url":"https://api.github.com/repos/jmackereth/eaglestuff/issues/16/comments","events_url":"https://api.github.com/repos/jmackereth/eaglestuff/issues/16/events","html_url":"https://github.com/jmackereth/eaglestuff/pull/16","id":134238463,"number":16,"title":"2016feb ted","user":{"login":"jmackereth","id":10188688,"avatar_url":"https://avatars.githubusercontent.com/u/10188688?v=3","gravatar_id":"","url":"https://api.github.com/users/jmackereth","html_url":"https://github.com/jmackereth","followers_url":"https://api.github.com/users/jmackereth/followers","following_url":"https://api.github.com/users/jmackereth/following{/other_user}","gists_url":"https://api.github.com/users/jmackereth/gists{/gist_id}","starred_url":"https://api.github.com/users/jmackereth/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmackereth/subscriptions","organizations_url":"https://api.github.com/users/jmackereth/orgs","repos_url":"https://api.github.com/users/jmackereth/repos","events_url":"https://api.github.com/users/jmackereth/events{/privacy}","received_events_url":"https://api.github.com/users/jmackereth/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":6,"created_at":"2016-02-17T10:15:36Z","updated_at":"2016-02-17T10:41:35Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/jmackereth/eaglestuff/pulls/16","html_url":"https://github.com/jmackereth/eaglestuff/pull/16","diff_url":"https://github.com/jmackereth/eaglestuff/pull/16.diff","patch_url":"https://github.com/jmackereth/eaglestuff/pull/16.patch"},"body":"Ive worked out what all those \r\n<<<<<<HEAD things mean haha\r\n\r\nif you try to pull something thats got loads of changes those symbols mark out the major changes so you can correct them. I think i have now made it so your recent changes and mine are all consistent, so the new mass cut is there but also my snip shot stuff is treated correctly. The one thing i think now needs to be added/changed is the stuff you did yesterday to the saving etc. \r\n\r\nNotice that the saving function has separate sections for snips and snaps now.\r\n\r\nHopefully this all works ok, its my fault for not keeping up with the git"},"comment":{"url":"https://api.github.com/repos/jmackereth/eaglestuff/issues/comments/185148477","html_url":"https://github.com/jmackereth/eaglestuff/pull/16#issuecomment-185148477","issue_url":"https://api.github.com/repos/jmackereth/eaglestuff/issues/16","id":185148477,"user":{"login":"jmackereth","id":10188688,"avatar_url":"https://avatars.githubusercontent.com/u/10188688?v=3","gravatar_id":"","url":"https://api.github.com/users/jmackereth","html_url":"https://github.com/jmackereth","followers_url":"https://api.github.com/users/jmackereth/followers","following_url":"https://api.github.com/users/jmackereth/following{/other_user}","gists_url":"https://api.github.com/users/jmackereth/gists{/gist_id}","starred_url":"https://api.github.com/users/jmackereth/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmackereth/subscriptions","organizations_url":"https://api.github.com/users/jmackereth/orgs","repos_url":"https://api.github.com/users/jmackereth/repos","events_url":"https://api.github.com/users/jmackereth/events{/privacy}","received_events_url":"https://api.github.com/users/jmackereth/received_events","type":"User","site_admin":false},"created_at":"2016-02-17T10:41:35Z","updated_at":"2016-02-17T10:41:35Z","body":"Yes, but actually i think its best if i do another one when your new bits are on the master branch. so ignore that!\n\n> On 17 Feb 2016, at 10:39, Sam Walton <notifications@github.com> wrote:\n> \n> Which pull request? From your 2016feb_ted branch?\n> \n> On 17/02/16 10:38, Ted Mackereth wrote:\n> shall i merge that pull request then so your component masking gets added to that rather than the old version?\n> \n> it should just merge without any problems when you’re done.\n> \n> > On 17 Feb 2016, at 10:30, Sam Walton <notifications@github.com><mailto:notifications@github.com> wrote:\n> >\n> > The component selection!\n> >\n> > On 17/02/16 10:29, Ted Mackereth wrote:\n> > > its doing the masses wrong again?\n> > >\n> > > Or do you mean the component selection? you probably mean that.\n> > >\n> > >\n> > > > On 17 Feb 2016, at 10:27, Sam Walton <notifications@github.com><mailto:notifications@github.com> wrote:\n> > > >\n> > > > Great!\n> > > >\n> > > > I'm still figuring out whether the masking is working, because it\n> > > doesn't seem to be right now, but when it is I'll push it up.\n> > > >\n> > > > On 17/02/16 10:15, Ted Mackereth wrote:\n> > > >\n> > > > Ive worked out what all those\n> > > > <<<<<<HEAD things mean haha\n> > > >\n> > > > if you try to pull something thats got loads of changes those\n> > > symbols mark out the major changes so you can correct them. I think i\n> > > have now made it so your recent changes and mine are all consistent,\n> > > so the new mass cut is there but also my snip shot stuff is treated\n> > > correctly. The one thing i think now needs to be added/changed is the\n> > > stuff you did yesterday to the saving etc.\n> > > >\n> > > > Notice that the saving function has separate sections for snips and\n> > > snaps now.\n> > > >\n> > > > Hopefully this all works ok, its my fault for not keeping up with\n> > > the git\n> > > >\n> > > > ________________________________\n> > > > You can view, comment on, or merge this pull request online at:\n> > > >\n> > > > https://github.com/jmackereth/eaglestuff/pull/16\n> > > >\n> > > > Commit Summary\n> > > >\n> > > > * New memory usage reduction, object oriented mode etc.\n> > > > * Latest Version -- Ted\n> > > > * Brought my branch in line with mass cut changes\n> > > >\n> > > > File Changes\n> > > >\n> > > > * M\n> > > etools.py<https://github.com/jmackereth/eaglestuff/pull/16/files#diff-0><https://github.com/jmackereth/eaglestuff/pull/16/files#diff-0>\n> > > (332)\n> > > >\n> > > > Patch Links:\n> > > >\n> > > > * https://github.com/jmackereth/eaglestuff/pull/16.patch\n> > > > * https://github.com/jmackereth/eaglestuff/pull/16.diff\n> > > >\n> > > > —\n> > > > Reply to this email directly or view it on\n> > > GitHub<https://github.com/jmackereth/eaglestuff/pull/16><https://github.com/jmackereth/eaglestuff/pull/16>.\n> > > >\n> > > >\n> > > > --\n> > > >\n> > > > PhD Student\n> > > > Astrophysics Research Institute, LJMU\n> > > > S.R.Walton@2011.ljmu.ac.uk<mailto:S.R.Walton@2011.ljmu.ac.uk><mailto:S.R.Walton@2011.ljmu.ac.uk><mailto:S.R.Walton@2011.ljmu.ac.uk>\n> > > >\n> > > > ________________________________\n> > > > Important Notice: the information in this email and any attachments\n> > > is for the sole use of the intended recipient(s). If you are not an\n> > > intended recipient, or a person responsible for delivering it to an\n> > > intended recipient, you should delete it from your system immediately\n> > > without disclosing its contents elsewhere and advise the sender by\n> > > returning the email or by telephoning a number contained in the body\n> > > of the email. No responsibility is accepted for loss or damage arising\n> > > from viruses or changes made to this message after it was sent. The\n> > > views contained in this email are those of the author and not\n> > > necessarily those of Liverpool John Moores University.\n> > > > —\n> > > > Reply to this email directly or view it on GitHub\n> > > <https://github.com/jmackereth/eaglestuff/pull/16#issuecomment-185141582><https://github.com/jmackereth/eaglestuff/pull/16#issuecomment-185141582>.\n> > > >\n> > >\n> > > —\n> > > Reply to this email directly or view it on GitHub\n> > > <https://github.com/jmackereth/eaglestuff/pull/16#issuecomment-185142611><https://github.com/jmackereth/eaglestuff/pull/16#issuecomment-185142611>.\n> > >\n> >\n> > --\n> >\n> > PhD Student\n> > Astrophysics Research Institute, LJMU\n> > S.R.Walton@2011.ljmu.ac.uk<mailto:S.R.Walton@2011.ljmu.ac.uk>\n> >\n> > —\n> > Reply to this email directly or view it on GitHub <https://github.com/jmackereth/eaglestuff/pull/16#issuecomment-185143008><https://github.com/jmackereth/eaglestuff/pull/16#issuecomment-185143008>.\n> >\n> \n> \n> —\n> Reply to this email directly or view it on GitHub<https://github.com/jmackereth/eaglestuff/pull/16#issuecomment-185146564>.\n> \n> \n> --\n> \n> PhD Student\n> Astrophysics Research Institute, LJMU\n> S.R.Walton@2011.ljmu.ac.uk<mailto:S.R.Walton@2011.ljmu.ac.uk>\n> \n> ________________________________\n> Important Notice: the information in this email and any attachments is for the sole use of the intended recipient(s). If you are not an intended recipient, or a person responsible for delivering it to an intended recipient, you should delete it from your system immediately without disclosing its contents elsewhere and advise the sender by returning the email or by telephoning a number contained in the body of the email. No responsibility is accepted for loss or damage arising from viruses or changes made to this message after it was sent. The views contained in this email are those of the author and not necessarily those of Liverpool John Moores University.\n> —\n> Reply to this email directly or view it on GitHub <https://github.com/jmackereth/eaglestuff/pull/16#issuecomment-185147316>.\n> \n\n"}}