Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-08-18 12:25:57 -04:00
parent 153b00fe40 cc3f14100d
commit 34674f2297
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/contributors
+1
View File
@@ -147,3 +147,4 @@ KayAyeAre
SMOLKEYS SMOLKEYS
1stvaliduser(SUS) 1stvaliduser(SUS)
GlennFolker GlennFolker
BlackDeluxeCat
core/src/mindustry/world/blocks/power/NuclearReactor.java
+1 -1
View File
@@ -36,7 +36,6 @@ public class NuclearReactor extends PowerGenerator{
/** heat removed per unit of coolant */ /** heat removed per unit of coolant */
public float coolantPower = 0.5f; public float coolantPower = 0.5f;
public float smoothLight;
public Item fuelItem = Items.thorium; public Item fuelItem = Items.thorium;
@@ -82,6 +81,7 @@ public class NuclearReactor extends PowerGenerator{
public class NuclearReactorBuild extends GeneratorBuild{ public class NuclearReactorBuild extends GeneratorBuild{
public float heat; public float heat;
public float flash; public float flash;
public float smoothLight;
@Override @Override
public void updateTile(){ public void updateTile(){
servers_v7.json
+1 -1
View File
@@ -22,7 +22,7 @@
}, },
{ {
"name": "Omega Hub", "name": "Omega Hub",
"address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573", "n1.yeet.ml:6604", "n1.yeet.ml:6605", "n1.yeet.ml:6608"] "address": ["n1.yeet.ml:6572", "n1.yeet.ml:6573", "n1.yeet.ml:6604", "n1.yeet.ml:6605", "n1.yeet.ml:6608","n1.yeet.ml:6599"]
}, },
{ {
"name": "KMWStudios", "name": "KMWStudios",