Research system progress

core/src/mindustry/input/DesktopInput.java

@@ -180,7 +180,7 @@ public class DesktopInput extends InputHandler{
         }
 
         if((player.dead() || state.isPaused()) && !ui.chatfrag.shown()){
-            if(!(scene.getKeyboardFocus() instanceof TextField)){
+            if(!(scene.getKeyboardFocus() instanceof TextField) && !scene.hasDialog()){
                 //move camera around
                 float camSpeed = !Core.input.keyDown(Binding.boost) ? 3f : 8f;
                 Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed));

core/src/mindustry/input/InputHandler.java

@@ -651,7 +651,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         if(Core.settings.getBool("blockreplace")){
             lineRequests.each(req -> {
                 Block replace = req.block.getReplacement(req, lineRequests);
-                if(replace.unlockedCur()){
+                if(replace.unlockedNow()){
                     req.block = replace;
                 }
             });