diff --git a/.gitignore b/.gitignore index 322e5e1..8d47275 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,5 @@ build # other eclipse -run \ No newline at end of file +run +wiki/ diff --git a/build.gradle b/build.gradle index 1233802..97d121f 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -version = "1.2.0" +version = "1.2.1" group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "tinkersaether" diff --git a/libs/aether_legacy-1.12.2-v3.2.jar b/libs/aether_legacy-1.12.2-v1.4.0.jar similarity index 91% rename from libs/aether_legacy-1.12.2-v3.2.jar rename to libs/aether_legacy-1.12.2-v1.4.0.jar index 6b5eff5..638ef72 100644 Binary files a/libs/aether_legacy-1.12.2-v3.2.jar and b/libs/aether_legacy-1.12.2-v1.4.0.jar differ diff --git a/src/main/java/shnupbups/tinkersaether/TinkersAether.java b/src/main/java/shnupbups/tinkersaether/TinkersAether.java index 593b37d..606186c 100644 --- a/src/main/java/shnupbups/tinkersaether/TinkersAether.java +++ b/src/main/java/shnupbups/tinkersaether/TinkersAether.java @@ -27,11 +27,11 @@ import slimeknights.tconstruct.library.materials.BowMaterialStats; import slimeknights.tconstruct.tools.TinkerMaterials; -@Mod(modid = TinkersAether.modid, name = TinkersAether.name, version = TinkersAether.version, acceptedMinecraftVersions = "[1.12.2]", dependencies = "required-after:mantle;required-after:tconstruct;required-after:aether_legacy@[1.12.2-v3.2,);") +@Mod(modid = TinkersAether.modid, name = TinkersAether.name, version = TinkersAether.version, acceptedMinecraftVersions = "[1.12.2]", dependencies = "required-after:mantle;required-after:tconstruct;required-after:aether_legacy@[1.12.2-v1.4.0,);") public class TinkersAether { public static final String modid = "tinkersaether"; public static final String name = "Tinkers Aether"; - public static final String version = "1.2.0"; + public static final String version = "1.2.1"; @Mod.Instance(modid) public static TinkersAether instance; diff --git a/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java b/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java index fff5ee4..68b596c 100644 --- a/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java +++ b/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java @@ -328,7 +328,7 @@ public void registerRecipes(RegistryEvent.Register event) { } @SubscribeEvent - public static void registerItems(RegistryEvent.Register event) { + public void registerItems(RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); if(TAConfig.valkyrie) { registry.register(valkyrieIngot); @@ -352,7 +352,7 @@ public static void registerItems(RegistryEvent.Register event) { } @SubscribeEvent - public static void registerBlocks(RegistryEvent.Register event) { + public void registerBlocks(RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); if(TAConfig.valkyrie) { valkyrieBlock.setHarvestLevel("pickaxe",3); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 13f65e8..5449dbf 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,9 +3,9 @@ "modid": "tinkersaether", "name": "Tinker's Aether", "description": "Adds Aether materials and stuff to Tinker's Construct.", - "version": "1.2.0", + "version": "1.2.1", "mcversion": "${mcversion}", - "url": "", + "url": "https://minecraft.curseforge.com/projects/tinkers-aether", "updateUrl": "", "authorList": ["Shnupbups"], "credits": "",