Merge branch 'liteCraft' into Vulkan

.gitignore

@@ -1,94 +1,49 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# run
-saves/
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-.classpath
-.metadata
-/bin/
-tmp/
-*.tmp
 *.bak
-*.swp
+*.class
-*~.nib
+*.ctxt
-local.properties
+*.ear
-.settings/
-.loadpath
-.recommenders
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-.apt_generated_test/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-.project
-/target/
-
-# idea
-out/
-.idea/
 *.iml
 *.ipr
-*.iws
+*.iws
+*.jar
+*.launch
+*.log
+*.nar
+*.pydevproject
+*.rar
+*.swp
+*.tar.gz
+*.tmp
+*.war
+*.zip
+*~.nib
+.autotools
+.buildpath
+.cache-main
+.classpath
+.cproject
+.factorypath
+.loadpath
+.metadata
+.project
+.recommenders
+.scala_dependencies
+.springBeans
+.target
+.tern-project
+.texlipse
+.worksheet
+/.apt_generated/
+/.apt_generated_test/
+/.externalToolBuilders/
+/.idea/
+/.mtj.tmp/
+/.recommenders/
+/.settings/
+/bin/
+/out/
+/saves/
+/target/
+/tmp/
+hs_err_pid*
+local.properties