summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-07-28 15:06:31 +0200
committerAlexander Harkness <bearbin@gmail.com>2013-07-28 15:06:31 +0200
commitbb421c0703009c0dd38bef575dcbc4463a14e8c9 (patch)
tree4c9a3b15bf84707627808499fc9f7ae2dae1c9d1
parentMerged in the latest version of Core (diff)
parentMerge pull request #13 from tigerw/master (diff)
downloadcuberite-bb421c0703009c0dd38bef575dcbc4463a14e8c9.tar
cuberite-bb421c0703009c0dd38bef575dcbc4463a14e8c9.tar.gz
cuberite-bb421c0703009c0dd38bef575dcbc4463a14e8c9.tar.bz2
cuberite-bb421c0703009c0dd38bef575dcbc4463a14e8c9.tar.lz
cuberite-bb421c0703009c0dd38bef575dcbc4463a14e8c9.tar.xz
cuberite-bb421c0703009c0dd38bef575dcbc4463a14e8c9.tar.zst
cuberite-bb421c0703009c0dd38bef575dcbc4463a14e8c9.zip
-rw-r--r--.gitignore8
-rw-r--r--MCServer/.gitignore20
-rw-r--r--MCServer/settings.ini3
-rw-r--r--Tools/AnvilStats/.gitignore5
-rw-r--r--VC2008/.gitignore5
5 files changed, 38 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 567609b12..bde685901 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,9 @@
build/
+MCServer/MCServer
+ChunkWorxSave.ini
+doxy/
+Profiling
+SymSrv
+cloc-ignored.txt
+cloc.xml
+cloc.xsl
diff --git a/MCServer/.gitignore b/MCServer/.gitignore
new file mode 100644
index 000000000..e455b8cdc
--- /dev/null
+++ b/MCServer/.gitignore
@@ -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
diff --git a/MCServer/settings.ini b/MCServer/settings.ini
index 00b3b1e44..5e6ed4e2b 100644
--- a/MCServer/settings.ini
+++ b/MCServer/settings.ini
@@ -19,9 +19,6 @@ Plugin=Core
Plugin=ChunkWorx
Plugin=ChatLog
-[HelpPlugin]
-ShowPluginNames=1
-
[Monsters]
AnimalsOn=0
AnimalSpawnInterval=10
diff --git a/Tools/AnvilStats/.gitignore b/Tools/AnvilStats/.gitignore
new file mode 100644
index 000000000..4ed720fed
--- /dev/null
+++ b/Tools/AnvilStats/.gitignore
@@ -0,0 +1,5 @@
+.xls
+Statistics.txt
+*.bmp
+Profiling
+*.png
diff --git a/VC2008/.gitignore b/VC2008/.gitignore
new file mode 100644
index 000000000..3b3be3257
--- /dev/null
+++ b/VC2008/.gitignore
@@ -0,0 +1,5 @@
+Debug/
+Release/
+*.user
+*.ncb
+*.suo