Merge branch 'master' into bassAdditions

# Conflicts:
#	src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java

1 files changed, 9 insertions, 1 deletions

diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
index 8400915ad2..ba9eb00dd9 100644
--- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
@@ -27,8 +27,16 @@ public class projectileEM extends TurretProjectile {
 
     private float massFactor;
 
-    public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStackMap avalableEM) {
+    public projectileEM(World par1World) {
         super(par1World);
+    }
+
+    public projectileEM(World par1World, TurretBase turretBase) {
+        super(par1World, turretBase);
+    }
+
+    public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStackMap avalableEM) {
+        super(par1World, turretBase);
         this.turretBase = turretBase;
         boolean onlyQuarks=true;
         if(avalableEM!=null && avalableEM.hasStacks()) {