From 6400fc71a04ca4be4b08ef10a77e4e22e3641b7a Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sat, 27 Jul 2013 14:26:54 +0100 Subject: [PATCH 1/6] Added extra ignores for git. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 567609b12..8b1ed026b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ build/ +MCServer/MCServer + From b5c38e98fb7627e971712983c581fe7fe5c3c9bd Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 28 Jul 2013 10:25:25 +0100 Subject: [PATCH 2/6] Added some more root .gitignores. --- .gitignore | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8b1ed026b..bde685901 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ build/ MCServer/MCServer - +ChunkWorxSave.ini +doxy/ +Profiling +SymSrv +cloc-ignored.txt +cloc.xml +cloc.xsl From 79a0afd953723543510643e784f44fcb5a1a1040 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 28 Jul 2013 10:26:47 +0100 Subject: [PATCH 3/6] Added a .gitignore for the MCServer directory. --- MCServer/.gitignore | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 MCServer/.gitignore 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 From 74a3de203bd253aabfb37b4aa1757caa00e6f360 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 28 Jul 2013 10:31:10 +0100 Subject: [PATCH 4/6] Added a .gitignore for the VC2008 folder. --- VC2008/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 VC2008/.gitignore 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 From 534cddf4c1157b579eb5c56372ad395a86a78fd4 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 28 Jul 2013 10:32:03 +0100 Subject: [PATCH 5/6] Added a .gitignore for the anvilstats folder. --- Tools/AnvilStats/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Tools/AnvilStats/.gitignore 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 From ea98cc59edff19e9700cbf5796df6a23c381695a Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 28 Jul 2013 12:57:02 +0100 Subject: [PATCH 6/6] Removed Deprecated Option ShowHelpPluginNames: I have no idea what it does, and it is not referenced anywhere else, so... --- MCServer/settings.ini | 3 --- 1 file changed, 3 deletions(-) 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