diff --git a/.gitignore b/.gitignore
index 37d4b3181..ac72da34e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,12 +22,17 @@ external_resource_packs.zip
 
 # IntelliJ
 workspace.xml
-.idea/*
 
 # Temporary files
 .tmp*
 tmp_*
+## Microsoft Office
 ~$*
+## Generic temp files in Linux
+*~
+## Vim temp files
+*.swp
+*.swo
 
 # Eclipse MAT heap files
 *.hprof
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c3fc748c8..df5a15f37 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8.0_242" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file