Merge remote-tracking branch 'origin/master'

core/src/mindustry/content/Blocks.java

@@ -14,8 +14,6 @@ import mindustry.world.blocks.*;
 import mindustry.world.blocks.campaign.*;
 import mindustry.world.blocks.defense.*;
 import mindustry.world.blocks.defense.turrets.*;
-import mindustry.world.blocks.defense.turrets.PointDefenseTurret;
-import mindustry.world.blocks.defense.turrets.TractorBeamTurret;
 import mindustry.world.blocks.distribution.*;
 import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.experimental.*;

core/src/mindustry/core/NetClient.java

@@ -41,7 +41,7 @@ public class NetClient implements ApplicationListener{
     private boolean connecting = false;
     /** If true, no message will be shown on disconnect. */
     private boolean quiet = false;
-    /** Whether to supress disconnect events completely.*/
+    /** Whether to suppress disconnect events completely.*/
     private boolean quietReset = false;
     /** Counter for data timeout. */
     private float timeoutTime = 0f;
@@ -345,7 +345,7 @@ public class NetClient implements ApplicationListener{
 
         ui.showInfoToast(message, duration);
     }
-    
+
     @Remote(variants = Variant.both)
     public static void warningToast(int unicode, String text){
         if(text == null || Fonts.icon.getData().getGlyph((char)unicode) == null) return;

core/src/mindustry/core/NetServer.java

@@ -422,7 +422,7 @@ public class NetServer implements ApplicationListener{
                         currentlyKicking[0] = session;
                     }
                 }else{
-                    player.sendMessage("[scarlet]No player[orange]'" + args[0] + "'[scarlet] found.");
+                    player.sendMessage("[scarlet]No player [orange]'" + args[0] + "'[scarlet] found.");
                 }
             }
         });

core/src/mindustry/ctype/Content.java

@@ -31,7 +31,7 @@ public abstract class Content implements Comparable<Content>, Disposable{
      */
     public void load(){}
 
-    /** @return whether an error ocurred during mod loading. */
+    /** @return whether an error occurred during mod loading. */
     public boolean hasErrored(){
         return minfo.error != null;
     }

core/src/mindustry/mod/Mods.java

@@ -677,7 +677,7 @@ public class Mods implements Loadable{
         public Seq<String> missingDependencies = new Seq<>();
         /** Script files to run. */
         public Seq<Fi> scripts = new Seq<>();
-        /** Content with intialization code. */
+        /** Content with initialization code. */
         public ObjectSet<Content> erroredContent = new ObjectSet<>();
         /** Current state of this mod. */
         public ModState state = ModState.enabled;
@@ -708,7 +708,7 @@ public class Mods implements Loadable{
             return !erroredContent.isEmpty();
         }
 
-        /** @return whether this mod is supported by the game verison */
+        /** @return whether this mod is supported by the game version */
         public boolean isSupported(){
             if(isOutdated()) return false;
 

core/src/mindustry/world/blocks/defense/ForceProjector.java

@@ -48,6 +48,7 @@ public class ForceProjector extends Block{
         super(name);
         update = true;
         solid = true;
+        group = BlockGroup.projectors;
         hasPower = true;
         hasLiquids = true;
         hasItems = true;

core/src/mindustry/world/blocks/defense/MendProjector.java

@@ -31,6 +31,7 @@ public class MendProjector extends Block{
         super(name);
         solid = true;
         update = true;
+        group = BlockGroup.projectors;
         hasPower = true;
         hasItems = true;
     }

core/src/mindustry/world/blocks/defense/OverdriveProjector.java

@@ -32,6 +32,7 @@ public class OverdriveProjector extends Block{
         super(name);
         solid = true;
         update = true;
+        group = BlockGroup.projectors;
         hasPower = true;
         hasItems = true;
         canOverdrive = false;

core/src/mindustry/world/blocks/distribution/StackConveyor.java

@@ -178,7 +178,6 @@ public class StackConveyor extends Block implements Autotiler{
                 }
                 proxUpdating = false;
             }
-
         }
 
         @Override

core/src/mindustry/world/meta/BlockGroup.java

@@ -1,5 +1,5 @@
 package mindustry.world.meta;
 
 public enum BlockGroup{
-    none, walls, turrets, transportation, power, liquids, drills, storage, units, logic
+    none, walls, projectors, turrets, transportation, power, liquids, drills, storage, units, logic
 }