Merge branch 'development' into 1.8
Conflicts: src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/util/CableUtils.java
This commit is contained in:
commit
9566e25ba6
1 changed files with 0 additions and 7 deletions
|
@ -923,13 +923,6 @@ public class Mekanism
|
|||
*/
|
||||
public void addEntities()
|
||||
{
|
||||
//Entity IDs
|
||||
EntityRegistry.registerGlobalEntityID(EntityObsidianTNT.class, "ObsidianTNT", EntityRegistry.findGlobalUniqueEntityId());
|
||||
EntityRegistry.registerGlobalEntityID(EntityRobit.class, "Robit", EntityRegistry.findGlobalUniqueEntityId());
|
||||
EntityRegistry.registerGlobalEntityID(EntityBalloon.class, "Balloon", EntityRegistry.findGlobalUniqueEntityId());
|
||||
EntityRegistry.registerGlobalEntityID(EntityBabySkeleton.class, "BabySkeleton", EntityRegistry.findGlobalUniqueEntityId());
|
||||
EntityRegistry.registerGlobalEntityID(EntityFlame.class, "Flame", EntityRegistry.findGlobalUniqueEntityId());
|
||||
|
||||
//Registrations
|
||||
EntityRegistry.registerModEntity(EntityObsidianTNT.class, "ObsidianTNT", 0, this, 64, 5, true);
|
||||
EntityRegistry.registerModEntity(EntityRobit.class, "Robit", 1, this, 64, 2, true);
|
||||
|
|
Loading…
Reference in a new issue