Merge remote-tracking branch 'origin/master'

Anuken · Nov 15, 2023 · 299457c · 299457c
2 parents 1a763a5 + d138aa7
commit 299457c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
@@ -2408,7 +2408,7 @@ public static void load(){
         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"){{

diff --git a/core/src/mindustry/world/blocks/storage/StorageBlock.java b/core/src/mindustry/world/blocks/storage/StorageBlock.java
@@ -5,6 +5,7 @@
 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 void drawSelect(){
             }
         }
 
+        @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

diff --git a/servers_v7.json b/servers_v7.json
@@ -226,7 +226,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["118.127.8.162:25617", "78.108.218.117:25640", "srv3.godlike.club:27246"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996"]
   },
   {
     "name": "CroCraft Network",