diff --git a/build.gradle b/build.gradle index ae6a7b15a..c7b593361 100644 --- a/build.gradle +++ b/build.gradle @@ -132,6 +132,7 @@ task toolsJar(type: Jar) { from zipTree(jar.outputs.getFiles().getSingleFile()).matching { include 'mekanism/tools/**' + exclude 'mcmod.info' } } @@ -145,6 +146,7 @@ task generatorsJar(type: Jar) { from zipTree(jar.outputs.getFiles().getSingleFile()).matching { include 'mekanism/generators/**' + exclude 'mcmod.info' } } diff --git a/build.properties b/build.properties index cfc0720a6..6151e4dfc 100644 --- a/build.properties +++ b/build.properties @@ -4,4 +4,4 @@ FMP_version=1.2.0.347 CCLIB_version=1.1.3.141 NEI_version=1.0.4.101 CCC_version=1.0.6.39 -mod_version=9.10.10 +mod_version=9.10.11 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index b8c49f744..d4be4b516 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -142,7 +142,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "9.10.10", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "9.10.11", 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 @@ -168,7 +168,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(9, 10, 10); + public static Version versionNumber = new Version(9, 10, 11); /** 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 fd5307384..3fc1d2c6e 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -44,7 +44,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.10.10", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.10.11", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") @@ -54,7 +54,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(9, 10, 10); + public static Version versionNumber = new Version(9, 10, 11); public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine"); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 8c82fb87e..4b7b4cbe3 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -29,7 +29,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.10.10", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.10.11", 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") @@ -39,7 +39,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(9, 10, 10); + public static Version versionNumber = new Version(9, 10, 11); //Enums: Tools public static ToolMaterial toolOBSIDIAN; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 9ca7a20a1..9b2640248 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,8 +3,8 @@ "modid": "Mekanism", "name": "Mekanism Community Edition", "description": "Energy, Armor, Tools, Weapons, Machines, Magic.", - "version": "9.10.10", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mc_version}", "updateUrl": "", "authorList": ["aidancbrady"], "credits": "Thanks to everyone who has contributed to this ongoing project.", @@ -16,8 +16,8 @@ "modid": "MekanismGenerators", "name": "MekanismGenerators Community Edition", "description": "Generators module of Mekanism.", - "version": "9.10.10", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mc_version}", "updateUrl": "", "authorList": ["aidancbrady"], "credits": "Thanks to everyone who has contributed to this ongoing project.", @@ -29,8 +29,8 @@ "modid": "MekanismTools", "name": "MekanismTools Community Edition", "description": "Tools module for Mekanism.", - "version": "9.10.10", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mc_version}", "updateUrl": "", "authorList": ["aidancbrady"], "credits": "Thanks to everyone who has contributed to this ongoing project.",