Merge remote-tracking branch 'origin/develop' into develop

2019-06-24 22:51:51 -04:00
parent c14995a7e0 091e06e4ff
commit 771c1ee53f
143 changed files with 1310 additions and 1086 deletions
@@ -0,0 +1,64 @@
+[CommandEnabler]
+addguildrole=1
+allowedguildrole=1
+beans=1
+benchmark, bench=1
+bet=1
+bethistory=1
+blur=1
+boop=1
+buildhelp=1
+c++, g++, cplus, cpp=1
+catch=1
+charactercreate=1
+charactereditbio=1
+charactereditname=1
+characterediturl=1
+choose=1
+color, colour=1
+crouton=1
+dbflush=1
+dbstats=1
+defaultdance=1
+derp=1
+e621=1
+eightball, 8ball=1
+fetch=1
+givebeans=1
+guildroleadd=1
+guildroleallowed=1
+guildrolelist=1
+guildrolenotallowed=1
+guildroleremove=1
+help=1
+indicator=1
+info, about=1
+invite=1
+java, jdoodle=1
+leaderboard=1
+map=1
+perish, thenperish=1
+ping=1
+poll=1
+raffleend=1
+rafflejoin=1
+rafflespin=1
+rafflestart=1
+rating=1
+results=1
+role=1
+roll=1
+rpend=1
+rpg=1
+rpstart=1
+searchcharacter=1
+showpoll=1
+shutdown=1
+stats=1
+teey=1
+tony, stark, dontfeelgood, dontfeelsogood=1
+tweet=1
+vote=1
+wolfram=1
+work=1
+yeet=1