From d0e026d59793e9d284827c40c51017c602c1879b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 25 Mar 2019 13:12:55 -0400
Subject: [PATCH] Bugfixes

---
 build.gradle                                         |  2 +-
 core/assets/bundles/bundle.properties                |  2 +-
 .../mindustry/ui/fragments/PlacementFragment.java    |  2 +-
 .../io/anuke/mindustry/world/modules/ItemModule.java |  7 +++++++
 .../Assets.xcassets/AppIcon.appiconset/Contents.json | 12 ++++++------
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3c9b36d043..00ab4778f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects{
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         gdxVersion = '1.9.9'
-        roboVMVersion = '2.3.0'
+        roboVMVersion = '2.3.6'
         arcHash = null
         
         debugged = {
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 16293d6b70..de08f8ddb9 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -409,7 +409,7 @@ bullet.knockback = [stat]{0}[lightgray] knockback
 bullet.freezing = [stat]freezing
 bullet.tarred = [stat]tarred
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
-bullet.reload = [stat]{0}[lightgray]x reload
+bullet.reload = [stat]{0}[lightgray]x fire rate
 
 unit.blocks = blocks
 unit.powersecond = power units/second
diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
index 116d9435d0..253b14c3e4 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
@@ -155,7 +155,7 @@ public class PlacementFragment extends Fragment{
 
                         button.update(() -> { //color unplacable things gray
                             TileEntity core = player.getClosestCore();
-                            Color color = core != null && (core.items.has(block.buildRequirements) || state.rules.infiniteResources) ? Color.WHITE : Color.GRAY;
+                            Color color = core != null && (core.items.has(block.buildRequirements, state.rules.buildCostMultiplier) || state.rules.infiniteResources) ? Color.WHITE : Color.GRAY;
                             button.forEach(elem -> elem.setColor(color));
                             button.setChecked(input.block == block);
                         });
diff --git a/core/src/io/anuke/mindustry/world/modules/ItemModule.java b/core/src/io/anuke/mindustry/world/modules/ItemModule.java
index ece14fbe82..5ff7e1ba40 100644
--- a/core/src/io/anuke/mindustry/world/modules/ItemModule.java
+++ b/core/src/io/anuke/mindustry/world/modules/ItemModule.java
@@ -50,6 +50,13 @@ public class ItemModule extends BlockModule{
         return true;
     }
 
+    public boolean has(ItemStack[] stacks, float multiplier){
+        for(ItemStack stack : stacks){
+            if(!has(stack.item, Math.round(stack.amount * multiplier))) return false;
+        }
+        return true;
+    }
+
     /**
      * Returns true if this entity has at least one of each item in each stack.
      */
diff --git a/ios/data/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/data/Assets.xcassets/AppIcon.appiconset/Contents.json
index fdea475930..3f350d6fd8 100644
--- a/ios/data/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/data/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -15,7 +15,7 @@
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "icon.png",
+      "filename" : "icon-58.png",
       "scale" : "2x"
     },
     {
@@ -33,7 +33,7 @@
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "icon-121.png",
+      "filename" : "icon-120.png",
       "scale" : "3x"
     },
     {
@@ -57,7 +57,7 @@
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "icon-42.png",
+      "filename" : "icon-40.png",
       "scale" : "2x"
     },
     {
@@ -75,19 +75,19 @@
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "icon-41.png",
+      "filename" : "icon-40.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "icon-81.png",
+      "filename" : "icon-80.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "icon-77.png",
+      "filename" : "icon-76.png",
       "scale" : "1x"
     },
     {