Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry

# Conflicts: # core/src/io/anuke/mindustry/content/Blocks.java # gradle.properties
2019-12-08 00:15:42 -05:00
parent ccca26d98f 477ebc91bf
commit 268f3cc3c2
98 changed files with 910 additions and 337 deletions
@@ -19,7 +19,7 @@ import io.anuke.arc.util.io.*;
 import io.anuke.arc.util.serialization.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.core.Version;
+import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.desktop.steam.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.mod.Mods.*;