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/settings.gradle
+++ b/settings.gradle
@@ -28,6 +28,7 @@ if(!hasProperty("release")){
        use(':Arc:extensions:recorder')
        use(':Arc:extensions:arcnet')
        use(':Arc:extensions:packer')
+        use(':Arc:extensions:g3d')
        use(':Arc:backends')
        use(':Arc:backends:backend-sdl')
        use(':Arc:backends:backend-android')