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 @@
+[ObjectBuilderFactory]
+indicator=
+yeet=
+guildroleremove=
+bethistory=
+benchmark, bench=
+rating=
+poll=
+rafflespin=
+charactereditURL=
+bet=
+guildrolelist=
+stats=
+catch=
+color, colour=
+guildroleadd=
+results=
+wolfram=
+givebeans=
+c++, g++, cplus, cpp=
+work=
+rpend=
+java, jdoodle=
+rafflejoin=
+guildroleallowed=
+leaderboard=
+buildHelp=
+dbflush=
+shutdown=
+boop=
+tony, stark, dontfeelgood, dontfeelsogood=tony, stark, dontfeelgood, dontfeelsogood, snap
+role=
+raffleend=
+ping=
+charactereditbio=
+roll=
+blur=
+choose=
+rpstart=
+guildrolenotallowed=guildrolenotallowed, rolelistremove
+derp=
+perish, thenperish=
+teey=
+searchcharacter=
+dbstats=
+rafflestart=
+beans=
+eightball, 8ball=
+vote=
+map=
+info, about=
+e621=
+showpoll=
+rpg=
+defaultdance=
+tweet=
+charactercreate=
+help=
+charactereditname=
+fetch=
+crouton=
+invite=
+
+