Merge branch '1.5'

# Conflicts: # src/com/ryandw11/structure/listener/ChunkLoad.java # src/plugin.yml
ryandw11 · Jun 29, 2020 · 60177a9 · 60177a9
2 parents a62e491 + 30f2bec
commit 60177a9
Show file tree

Hide file tree

Showing 31 changed files with 2,170 additions and 1,201 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,10 +10,15 @@
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
-#Eclipse personal files
+# Eclipse personal files
 .classpath
 .project
 
+# Intellij files
+*.iml
+/.idea/
+/out/
+
 # Package Files #
 *.jar
 *.war

diff --git a/config.yml b/config.yml