Merge branch 'dev' of github.com:RedstonerServer/redstoner-utils into dev

2015-01-06 23:05:43 +01:00
parent 91d4a1e186 1cb1b96755
commit 4eed09946a
2 changed files with 3 additions and 2 deletions
--- a/calc.py
+++ b/calc.py
@@ -56,7 +56,7 @@ def on_calc_command(sender, args):
    msg(sender, "&cYou are not a player!" % sender)
    return True

-  toggle(sender, calc_users, name = "Calc")
+  toggle(sender, calc_users)
  save_json_file("calc", calc_users)

  status = "enabled" if uid(sender) in calc_users  else "disabled"
--- a/main.py
+++ b/main.py
@@ -47,7 +47,8 @@ shared["load_modules"] = [
  "abot",
  "forcefield",
  "damnspam",
-  "check"
+  "check",
+  "imout"
 ]
 shared["modules"] = {}
 for module in shared["load_modules"]: