Merge remote-tracking branch 'origin/master'

core/src/mindustry/content/Blocks.java

@@ -2408,7 +2408,7 @@ public class Blocks{
         largeSolarPanel = new SolarGenerator("solar-panel-large"){{
             requirements(Category.power, with(Items.lead, 80, Items.silicon, 110, Items.phaseFabric, 15));
             size = 3;
-            powerProduction = 1.3f;
+            powerProduction = 1.6f;
         }};
 
         thoriumReactor = new NuclearReactor("thorium-reactor"){{

core/src/mindustry/world/blocks/storage/StorageBlock.java

@@ -5,6 +5,7 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.gen.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
@@ -100,6 +101,12 @@ public class StorageBlock extends Block{
             }
         }
 
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.itemCapacity && linkedCore != null) return linkedCore.sense(sensor);
+            return super.sense(sensor);
+        }
+
         @Override
         public void overwrote(Seq<Building> previous){
             //only add prev items when core is not linked