Merge branch 'master' into patch-1

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2015-present Jiiks | Jiiks.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -10,7 +10,7 @@ Note that this whole branch is deprecated. all further development is going on h
 
 Better Discord App enhances the Discord desktop app with new features.
 
-![ss](http://puu.sh/oIO58.png)
+![ss](http://i.imgur.com/Gj6oD7z.png)
 
 ## Windows Universal Installer
 * Download the latest installer from [releases](https://github.com/Jiiks/BetterDiscordApp/releases)
@@ -52,8 +52,8 @@ Minimal mode makes elements smaller and hides certain elements.
 Only display voice channels
 
 **Public Servers:**
-A modal window for public servers [DiscordServers.com](https://www.discordservers.com/) 
-![ss](http://puu.sh/o9oNl.png)
+Public server listing provided by: [DiscordServers.com](https://www.discordservers.com/) 
+![ss](http://i.imgur.com/BVUZlu9.png)
 
 **Custom CSS**
 BetterDiscord supports custom CSS for styling Discord to your liking.
@@ -81,14 +81,14 @@ Add your server there and it will appear in the list!
 ## Credits
 * MacOS Installer by [Candunc](https://github.com/Candunc) 
 * Emote titles by [pendo324](https://github.com/pendo324)
-* Majority of FFZ emote work by [Pohky] (https://github.com/pohky)
-* Majority of BTTV emote work by [EhsanKia] (https://github.com/EhsanKia)
+* Majority of FFZ emote work by [Pohky](https://github.com/pohky) and [DeathStrikeV](https://github.com/DeathStrikeV)
+* Majority of BTTV emote work by [EhsanKia](https://github.com/EhsanKia)
 
 ## License
 
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 Jiiks | [Jiiks.net] (https://jiiks.net)
+Copyright (c) 2015-present Jiiks | [Jiiks.net](https://jiiks.net)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/emotefilter.json

@@ -248,6 +248,10 @@
     "Lucarionite",
     "Bryce",
     "Charlotte",
-    "Gramps"
+    "Gramps",
+    "MSPaint",
+    "Excalibur",
+    "Abaddon",
+    "Moddb"
   ]
 }

issues

@@ -0,0 +1 @@
+Reopening issues now that I'm actively developing this again. Feel free to reopen your issue if it's still relevant.