Merge pull request #2 from GTNewHorizons/master

kekztech-0.5.6

110 files changed, 2953 insertions, 3307 deletions

diff --git a/.classpath b/.classpath
deleted file mode 100644
index c5199060a4..0000000000
--- a/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar"/>
-	<classpathentry kind="lib" path="libs/gregtech-5.09.32-dev.jar" sourcepath="libs/gregtech-5.09.32-dev-src.zip"/>
-	<classpathentry kind="lib" path="libs/industrialcraft-2-2.2.828a-experimental-deobf.jar"/>
-	<classpathentry kind="lib" path="libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/Forge"/>
-	<classpathentry kind="lib" path="libs/joml-1.9.18.jar"/>
-	<classpathentry kind="lib" path="libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar"/>
-	<classpathentry kind="lib" path="libs/Thaumcraft-1.7.10-4.2.3.5-deobf.jar" sourcepath="D:/Development/Thaumcraft-1.7.10-4.2.3.5-deobf-src.zip"/>
-	<classpathentry kind="lib" path="libs/TecTech-1.7.10-3.8.1-dev.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.directory b/.directory
deleted file mode 100644
index 5edbbd9d93..0000000000
--- a/.directory
+++ /dev/null
@@ -1,6 +0,0 @@
-[Dolphin]
-Timestamp=2019,10,7,18,33,15
-Version=4
-
-[Settings]
-HiddenFilesShown=true
diff --git a/.gitignore b/.gitignore
index 86f8d9a9d8..4917368216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,72 @@
-# Log file

-*.log

-

-# Package Files #

-*.log.gz

-*.war

-*.nar

-*.ear

-*.zip

-*.tar.gz

-*.rar

-

-# java related things

-hs_err_pid*

-*.class

-/bin/

-

-# gradle related things

-/build/

-/.gradle

-/.gradle/*

-.gradle

-

-# minecraft related things

-options.txt

-usernamecache.json

-/logs/

-/crash-reports/

-/saves/

-/config/

-

-# intellij related things

-.idea/dictionaries/*

-

-# other stuff

-eclipse/

-eclipse/*

-out/

-out/*

-*.iml

-*.ipr

-*.iws

-

+# Log file
+*.log
+
+# Package Files #
+*.log.gz
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# java related things
+hs_err_pid*
+*.class
+/bin/
+
+# gradle related things
+/build/
+/.gradle
+/.gradle/*
+.gradle
+
+# minecraft related things
+options.txt
+usernamecache.json
+/logs/
+/crash-reports/
+/saves/
+/config/
+run/
+
+# intellij related things
+.idea/
+
+# other stuff
+out/
+out/*
+*.ipr
+*.iws
+*.iml
+/classes
+/.classpath
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+*.bat
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d33521af..0000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index e33e6c76d0..0000000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-kekztech
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 919ce1f1f7..0000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a179b..0000000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/dictionaries/kekzd.xml b/.idea/dictionaries/kekzd.xml
deleted file mode 100644
index cfc5daa6e8..0000000000
--- a/.idea/dictionaries/kekzd.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="kekzd">
-    <words>
-      <w>essentia</w>
-      <w>ichor</w>
-      <w>lapotronic</w>
-      <w>thaumium</w>
-    </words>
-  </dictionary>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 84da703c3b..0000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index a881e90a4c..0000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/../Forge/Forge.iml" filepath="$PROJECT_DIR$/../Forge/Forge.iml" />
-      <module fileurl="file://$PROJECT_DIR$/kekztech.iml" filepath="$PROJECT_DIR$/kekztech.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534fb27..0000000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />