Merge remote-tracking branch 'origin/master'

core/assets/contributors

@@ -147,3 +147,4 @@ KayAyeAre
 SMOLKEYS
 1stvaliduser(SUS)
 GlennFolker
+BlackDeluxeCat

core/src/mindustry/world/blocks/power/NuclearReactor.java

@@ -36,7 +36,6 @@ public class NuclearReactor extends PowerGenerator{
 
     /** heat removed per unit of coolant */
     public float coolantPower = 0.5f;
-    public float smoothLight;
 
     public Item fuelItem = Items.thorium;
 
@@ -82,6 +81,7 @@ public class NuclearReactor extends PowerGenerator{
     public class NuclearReactorBuild extends GeneratorBuild{
         public float heat;
         public float flash;
+        public float smoothLight;
 
         @Override
         public void updateTile(){

servers_v7.json

@@ -22,7 +22,7 @@
   },
   {
     "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",