Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl

# Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/Vars.java # core/src/mindustry/entities/traits/SaveTrait.java # core/src/mindustry/maps/generators/MapGenerator.java # core/src/mindustry/ui/dialogs/DeployDialog.java # core/src/mindustry/world/blocks/Floor.java # desktop/src/mindustry/desktop/DesktopLauncher.java # gradle.properties
2020-02-04 12:25:18 -05:00
parent 878f570472 2fe3fea7f4
commit be50997f94
82 changed files with 1708 additions and 502 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -249,6 +249,7 @@ project(":core"){
        compile "org.lz4:lz4-java:1.4.1"
        compile arcModule("arc-core")
        compile arcModule("extensions:freetype")
+        compile arcModule("extensions:g3d")
        compile arcModule("extensions:arcnet")
        compile "org.mozilla:rhino:1.7.11"
        if(localArc() && debugged()) compile arcModule("extensions:recorder")