Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -2408,7 +2408,7 @@ public class Blocks{
|
|||||||
largeSolarPanel = new SolarGenerator("solar-panel-large"){{
|
largeSolarPanel = new SolarGenerator("solar-panel-large"){{
|
||||||
requirements(Category.power, with(Items.lead, 80, Items.silicon, 110, Items.phaseFabric, 15));
|
requirements(Category.power, with(Items.lead, 80, Items.silicon, 110, Items.phaseFabric, 15));
|
||||||
size = 3;
|
size = 3;
|
||||||
powerProduction = 1.3f;
|
powerProduction = 1.6f;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
thoriumReactor = new NuclearReactor("thorium-reactor"){{
|
thoriumReactor = new NuclearReactor("thorium-reactor"){{
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import arc.struct.*;
|
|||||||
import arc.util.*;
|
import arc.util.*;
|
||||||
import mindustry.content.*;
|
import mindustry.content.*;
|
||||||
import mindustry.gen.*;
|
import mindustry.gen.*;
|
||||||
|
import mindustry.logic.*;
|
||||||
import mindustry.type.*;
|
import mindustry.type.*;
|
||||||
import mindustry.world.*;
|
import mindustry.world.*;
|
||||||
import mindustry.world.blocks.storage.CoreBlock.*;
|
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
|
@Override
|
||||||
public void overwrote(Seq<Building> previous){
|
public void overwrote(Seq<Building> previous){
|
||||||
//only add prev items when core is not linked
|
//only add prev items when core is not linked
|
||||||
|
|||||||
+1
-1
@@ -226,7 +226,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ABCXYZ Community",
|
"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",
|
"name": "CroCraft Network",
|
||||||
|
|||||||
Reference in New Issue
Block a user