Merge branch 'development' into MorePreferences

2017-03-26 13:52:59 -04:00
parent 9a284bc740 225011f2c1
commit b18bb200a9
58 changed files with 1032 additions and 367 deletions
--- a/eos/effects/tractorbeamcan.py
+++ b/eos/effects/tractorbeamcan.py
@@ -2,8 +2,10 @@
 #
 # Used by:
 # Modules from group: Tractor Beam (4 of 4)
+from eos.config import settings
 type = "active"


 def handler(fit, module, context):
+    print settings['setting1']
    pass