diff --git a/.gitignore b/.gitignore
index deab865..fcec2ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,46 @@
 .settings
 
 # IDE-based
-PSWGCommon.iml
+*.iws
 out
-.idea
+classes/
+.classpath
+.project
+# IntelliJ-User Specific
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+# IntelliJ-Sensitive or high-churn files
+.idea/**/contentModel.xml
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+# IntelliJ-Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+# IntelliJ-With gradle auto import
+.idea/artifacts
+.idea/compiler.xml
+.idea/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+*.iml
+*.ipr
 
 # Gradle
 bin
 build
 .gradle
-gradle
-gradlew*
+gradle.properties
+/gradle
+/gradlew*
 
 # Holocore
 clientdata