diff --git a/.gitignore b/.gitignore
index 7901c9c210f2026a7bc234386cb3cf3bea6d1616..f3714bf92b33e19c16b4e703577983af379507ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,58 @@
 # Project-specific
-petting_zoo.log
+# none (for now)
 
 # Mac file finder metadata
 .DS_Store
+# Windows file metadata
+._*
+# Thumbnail image caches
+Thumbs.db
+ethumbs.db
 # MS Office temporary file
 ~*
 # Emacs backup file
 *~
 
+# Common
+[Bb]in/
+[Bb]uild/
+[Oo]bj/
+[Oo]ut/
+[Tt]mp/
+[Xx]86/
+[Ii][Aa]32/
+[Xx]64/
+[Xx]86_64/
+[Xx]86-64/
+[Aa]rm
+[Aa]32
+[Tt]32
+[Aa]64
+*.tmp
+*.bak
+*.bk
+*.swp
+
 # Java files
 *.class
 javadoc/
 
-# IntelliJ IDEA files
+# Maven
+target/
+
+# JetBrains (IntelliJ IDEA) files
 .idea/
-out/
 *.iml
 *.iws
 *.ipr
 
 # Eclipse files
-bin/
 .settings/
-.classpath
 .project
+.classpath
+.buildpath
+.loadpath
+local.properties
 
 # Visual Studio / VS Code files
 .vs*/
@@ -58,6 +87,15 @@ bin/
 *.pidb
 *.svclog
 *.scc
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+*.psess
+*.vsp
+*.vspx
 
 # Netbeans files
 nbproject/private/
@@ -73,14 +111,3 @@ nb-configuration.xml
 xcuserdata/
 .build/
 
-# Maven
-target/
-
-# Miscellaneous
-tmp/
-*.tmp
-*.bak
-*.bk
-*.swp
-*.gcno
-