Commit 24570659 authored by nanahira's avatar nanahira

Merge branch 'master' into tcg_random

parents 629d1e2c 633dba53
...@@ -4218,3 +4218,4 @@ plugin_list = fs.readdirSync("./plugins") ...@@ -4218,3 +4218,4 @@ plugin_list = fs.readdirSync("./plugins")
for plugin_filename in plugin_list for plugin_filename in plugin_list
plugin_path = process.cwd() + "/plugins/" + plugin_filename plugin_path = process.cwd() + "/plugins/" + plugin_filename
require(plugin_path) require(plugin_path)
log.info("Plugin loaded:", plugin_filename)
...@@ -5483,6 +5483,7 @@ ...@@ -5483,6 +5483,7 @@
plugin_filename = plugin_list[m]; plugin_filename = plugin_list[m];
plugin_path = process.cwd() + "/plugins/" + plugin_filename; plugin_path = process.cwd() + "/plugins/" + plugin_filename;
require(plugin_path); require(plugin_path);
log.info("Plugin loaded:", plugin_filename);
} }
}).call(this); }).call(this);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment