1 files changed, 24 insertions, 96 deletions
diff --git a/.gitignore b/.gitignore
index 9b4674ed8f..4a0ea1e653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,101 +1,29 @@
-### Windows ###
-
-thumbs.db
-*.db
-
-### Java ###
-
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.war
-*.ear
-*.txt
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-### Eclipse ###
-libs/Galacticraft-Planets-Dev-1.7-3.0.12.503.jar
-libs/GalacticraftCore-Dev-1.7-3.0.12.503.jar
-libs/MicdoodleCore-Dev-1.7-3.0.12.503.jar
-libs/gregtech-5.09.32.22-dev.jar
-*.pydevproject
-.metadata
 .gradle
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-/eclipse
-
-# Eclipse Core
-.project
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# JDT-specific (Eclipse Java Development Tools)
+.settings
+/.idea/
+/run/
+/build/
+/eclipse/
 .classpath
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# TeXlipse plugin
-.texlipse
-
-### Intellij IDEA ###
-
+.project
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+world/
+/out/
 *.iml
 *.ipr
 *.iws
-
-.idea/
-.idea_modules/
-classes/
-
-/out/
-gradlew
-gradlew.bat
-
-# Linux
-*~
-
-
-*.bat
-libs/
-*.dat
-*.dat_old
-*.dat_mcr
-*.lock
-*.mca
-*.gz
-*.log
-*.jar
-*.errored
-/build/
-/run
-
-# Generated sources
-
-src/main/generated
+src/main/resources/mixins.*.json