From 7d2354a65360c5606d464bc3ffd0581137649478 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 15 Dec 2019 16:00:50 -0500
Subject: [PATCH] Mod path resolving fixes

---
 core/src/io/anuke/mindustry/core/FileTree.java      | 2 ++
 core/src/io/anuke/mindustry/input/DesktopInput.java | 2 +-
 core/src/io/anuke/mindustry/mod/Mods.java           | 2 +-
 gradle.properties                                   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/io/anuke/mindustry/core/FileTree.java b/core/src/io/anuke/mindustry/core/FileTree.java
index e6d7e78086..29925b52d7 100644
--- a/core/src/io/anuke/mindustry/core/FileTree.java
+++ b/core/src/io/anuke/mindustry/core/FileTree.java
@@ -17,6 +17,8 @@ public class FileTree implements FileHandleResolver{
     public FileHandle get(String path){
         if(files.containsKey(path)){
             return files.get(path);
+        }else if(files.containsKey("/" + path)){
+            return files.get("/" + path);
         }else{
             return Core.files.internal(path);
         }
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index f9fa0dc7cd..bc9536f360 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -150,7 +150,7 @@ public class DesktopInput extends InputHandler{
         if(state.is(State.menu) || Core.scene.hasDialog()) return;
 
         //zoom camera
-        if(Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((block == null || !block.rotate) && selectRequests.isEmpty()))){
+        if(!Core.scene.hasScroll() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((block == null || !block.rotate) && selectRequests.isEmpty()))){
             renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
         }
 
diff --git a/core/src/io/anuke/mindustry/mod/Mods.java b/core/src/io/anuke/mindustry/mod/Mods.java
index 4ffbf3ecbc..0f837149a8 100644
--- a/core/src/io/anuke/mindustry/mod/Mods.java
+++ b/core/src/io/anuke/mindustry/mod/Mods.java
@@ -663,7 +663,7 @@ public class Mods implements Loadable{
         /** Content with intialization code. */
         public ObjectSet<Content> erroredContent = new ObjectSet<>();
         /** Current state of this mod. */
-        public ModState state = ModState.disabled;
+        public ModState state = ModState.enabled;
 
         public LoadedMod(FileHandle file, FileHandle root, Mod main, ModMeta meta){
             this.root = root;
diff --git a/gradle.properties b/gradle.properties
index f27e1a0348..0b7dba8455 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=3076d3a079f4bf388432c40d8e6c4bf9927dce9a
+archash=60d97c3e52131d2d8be45a1d2f1bfe19c2e343a2