Merge pull request #12 from AdorableMallow/master

[ Core ] Fix: Addon.txt randomly having a fight with git. Also update.