From 773da182a1f3e982224685a5260f3b7f9551dd4c Mon Sep 17 00:00:00 2001 From: zetterburn Date: Fri, 8 Jan 2016 19:27:20 -0500 Subject: [PATCH 01/22] Update serverlist.json Add server for Rivals of Aether (At bottom of list) --- data/serverlist.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/serverlist.json b/data/serverlist.json index cf0d3897..2f9935d6 100644 --- a/data/serverlist.json +++ b/data/serverlist.json @@ -728,5 +728,12 @@ "language": "EN", "title": "Game Development" } + "Rivals of Aether": { + "code": "0M4F1870WAbAPTbg", + "description": "Rivals of Aether", + "icon": null, + "language": "EN", + "title": "Rivals of Aether" + } } } From a1cc5218edb60d9e51b69c82df6edca7c6a46507 Mon Sep 17 00:00:00 2001 From: Jiiks Date: Sun, 10 Jan 2016 11:36:16 +0200 Subject: [PATCH 02/22] Bug fix --- js/main.js | 2 ++ js/main.min.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index 70f6d9f8..c9284dd7 100644 --- a/js/main.js +++ b/js/main.js @@ -250,10 +250,12 @@ Core.prototype.initObserver = function () { $(".message-group").each(function () { var a = $(this).find(".avatar-large"); if (a.length > 0) { + try { var b = a.css("background-image").match(/\d+/).toString(); if (botlist.indexOf(a) > -1) { $(this).find(".user-name").addClass("boticon"); } + }catch(err) {} } }); } diff --git a/js/main.min.js b/js/main.min.js index 55675d62..a62974b9 100644 --- a/js/main.min.js +++ b/js/main.min.js @@ -3,7 +3,7 @@ Core.prototype.init=function(){var self=this;if(version0){console.log(new Date().getTime()+" Defer Loaded");var guilds=$(".guilds li:first-child");guilds.after($("
  • ",{id:"bd-pub-li",css:{"height":"20px","display":settingsCookie["bda-gs-1"]==true?"":"none"}}).append($("
    ",{class:"guild-inner",css:{"height":"20px","border-radius":"4px"}}).append($("").append($("
    ",{css:{"line-height":"20px","font-size":"12px"},text:"public",id:"bd-pub-button"})))));var showChannelsButton=$("'+'
    '+'
    '+'
    ';if(bdchangelog.changes!=null){changeLog+=''+'

    '+' New Stuff'+'

    '+'
    ';} if(bdchangelog.upcoming!=null){changeLog+=''+'

    '+' Coming Soon'+'

    '+'
      ';for(var upc in bdchangelog.upcoming){upc=bdchangelog.upcoming[upc];changeLog+=''+'
    • '+' '+upc.title+''+'
      '+upc.text+'
      '+'
    • ';} changeLog+='
    ';} changeLog+=''+'
    '+'
    '+' '+'
    '+' '+'';return changeLog;};Core.prototype.alert=function(title,text){$("body").append(''+'
    '+'
    '+' '+title+''+'
    ×
    '+'
    '+'
    '+'
    '+'
    '+text+'
    '+'
    '+'
    '+'
    ');};var emotesFfz={};var emotesBTTV={};var emotesTwitch={"emotes":{"emote":{"image_id":0}}};var subEmotesTwitch={};function EmoteModule(){} -EmoteModule.prototype.init=function(){};EmoteModule.prototype.getBlacklist=function(){$.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/"+_hash+"/emotefilter.json",function(data){bemotes=data.blacklist;});};EmoteModule.prototype.obsCallback=function(mutation){var self=this;if(!settingsCookie["bda-es-7"])return;$(".emoji").each(function(){var t=$(this);if(t.attr("src").indexOf(".png")!=-1){t.replaceWith(""+t.attr("alt")+"");}});for(var i=0;i"+t.attr("alt")+"");}});for(var i=0;i-1){return;} diff --git a/updater.json b/updater.json deleted file mode 100644 index 814c4aa8..00000000 --- a/updater.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "LatestVersion":"0.2.5", - "CDN":"cdn.rawgit.com" -} \ No newline at end of file From 4702ce7f385ae9e6956fc196b6a0826e6c8abd93 Mon Sep 17 00:00:00 2001 From: Jiiks Date: Sun, 17 Jan 2016 01:09:40 +0200 Subject: [PATCH 17/22] Update serverlist link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8bc0d205..aed311a5 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Minimal mode makes elements smaller and hides certain elements. Only display voice channels **Public Servers:** -A menu for displaying public servers. [Serverlist](https://github.com/Jiiks/BetterDiscordApp/blob/master/serverlist.json) +A menu for displaying public servers. [Serverlist](https://github.com/Jiiks/BetterDiscordApp/blob/master/data/serverlist.json) **Custom CSS** BetterDiscord supports custom CSS for styling Discord to your liking. From e80c617bc27c253634b18c37a4640eb11dfb7e96 Mon Sep 17 00:00:00 2001 From: Jiiks Date: Sun, 17 Jan 2016 01:16:11 +0200 Subject: [PATCH 18/22] Move stuff to misc, remove unsused files add .dev. to ignore --- .gitignore | 3 +- emotefilter.json | 29 -- uninstall.js => misc/uninstall.js | 0 validator.js => misc/validator.js | 0 serverlist.json | 739 ------------------------------ 5 files changed, 2 insertions(+), 769 deletions(-) delete mode 100644 emotefilter.json rename uninstall.js => misc/uninstall.js (100%) rename validator.js => misc/validator.js (100%) delete mode 100644 serverlist.json diff --git a/.gitignore b/.gitignore index 69595c21..73885d92 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ devjs/.idea/devjs.iml *.bak *.bak.* *.xpi -Firefox/data/js/jquery-2.1.4.min.js \ No newline at end of file +Firefox/data/js/jquery-2.1.4.min.js +*.dev.* \ No newline at end of file diff --git a/emotefilter.json b/emotefilter.json deleted file mode 100644 index b11fd8da..00000000 --- a/emotefilter.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "blacklist": [ - "double", - "triple", - "quadra", - "penta", - "snap", - "Boy", - "Kill", - "Face", - "Beer", - "Bag", - "Bruh", - "Happy", - "Cheese", - "Hate", - "Jake", - "Rage", - "Train", - "Shame", - "Demon", - "Dream", - "Fighting", - "Sonic", - "Mario", - "Paul", - "Dafuq" - ] -} diff --git a/uninstall.js b/misc/uninstall.js similarity index 100% rename from uninstall.js rename to misc/uninstall.js diff --git a/validator.js b/misc/validator.js similarity index 100% rename from validator.js rename to misc/validator.js diff --git a/serverlist.json b/serverlist.json deleted file mode 100644 index 1dd298f4..00000000 --- a/serverlist.json +++ /dev/null @@ -1,739 +0,0 @@ -{ - "servers": { - "BetterDiscord": { - "code": "0Tmfo5ZbORCRqbAd", - "description": "BetterDiscord Server", - "icon": null, - "language": "EN", - "title": "BetterDiscord" - }, - "3DS": { - "code": "0UFdpe0x69ZguQw8", - "description": "3DS", - "icon": null, - "language": "EN", - "title": "3DS" - }, - "4chan": { - "code": "0jTw4blvTy1p64eL", - "description": "4chan Discord", - "icon": null, - "language": "EN", - "title": "4chan" - }, - "Black Desert Online": { - "code": "0hpSA0xzUj07ABop", - "description": "BDO", - "icon": null, - "language": "EN", - "title": "Black Desert Online" - }, - "ALTEDM": { - "code": "0Y6Is461Ze5ae0w1", - "description": "ALTEDM", - "icon": null, - "language": "EN", - "title": "ALTEDM" - }, - "ARMA": { - "code": "0aGPuCZqmGNA7xiu", - "description": "ARMA", - "icon": null, - "language": "EN", - "title": "ARMA" - }, - "Abusement Park": { - "code": "0YEnlwRYgAEvNz98", - "description": "Abusement Park", - "icon": null, - "language": "EN", - "title": "Abusement Park" - }, - "Adventurer's Guild": { - "code": "0MRCBg85iz6XrZu2", - "description": "Adventurer's Guild", - "icon": null, - "language": "EN", - "title": "Adventurer's Guild" - }, - "Animu and Mango": { - "code": "0TrxVUwZsSuz9S4j", - "description": "Animu and Mango", - "icon": null, - "language": "EN", - "title": "Animu and Mango" - }, - "Anime-Discuss": { - "code": "0ccNdvWBCEuw87eD", - "description": "Anime-Discuss", - "icon": null, - "language": "EN", - "title": "Anime-Discuss" - }, - "Binding of Isaac": { - "code": "0gonaBVBNISU8zhS", - "description": "For all Isaac talk", - "icon": null, - "language": "EN", - "title": "Binding of Isaac" - }, - "Blade and Soul": { - "code": "0TaItTx9qrQce4iU", - "description": "Blade and Soul", - "icon": null, - "language": "EN", - "title": "Blade and Soul" - }, - "Blade Symphony": { - "code": "0gaDaXebgoD4CJ3a", - "description": "Blade Symphony", - "icon": null, - "language": "EN", - "title": "Blade Symphony" - }, - "Bluscream's Server": { - "code": "0Xdjjtm2UyoI6Kgu", - "description": "Bluscream's Discord Server", - "icon": null, - "language": "EN", - "title": "Bluscream's Server" - }, - "Cell Geek House": { - "code": "0eMZO3uY2Gk15xD7", - "description": "Cell Geek House / Cell Cyber Arena", - "icon": null, - "language": "EN", - "title": "Cell Geek House" - }, - "CS:GO": { - "code": "0TIJM4joeU3XmRWO", - "description": "CS:GO", - "icon": null, - "language": "EN", - "title": "CS:GO" - }, - "ChristOutreachOnline": { - "code": "0aFmfZpsrBo0bD1d", - "description": "ChristOutreachOnline", - "icon": null, - "language": "EN", - "title": "ChristOutreachOnline" - }, - "Closers Dimension Conflict": { - "code": "0S3aWQEkIlWcA2CD", - "description": "Closers Dimension Conflict", - "icon": null, - "language": "EN", - "title": "Closers Dimension Conflict" - }, - "Comic Book General": { - "code": "0aNAiNnGVDNURGbI", - "description": "Comic Book General", - "icon": null, - "language": "EN", - "title": "Comic Book General" - }, - "Crowfall MMO": { - "code": "0MDCm6IEmg1BF8Ui", - "description": "Crowfall MMO", - "icon": null, - "language": "EN", - "title": "Crowfall MMO" - }, - "DOTA2": { - "code": "0Pj5D1QKnYAR4GQ7", - "description": "DOTA 2", - "icon": null, - "language": "EN", - "title": "DOTA 2" - }, - "DUTCH": { - "code": "0Vb7szHL7DblhTFt", - "description": "[NL] FPS/MOBA", - "icon": null, - "language": "NL", - "title": "DUTCH" - }, - "Devilion MMO": { - "code": "0Mgy9tqnN39ctFsm", - "description": "Devilion MMO", - "icon": null, - "language": "EN", - "title": "Devilion MMO" - }, - "Diablo 3": { - "code": "0aOBBxGmOoM5IJ25", - "description": "Diablo 3", - "icon": null, - "language": "EN", - "title": "Diablo 3" - }, - "Diablo": { - "code": "0TAtzhBDJhJiC9Ie", - "description": "Diablo", - "icon": null, - "language": "EN", - "title": "Diablo" - }, - "Discord & Chill": { - "code": "0kXd4CnI26mZzkun", - "description": "Discord & Chill", - "icon": null, - "language": "EN", - "title": "Discord & Chill" - }, - "DiscordDevs": { - "code": "0ESuwoZe4M2Xcpeu", - "description": "DiscordDevs", - "icon": null, - "language": "EN", - "title": "DiscordDevs" - }, - "DiscordLinux": { - "code": "0XKEBLSe6ccP5uYT", - "description": "DiscordLinux", - "icon": null, - "language": "EN", - "title": "DiscordLinux" - }, - "Distance": { - "code": "0SlqqvzfIbgVqJB6", - "description": "Distance", - "icon": null, - "language": "EN", - "title": "Distance" - }, - "Dofus": { - "code": "0RDH0dqUoTRFbwy9", - "description": "Dofus", - "icon": null, - "language": "EN", - "title": "Dofus" - }, - "Dragon Nest DNSWorld": { - "code": "0VcwAnzwc0KNfgML", - "description": "Dragon Nest DNSWorld", - "icon": null, - "language": "EN", - "title": "Dragon Nest DNSWorld" - }, - "Dragon Nest NA": { - "code": "0aoJVkoXoNwFEUea", - "description": "Dragon Nest NA", - "icon": null, - "language": "EN", - "title": "Dragon Nest NA" - }, - "E-Sports India": { - "code": "0YlFAx7vf5bUixZQ", - "description": "E-Sports India", - "icon": null, - "language": "EN", - "title": "E-Sports India" - }, - "ElDewrito": { - "code": "0TKY0SDEUHBum0w3", - "description": "Halo Online ElDewrito", - "icon": null, - "language": "EN", - "title": "ElDewrito" - }, - "Elite Dangerous": { - "code": "0V5hfT4eO8fN9Q6K", - "description": "Elite Dangerous", - "icon": null, - "language": "EN", - "title": "Elite Dangerous" - }, - "Evolve": { - "code": "0UqXI9nyH0aVU7rr", - "description": "Evolve", - "icon": null, - "language": "EN", - "title": "Evolve" - }, - "FFXIV (chaos)XIV Cerberus": { - "code": "0ZxYbZOJBFGPHFCA", - "description": "FFXIV (chaos)XIV Cerberus", - "icon": null, - "language": "EN", - "title": "FFXIV (chaos)XIV Cerberus" - }, - "FFXIV - Adamantoise": { - "code": "0a7yOKD02XGkhkX1", - "description": "FFXIV - Adamantoise", - "icon": null, - "language": "EN", - "title": "FFXIV - Adamantoise" - }, - "FFXIV - Leviathan": { - "code": "0aBJkEDJGsBMDNON", - "description": "FFXIV - Leviathan", - "icon": null, - "language": "EN", - "title": "FFXIV - Leviathan" - }, - "FFXIV - Odin": { - "code": "0aBuERD9ZVV8BFqq", - "description": "FFXIV - Odin", - "icon": null, - "language": "EN", - "title": "FFXIV - Odin" - }, - "FFXIV - Ultros": { - "code": "0alCJcRuekEnn3Ha", - "description": "FFXIV - Ultros", - "icon": null, - "language": "EN", - "title": "FFXIV - Ultros" - }, - "FFXIV Heavensward": { - "code": "0HCCgO4RbqVjgShp", - "description": "FFXIV Heavensward", - "icon": null, - "language": "EN", - "title": "FFXIV Heavensward" - }, - "FRENCH": { - "code": "0Tx7qmKNCj1yivSy", - "description": "FRENCH", - "icon": null, - "language": "FR", - "title": "FRENCH" - }, - "Fuckboii squad #1": { - "code": "0V2bHFWgHEZt0GsE", - "description": "Fuckboii squad #1", - "icon": null, - "language": "EN", - "title": "Fuckboii squad #1" - }, - "Games are Magic": { - "code": "0THXqgmFNlha7B6g", - "description": "Games are Magic", - "icon": null, - "language": "EN", - "title": "Games are Magic" - }, - "Guild Wars 2": { - "code": "0b5yVCmhcVt4C6mr", - "description": "Guild Wars 2", - "icon": null, - "language": "EN", - "title": "Guild Wars 2" - }, - "Hearthstone": { - "code": "0TwrUZr5zGyFd7HX", - "description": "Hearthstone", - "icon": null, - "language": "EN", - "title": "Hearthstone" - }, - "Heroes of the Storm": { - "code": "0SLRrvrOn5DdcrHU", - "description": "Heroes of the Storm", - "icon": null, - "language": "EN", - "title": "Heores of the Storm" - }, - "Highschool DxD": { - "code": "0guT1EI9HilMr4dg", - "description": "Highschool DxD", - "icon": null, - "language": "EN", - "title": "Highschool DxD" - }, - "Hip Slick & Geek": { - "code": "0Uk8GIZtbNLEbhaP", - "description": "Hip Slick & Geek", - "icon": null, - "language": "EN", - "title": "Hip Slick & Geek" - }, - "Insurgency": { - "code": "0YOLsfWWZSvS0jHe", - "description": "Insurgency", - "icon": null, - "language": "EN", - "title": "Insurgency" - }, - "Japanese Media Management": { - "code": "0XKJW7TObKLajoKc", - "description": "Japanese Media Management", - "icon": null, - "language": "EN", - "title": "Japanese Media Management" - }, - "KappaPride": { - "code": "0ijf4nNsflGI8zYR", - "description": "#Kappa", - "icon": null, - "language": "EN", - "title": "KappaPride" - }, - "Killing Floor 2": { - "code": "0YmeWp0IqRUndLXx", - "description": "Killing Floor 2", - "icon": null, - "language": "EN", - "title": "Killing Floor 2" - }, - "League of Legends": { - "code": "0T8zCRzGTxbLjlhw", - "description": "League of Legends", - "icon": null, - "language": "EN", - "title": "League of Legends" - }, - "Left 4 Dead 2": { - "code": "0YmpIAl4WCls4SLK", - "description": "Left 4 Dead 2", - "icon": null, - "language": "EN", - "title": "Left 4 Dead 2" - }, - "Let's Play": { - "code": "0jPHFPiVA2lxKFvN", - "description": "For all kind of Let's Players and viewers.", - "icon": null, - "language": "ALL", - "title": "Let's Play" - }, - "Lost Saga": { - "code": "0XVkwnDAeKgT2Cbv", - "description": "Lost Saga", - "icon": null, - "language": "EN", - "title": "Lost Saga" - }, - "Mario Kart": { - "code": "0TtGzmNdU5ZxCkgv", - "description": "Mario Kart", - "icon": null, - "language": "EN", - "title": "Mario Kart" - }, - "Meebo and Friends": { - "code": "0ZP2BxUIC1eQSp4K", - "description": "Meebo and Friends", - "icon": null, - "language": "EN", - "title": "Meebo and Friends" - }, - "Minecraft": { - "code": "0VAzP14IRxYaC97V", - "description": "Minecraft", - "icon": null, - "language": "EN", - "title": "Minecraft" - }, - "MovieClub": { - "code": "0Tx4H0SMzT5Qv46T", - "description": "MovieClub", - "icon": null, - "language": "EN", - "title": "MovieClub" - }, - "Osu!": { - "code": "0Y1676AR4QQfPn4x", - "description": "Osu!", - "icon": null, - "language": "EN", - "title": "Osu!" - }, - "Overwatch": { - "code": "0aP2XiSkO7ekjro4", - "description": "Overwatch", - "icon": null, - "language": "EN", - "title": "Overwatch" - }, - "PKA/Painkiller": { - "code": "0Ud6KT05Ly2NMd3f", - "description": "PKA/Painkiller", - "icon": null, - "language": "EN", - "title": "PKA/Painkiller" - }, - "PORTUGUESE": { - "code": "", - "description": "PORTUGUESE", - "icon": null, - "language": "PT", - "title": "PORTUGUESE" - }, - "Path of Exile": { - "code": "0aPhfOWXrsfz4wk2", - "description": "Path of Exile", - "icon": null, - "language": "EN", - "title": "Path of Exile" - }, - "Project Zomboid": { - "code": "0OjlJ7zhCLhDTCti", - "description": "Project Zomboid", - "icon": null, - "language": "EN", - "title": "Project Zomboid" - }, - "Ragnarok Online": { - "code": "0hr7izZb0BhnyN8L", - "description": "Ragnarok Online", - "icon": null, - "language": "EN", - "title": "Ragnarok Online" - }, - "Reflex": { - "code": "0SrnNbgr3f6Mz9kt", - "description": "Reflex", - "icon": null, - "language": "EN", - "title": "Reflex" - }, - "RepZ": { - "code": "0gAFLYLhoOvyeqBA", - "description": "RepZ Clan Discord Server", - "icon": null, - "language": "EN", - "title": "RepZ" - }, - "Rhythm Games Community": { - "code": "0SrIUyiiarDafGL2", - "description": "Rhythm Games Community", - "icon": null, - "language": "EN", - "title": "Rhythm Games Community" - }, - "Rising Thunder": { - "code": "0WTdWwnuayUuFQYH", - "description": "Rising Thunder", - "icon": null, - "language": "EN", - "title": "Rising Thunder" - }, - "Rocket League": { - "code": "0TDkiRRfZwNBNfA5", - "description": "Rocket League", - "icon": null, - "language": "EN", - "title": "Rocket League" - }, - "SWEDISH": { - "code": "0VnT8iwVFHLNARyZ", - "description": "SWEDISH", - "icon": null, - "language": "SWE", - "title": "SWEDISH" - }, - "Secrets of Grindea": { - "code": "0OKNQ4xrrE0PRQQM", - "description": "Secrets of Grindea", - "icon": null, - "language": "EN", - "title": "Secrets of Grindea" - }, - "Smash Brothers /r/ssbm": { - "code": "0Xeas8JqXwdpX0lR", - "description": "Smash Brothers /r/ssbm", - "icon": null, - "language": "EN", - "title": "Smash Brothers" - }, - "Smash Brothers": { - "code": "0PAW8nxQx9UbYVTq", - "description": "Smash Brothers - Australian Smash", - "icon": null, - "language": "EN", - "title": "Smash Brothers" - }, - "Smite": { - "code": "0U54RVEbDtnOU2wa", - "description": "Smite", - "icon": null, - "language": "EN", - "title": "Smite" - }, - "Social Hub": { - "code": "0VIWePEAZcdNDQM5", - "description": "Social Hub", - "icon": null, - "language": "EN", - "title": "Social Hub" - }, - "SoulsBorne": { - "code": "0gzazVW6NC6TCIJC", - "description": "All things soulsborne", - "icon": null, - "language": "EN", - "title": "SoulsBorne" - }, - "Starcraft": { - "code": "0Vjzi81e7LFaUhPR", - "description": "Starcraft", - "icon": null, - "language": "EN", - "title": "Starcraft" - }, - "Sword of Vermilion": { - "code": "0b0ZitR25ZeGGiLT", - "description": "Sword of Vermilion", - "icon": null, - "language": "EN", - "title": "Sword of Vermilion" - }, - "TCG": { - "code": "0aGuULuB9C2JbHs4", - "description": "TCG Central", - "icon": null, - "language": "EN", - "title": "TCG" - }, - "TheWinggas": { - "code": "0agnV89C8NpXnJbl", - "description": "Winggas for days", - "icon": null, - "language": "EN", - "title": "TheWinggas" - }, - "Team Fortress 2": { - "code": "0aDTtF09VPlNTg0Q", - "description": "Team Fortress 2", - "icon": null, - "language": "EN", - "title": "Team Fortress 2" - }, - "Terraria": { - "code": "0U4zNFIJpDCL7GQs", - "description": "Terraria", - "icon": null, - "language": "EN", - "title": "Terraria" - }, - "The MKW Wiimm-fi Chats": { - "code": "0SdlpwUtv7ozFqXg", - "description": "The MKW Wiimm-fi Chats", - "icon": null, - "language": "EN", - "title": "The MKW Wiimm-fi Chats" - }, - "The Music Bar": { - "code": "0TBYxuT95eWrk9RI", - "description": "The Music Bar", - "icon": null, - "language": "EN", - "title": "The Music Bar" - }, - "The Sims": { - "code": "0YjcYngtdfkBMAxn", - "description": "The Sims", - "icon": null, - "language": "EN", - "title": "The Sims" - }, - "Touhou": { - "code": "0U6KAap475vPWss7", - "description": "Touhou", - "icon": null, - "language": "EN", - "title": "Touhou" - }, - "Tree Of Savior": { - "code": "0QFW9NDirWiV9RZh", - "description": "Tree Of Savior", - "icon": null, - "language": "EN", - "title": "Tree Of Savior" - }, - "Tripulse Community": { - "code": "0RfRA4njAeYbZAdl", - "description": "Tripulse Community", - "icon": null, - "language": "EN", - "title": "Tripulse Community" - }, - "Unofficial Gearbox Discord": { - "code": "0Ut1Gt2sJo6GTFXa", - "description": "Unofficial Gearbox Discord", - "icon": null, - "language": "EN", - "title": "Unofficial Gearbox Discord" - }, - "Unofficial Monstercat": { - "code": "0XzWvesV0VyuKDXW", - "description": "Unofficial Monstercat", - "icon": null, - "language": "EN", - "title": "Unofficial Monstercat" - }, - "Unofficial Nintendo": { - "code": "0VUyTH6zFt3zU3QW", - "description": "Unofficial Nintendo", - "icon": null, - "language": "EN", - "title": "Unofficial Nintendo" - }, - "Unofficial PC Master Race": { - "code": "0VEW0OVOGMjjSmzP", - "description": "Unofficial PC Master Race", - "icon": null, - "language": "EN", - "title": "Unofficial PC Master Race" - }, - "Unreal Tournament 4": { - "code": "0UgVfEa2r2CwcjJg", - "description": "Unreal Tournament 4", - "icon": null, - "language": "EN", - "title": "Unreal Tournament 4" - }, - "Wakfu": { - "code": "0WL9EEf55J99YJJX", - "description": "Wakfu", - "icon": null, - "language": "EN", - "title": "Wakfu" - }, - "Warframe": { - "code": "0Qj6myIvIZgVf5zr", - "description": "Warframe", - "icon": null, - "language": "EN", - "title": "Warframe" - }, - "Wildstar": { - "code": "0TrMr9NtcKujZXLh", - "description": "Wildstar", - "icon": null, - "language": "EN", - "title": "Wildstar" - }, - "[EU]Rocket League": { - "code": "0W70FqxbCli27BfR", - "description": "[EU]Rocket League", - "icon": null, - "language": "EN", - "title": "[EU]Rocket League" - }, - "[UK] FPS/RTS/RPG": { - "code": "0TzxyhJax4nDbITe", - "description": "[UK] FPS/RTS/RPG", - "icon": null, - "language": "EN", - "title": "[UK] FPS/RTS/RPG" - }, - "Game Development": { - "code": "0dlKnYoTVkWaLYOd", - "description": "Game Development", - "icon": null, - "language": "EN", - "title": "Game Development" - }, - "Rivals of Aether": { - "code": "0M4F1870WAbAPTbg", - "description": "Rivals of Aether", - "icon": null, - "language": "EN", - "title": "Rivals of Aether" - } - } -} From 92339a2e221d1806df943c2216026d5edcb8792c Mon Sep 17 00:00:00 2001 From: pohky Date: Sun, 17 Jan 2016 13:03:53 +0100 Subject: [PATCH 19/22] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aed311a5..24e28461 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Add spoilers to your chat, simply add [!s] to your message. Save chatlogs locally.(soon) ## Adding you server to public servers -Edit the [Serverlist](https://github.com/Jiiks/BetterDiscordApp/blob/master/serverlist.json) and submit a pull request. +Edit the [Serverlist](https://github.com/Jiiks/BetterDiscordApp/blob/master/data/serverlist.json) and submit a pull request. ## BetterDiscord Uses the following API's * https://twitchemotes.com/apidocs for Twitch emotes @@ -96,4 +96,4 @@ 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. \ No newline at end of file +THE SOFTWARE. From 791f2b4ddac9b1be50fac00ce32e1553f4c857af Mon Sep 17 00:00:00 2001 From: Kaeloron Date: Sun, 17 Jan 2016 14:24:05 +0100 Subject: [PATCH 20/22] Update serverlist.json --- data/serverlist.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/serverlist.json b/data/serverlist.json index 1dd298f4..f113f10d 100644 --- a/data/serverlist.json +++ b/data/serverlist.json @@ -476,6 +476,13 @@ "language": "EN", "title": "Project Zomboid" }, + "R6:Siege Community": { + "code": "0eyCK2wAW2LziLem", + "description": "Rainbow 6: Siege Community", + "icon": null, + "language": "EN", + "title": "R6: Siege Community" + }, "Ragnarok Online": { "code": "0hr7izZb0BhnyN8L", "description": "Ragnarok Online", From a96bbb64f61ea2e48cbbdd2f210cfafd9da6c6d8 Mon Sep 17 00:00:00 2001 From: Blitzcronk Date: Mon, 18 Jan 2016 03:01:06 +0000 Subject: [PATCH 21/22] Update serverlist.json --- data/serverlist.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/serverlist.json b/data/serverlist.json index f113f10d..adb6c007 100644 --- a/data/serverlist.json +++ b/data/serverlist.json @@ -735,6 +735,13 @@ "language": "EN", "title": "Game Development" }, + "9D Awaken": { + "code": "0lQg5MHMLN5dV7F7", + "description": "9dragons awaken beta group", + "icon": null, + "language": "EN", + "title": "9dragons awaken beta group" + }, "Rivals of Aether": { "code": "0M4F1870WAbAPTbg", "description": "Rivals of Aether", From b1516f301a80235c2a6c62d99ae72baf1c363879 Mon Sep 17 00:00:00 2001 From: Hostail Date: Mon, 18 Jan 2016 16:38:51 +0100 Subject: [PATCH 22/22] Update serverlist.json --- data/serverlist.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/serverlist.json b/data/serverlist.json index adb6c007..40534f9a 100644 --- a/data/serverlist.json +++ b/data/serverlist.json @@ -637,6 +637,13 @@ "language": "EN", "title": "The Sims" }, + "The Division Community": { + "code": "0lh5FmzP4CG785uV", + "description": "The Division Community", + "icon": null, + "language": "EN", + "title": "The Division Community" + }, "Touhou": { "code": "0U6KAap475vPWss7", "description": "Touhou",