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

Conflicts: loginsecurity.py player.py
2015-08-18 00:24:26 +02:00
parent 6574179872 2310c9143a
commit 0ea6183c03
14 changed files with 521 additions and 85 deletions
--- a/main.py
+++ b/main.py
@@ -38,8 +38,8 @@ shared["load_modules"] = [
    "adminchat",
    # Adds /badge, allows to give players achievements
    "badges",
-   	# Adds a few block placement corrections/mods
-   	"blockplacemods",
+       # Adds a few block placement corrections/mods
+       "blockplacemods",
    # Adds /calc, toggles automatic solving of Math expressions in chat
    "calc",
    # Plugin to locate laggy chunks. /lc <n> lists chunks with more than n entities