From e6c4c661999827c97e30307192888aa56436dcdc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 6 Aug 2018 23:32:43 -0400
Subject: [PATCH] All drill costs decreased / Fixed specific sector save errors

---
 build.gradle                                             | 2 +-
 core/src/io/anuke/mindustry/content/Recipes.java         | 8 ++++----
 core/src/io/anuke/mindustry/world/blocks/BuildBlock.java | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index cc3e3674b4..8494966e99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '239e6a5bad'
+        uCoreVersion = '6a727b957e'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java
index 37107a41e4..37c006e9bc 100644
--- a/core/src/io/anuke/mindustry/content/Recipes.java
+++ b/core/src/io/anuke/mindustry/content/Recipes.java
@@ -109,10 +109,10 @@ public class Recipes implements ContentList{
         new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.carbide, 500), new ItemStack(Items.thorium, 350));
 
         //DRILLS, PRODUCERS
-        new Recipe(production, ProductionBlocks.tungstenDrill, new ItemStack(Items.tungsten, 25));
-        new Recipe(production, ProductionBlocks.carbideDrill, new ItemStack(Items.tungsten, 50), new ItemStack(Items.carbide, 60));
-        new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.tungsten, 90), new ItemStack(Items.carbide, 110), new ItemStack(Items.silicon, 70), new ItemStack(Items.titanium, 80));
-        new Recipe(production, ProductionBlocks.blastdrill, new ItemStack(Items.tungsten, 140), new ItemStack(Items.carbide, 180), new ItemStack(Items.silicon, 120), new ItemStack(Items.titanium, 130), new ItemStack(Items.thorium, 130));
+        new Recipe(production, ProductionBlocks.tungstenDrill, new ItemStack(Items.tungsten, 15));
+        new Recipe(production, ProductionBlocks.carbideDrill, new ItemStack(Items.tungsten, 25), new ItemStack(Items.carbide, 40));
+        new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.tungsten, 70), new ItemStack(Items.carbide, 90), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50));
+        new Recipe(production, ProductionBlocks.blastdrill, new ItemStack(Items.tungsten, 130), new ItemStack(Items.carbide, 180), new ItemStack(Items.silicon, 120), new ItemStack(Items.titanium, 100), new ItemStack(Items.thorium, 60));
 
         new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.tungsten, 50), new ItemStack(Items.carbide, 50), new ItemStack(Items.lead, 40));
         new Recipe(production, ProductionBlocks.cultivator, new ItemStack(Items.tungsten, 20), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 20));
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index c110d9dbeb..e75983f95a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -69,7 +69,7 @@ public class BuildBlock extends Block{
     @Override
     public boolean isSolidFor(Tile tile){
         BuildEntity entity = tile.entity();
-        return entity == null || entity.recipe == null || entity.recipe.result.solid || entity.previous.solid;
+        return entity == null || (entity.recipe != null && entity.recipe.result.solid) || entity.previous.solid;
     }
 
     @Override