aboutsummaryrefslogtreecommitdiff
path: root/bot.js
diff options
context:
space:
mode:
authorTrey <trey6979@gmail.com>2018-04-06 13:37:22 -0400
committerTrey <trey6979@gmail.com>2018-04-06 13:37:22 -0400
commit20b860bb2299d4a45aa9899fcab2b340cbe9a0b5 (patch)
tree4022b84287f9df17854947a6f6ae98665719f209 /bot.js
parentb85b686829798f29f5f19fe919ae8807ef9ad69c (diff)
parente39d116465334ce84ee06267e8defb6007dddf22 (diff)
downloadPokeBot-20b860bb2299d4a45aa9899fcab2b340cbe9a0b5.tar.gz
PokeBot-20b860bb2299d4a45aa9899fcab2b340cbe9a0b5.tar.bz2
PokeBot-20b860bb2299d4a45aa9899fcab2b340cbe9a0b5.zip
Merge branch 'master' of https://github.com/PokeWorld/PokeBot
Diffstat (limited to 'bot.js')
-rw-r--r--bot.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/bot.js b/bot.js
index 7e50eec..4962977 100644
--- a/bot.js
+++ b/bot.js
@@ -9,7 +9,11 @@ bot.commands = new Discord.Collection();
bot.aliases = new Discord.Collection();
bot.categories = new Discord.Collection();
bot.queue = new Discord.Collection();
-bot.plugins = { music : require('./Plugins/Music.js') , economy : require('./Plugins/Economy.js'), settings : require('./Plugins/settings.js')};
+bot.plugins = { music : require('./plugins/music.js') ,
+ economy : require('./plugins/Economy.js'),
+ settings : require('./plugins/settings.js'),
+ whitelist: require('./plugins/whitelist.js'),
+ gyms : require('./plugins/gyms.js')};
cmdLoader();
bot.Raven = require('raven');