From 595d48d1b423c4512a3ccc2313e6ce740a1343f1 Mon Sep 17 00:00:00 2001
From: TheYeti <admin@theyeticave.net>
Date: Fri, 3 Feb 2012 12:27:48 -0800
Subject: [PATCH] Update gitignore

---
 .gitignore | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6cd7c5bd5..1dac2252f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,36 @@
-/bin
-/.project
+# Eclipse stuff
 /.classpath
-/target
+/.project
 /.settings
+
+# netbeans
+/nbproject
+
+# we use maven!
+/build.xml
+
+# maven
+/target
+
+# vim
+.*.sw[a-p]
+
+# various other potential build files
+/build
+/bin
+/dist
+/manifest.mf
+
+/world
+
+# Mac filesystem dust
+/.DS_Store
+
+# intellij
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Project Stuff
 /src/main/resources/mcMMO
\ No newline at end of file