Merge pull request #38 from koyeall/master

New features & bug fixes.
Stephen001 · Jul 26, 2013 · 25c1ed6 · 25c1ed6
2 parents ece64cd + c1f4ba4
commit 25c1ed6
Show file tree

Hide file tree

Showing 17 changed files with 1,377 additions and 195 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,8 +6,9 @@ changes
 *.log
 *.pid
 *.sav
-data/saves/logs
-data/saves/channels
+*.zip
+*.7z
+data/logs
+data/channels
 packet
-data/saves/tel.net
 Thumbs.db
diff --git a/Chatters.dme b/Chatters.dme
@@ -10,6 +10,10 @@
 #include "rsc\default.dmf"
 #include "src\global.dm"
 #include "src\libraries\ktext\kText.dm"
+#include "src\libraries\log4dm\src\global.dm"
+#include "src\libraries\log4dm\src\struct\Appender.dm"
+#include "src\libraries\log4dm\src\struct\Layout.dm"
+#include "src\libraries\log4dm\src\struct\Logger.dm"
 #include "src\libraries\s_smiley\alphabetics.dm"
 #include "src\libraries\s_smiley\replaceword.dm"
 #include "src\libraries\s_smiley\s_smiley.dm"