Update Natura to Minecraft 1.12!

progwml6 · Jul 1, 2017 · a1feaa7 · a1feaa7
1 parent 005968d
commit a1feaa7
Show file tree

Hide file tree

Showing 323 changed files with 7,460 additions and 894 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
 
@@ -65,12 +65,11 @@ dependencies {
     deobfCompile "slimeknights.mantle:Mantle:${minecraft_version}-${mantle_version}"
     //deobfCompile "slimeknights:TConstruct:${minecraft_version}-${tconstruct_version}"
 
-    deobfCompile "mcp.mobius.waila:Hwyla:${hwyla_version}_1.11"
-    //deobfCompile "mcp.mobius.waila:Waila:${waila_version}_1.9.4" // ${minecraft_version}" No 1.10 version of waila, must use 1.9.4 version
+    deobfCompile "mcp.mobius.waila:Hwyla:${hwyla_version}_1.12"
 
     deobfCompile "mezz.jei:jei_${minecraft_version}:${jei_version}"
 
-    deobfCompile "MCMultiPart2:MCMultiPart-exp:${mcmultipart_version}"
+    //deobfCompile "MCMultiPart2:MCMultiPart-exp:${mcmultipart_version}"
 }
 
 // sets version to the slimeKnights version format

diff --git a/gradle.properties b/gradle.properties
@@ -1,15 +1,15 @@
 mod_version=4.2.0
 
-minecraft_version=1.11.2
+minecraft_version=1.12
 
-forge_version=13.20.0.2294
-mappings_version=snapshot_20170503
+forge_version=14.21.0.2383
+mappings_version=snapshot_20170628
 
-mantle_version=1.2.0.+
+mantle_version=1.2.0.2
 tconstruct_version=2.7.0.+
 
-jei_version=4.3.4.+
+jei_version=4.7.+
 
-hwyla_version=1.8.13-B26
+hwyla_version=1.8.18-B32
 
 mcmultipart_version=2.0.0_+
diff --git a/src/main/java/com/progwml6/natura/Natura.java b/src/main/java/com/progwml6/natura/Natura.java
@@ -25,7 +25,7 @@
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import slimeknights.mantle.pulsar.control.PulseManager;
 
-@Mod(modid = Natura.modID, name = Natura.modName, version = Natura.modVersion, dependencies = "required-after:forge@[13.20.0.2282,);required-after:mantle@[1.11.2-1.2.0,);", acceptedMinecraftVersions = "[1.11, 1.12)")
+@Mod(modid = Natura.modID, name = Natura.modName, version = Natura.modVersion, dependencies = "required-after:forge@[14.21.1.2387,);required-after:mantle@[1.12-1.2.0,);", acceptedMinecraftVersions = "[1.12, 1.13)")
 public class Natura
 {
     public static final String modID = Util.MODID;