diff --git a/build.properties b/build.properties index 79323d2a7..d2a61e32c 100644 --- a/build.properties +++ b/build.properties @@ -4,4 +4,4 @@ FMP_version=1.1.2.331 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 CCC_version=1.0.6.39 -mod_version=8.1.7 +mod_version=8.1.8 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 4dbc884d9..ddf7302ab 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -103,7 +103,7 @@ import java.util.*; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "8.1.7", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "8.1.8", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism @@ -129,7 +129,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(8, 1, 7); + public static Version versionNumber = new Version(8, 1, 8); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index d2cf8d033..4d16a344e 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -1,30 +1,5 @@ package mekanism.generators.common; -import io.netty.buffer.ByteBuf; - -import java.io.IOException; - -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.generators; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; -import mekanism.api.infuse.InfuseRegistry; -import mekanism.common.FuelHandler; -import mekanism.common.Mekanism; -import mekanism.common.MekanismBlocks; -import mekanism.common.MekanismItems; -import mekanism.common.Version; -import mekanism.common.Tier.BaseTier; -import mekanism.common.base.IModule; -import mekanism.common.recipe.MekanismRecipe; -import mekanism.common.recipe.RecipeHandler; -import mekanism.common.util.MekanismUtils; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; @@ -38,8 +13,28 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; +import io.netty.buffer.ByteBuf; +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.generators; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.common.*; +import mekanism.common.Tier.BaseTier; +import mekanism.common.base.IModule; +import mekanism.common.recipe.MekanismRecipe; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.util.MekanismUtils; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.oredict.OreDictionary; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.1.7", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +import java.io.IOException; + +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.1.8", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { /** Mekanism Generators Packet Pipeline */ @@ -52,7 +47,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(8, 1, 7); + public static Version versionNumber = new Version(8, 1, 8); @EventHandler public void preInit(FMLPreInitializationEvent event) diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index f9c5af3fd..2fd11244e 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -1,13 +1,20 @@ package mekanism.tools.common; -import java.io.IOException; - +import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import io.netty.buffer.ByteBuf; import mekanism.api.MekanismConfig.tools; import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.recipe.MekanismRecipe; - import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Items; @@ -18,19 +25,10 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import io.netty.buffer.ByteBuf; +import java.io.IOException; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.1.7", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.1.8", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -40,7 +38,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(8, 1, 7); + public static Version versionNumber = new Version(8, 1, 8); //Enums: Tools public static ToolMaterial toolOBSIDIAN;