aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/openmodularturrets/entity/projectiles
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-12-17 07:05:06 +0100
committerTechnus <daniel112092@gmail.com>2017-12-17 07:05:06 +0100
commit4da1b57533dbfcd564c9a216dd2796664e65c36c (patch)
treeb86ebb95297aed5910f6a605c02b082953d61026 /src/main/java/openmodularturrets/entity/projectiles
parentd1bbc1bba95492a4256b98dbdaedaa178c204b04 (diff)
parentffce854a03b63f1f37f22261536bf98a4f05d030 (diff)
downloadGT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.tar.gz
GT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.tar.bz2
GT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.zip
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src/main/java/openmodularturrets/entity/projectiles')
-rw-r--r--src/main/java/openmodularturrets/entity/projectiles/projectileEM.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
index ba9eb00dd9..e857d748e7 100644
--- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
@@ -1,10 +1,10 @@
package openmodularturrets.entity.projectiles;
import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack;
-import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap;
-import com.github.technus.tectech.elementalMatter.definitions.dHadronDefinition;
-import com.github.technus.tectech.elementalMatter.definitions.eQuarkDefinition;
+import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.elementalMatter.definitions.complex.hadron.dHadronDefinition;
+import com.github.technus.tectech.elementalMatter.definitions.primitive.eQuarkDefinition;
import gregtech.api.GregTech_API;
import gregtech.api.util.GT_Utility;
import net.minecraft.block.Block;