From e15ed4403ca20e6cdf802c492d2c6d2b174090b4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 10 May 2022 20:38:05 -0400
Subject: [PATCH] Unignore icons.properties

---
 .gitignore                             | 1 -
 core/src/mindustry/content/Blocks.java | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6973b23bca..d0a0666c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,4 +165,3 @@ android/libs/
 
 # ignored due to frequent branch conflicts.
 core/assets/logicids.dat
-core/assets/icons/icons.properties
\ No newline at end of file
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 82766b12cc..38e32c043c 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1626,7 +1626,7 @@ public class Blocks{
 
         reinforcedSurgeWall = new Wall("reinforced-surge-wall"){{
             requirements(Category.defense, with(Items.surgeAlloy, 6, Items.tungsten, 2));
-            health = 230 * wallHealthMultiplier;
+            health = 250 * wallHealthMultiplier;
             lightningChance = 0.05f;
             lightningDamage = 30f;
             armor = 20f;
@@ -1634,7 +1634,7 @@ public class Blocks{
 
         reinforcedSurgeWallLarge = new Wall("reinforced-surge-wall-large"){{
             requirements(Category.defense, ItemStack.mult(reinforcedSurgeWall.requirements, 4));
-            health = 230 * wallHealthMultiplier * 4;
+            health = 250 * wallHealthMultiplier * 4;
             lightningChance = 0.05f;
             lightningDamage = 30f;
             armor = 20f;
@@ -1643,13 +1643,13 @@ public class Blocks{
 
         carbideWall = new Wall("carbide-wall"){{
             requirements(Category.defense, with(Items.thorium, 6, Items.carbide, 6));
-            health = 240 * wallHealthMultiplier;
+            health = 270 * wallHealthMultiplier;
             armor = 16f;
         }};
 
         carbideWallLarge = new Wall("carbide-wall-large"){{
             requirements(Category.defense, ItemStack.mult(carbideWall.requirements, 4));
-            health = 240 * wallHealthMultiplier * 4;
+            health = 270 * wallHealthMultiplier * 4;
             armor = 16f;
             size = 2;
         }};