Merge branch 'master' of github.com:mc-server/MCServer

2013-07-28 14:06:31 +01:00
parent 73f454ef37 18f3595f31
commit bb421c0703
5 changed files with 38 additions and 3 deletions
@@ -1 +1,9 @@
 build/
+MCServer/MCServer
+ChunkWorxSave.ini
+doxy/
+Profiling
+SymSrv
+cloc-ignored.txt
+cloc.xml
+cloc.xsl
@@ -0,0 +1,20 @@
+*.exe
+ChunkWorx.ini
+ChunkWorxSave.ini
+MCServer
+banned.ini
+logs
+players
+whitelist.ini
+world
+API.txt
+*.dat
+schematics
+*.schematic
+*.ilk
+*.pdb
+memdump.xml
+*.grab
+ProtectionAreas.ini
+ProtectionAreas.sqlite
+helgrind.log
@@ -19,9 +19,6 @@ Plugin=Core
 Plugin=ChunkWorx
 Plugin=ChatLog

-[HelpPlugin]
-ShowPluginNames=1
-
 [Monsters]
 AnimalsOn=0
 AnimalSpawnInterval=10
@@ -0,0 +1,5 @@
+.xls
+Statistics.txt
+*.bmp
+Profiling
+*.png
@@ -0,0 +1,5 @@
+Debug/
+Release/
+*.user
+*.ncb
+*.suo