Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry

# Conflicts: # core/src/io/anuke/mindustry/mod/Mods.java
2019-12-15 13:55:30 -05:00
parent 6e16aab794 1c1db3990f
commit 976d0f54b3
62 changed files with 420 additions and 253 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=190918590e8401b1686ecb9167e3c2a9e77eafaa
+archash=3076d3a079f4bf388432c40d8e6c4bf9927dce9a