GraylinKim/sc2reader — pull request #163 by StoicLoofah (2013-12-06 06:16:35+00:00)
Title: adding a missing change from the list

This may or may not be correct, but I happen to be using SelfAbilityEvent, and from my 10 second look at 2b35c07, I think was the change that was made.

This is only somewhat related, but git question: I initially tried to submit this pull request, but there was a bunch of crap in there, including a bunch of merges from upstream/master into my fork's master. I ended up resetting my fork's master to upstream/master and doing a push -f to get things lined up. Since I haven't developed any custom features, I figure I should just keep my master matching upstream/master and do all of my work in feature branches. Then, I'll get them back onto my master when they're (hopefully) integrated into upstream/master, and I can just fast-forward. Was that the right thing to do?