From ef381cb9709aa9b713ee1f8c29a8bc9429426dc3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 25 Jul 2020 10:59:18 -0400
Subject: [PATCH] Fixed #2265

---
 .../mindustry/entities/bullet/ContinuousLaserBulletType.java    | 1 +
 core/src/mindustry/ui/dialogs/ResearchDialog.java               | 2 +-
 gradle.properties                                               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
index ef40d9b95b..1086fcd48e 100644
--- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
+++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
@@ -28,6 +28,7 @@ public class ContinuousLaserBulletType extends BulletType{
         pierce = true;
         hittable = false;
         hitColor = colors[2];
+        collidesTiles = false;
         incendAmount = 1;
         incendSpread = 5;
         incendChance = 0.4f;
diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java
index c455c72612..0defdf1d25 100644
--- a/core/src/mindustry/ui/dialogs/ResearchDialog.java
+++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java
@@ -189,7 +189,7 @@ public class ResearchDialog extends BaseDialog{
     }
 
     boolean locked(TechNode node){
-        return node.content.locked();
+        return node.content.locked() || Structs.contains(node.requirements, i -> i.item.locked());
     }
 
     class LayoutNode extends TreeNode<LayoutNode>{
diff --git a/gradle.properties b/gradle.properties
index cc97bde904..05c6e6b468 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=7cc77789e24f6c78fc61922ab2025d1f2d0df7bf
+archash=5743c603a03f521a841da6104192bcb679d58889