diff --git a/build.gradle b/build.gradle index 747859b..9fb3123 100644 --- a/build.gradle +++ b/build.gradle @@ -89,7 +89,7 @@ def gitInfo(String key) { } ext.mcVersion = "1.7.10" -ext.forgeVersion = "1420" +ext.forgeVersion = "1448" ext.revision = buildInfo('nextBuildNumber') version = "${mcVersion}-${forgeVersion}.${revision}" println "Updated KCauldron version: ${version}" @@ -108,7 +108,7 @@ tasks.packageUniversal { 'Implementation-Vendor' : 'Prototik', 'Implementation-Title' : project.name, 'Implementation-Version': project.version, - 'Forge-Version' : '10.13.3.1420', + 'Forge-Version' : '10.13.3.1448', 'Specification-Vendor' : 'Bukkit Team', 'Specification-Title' : 'Bukkit', 'Specification-Version' : '1.7.10-R0.1-SNAPSHOT' diff --git a/forge b/forge index bd66308..b3a1548 160000 --- a/forge +++ b/forge @@ -1 +1 @@ -Subproject commit bd6630810f3d4e04438ca77099b5fc19cf474b9c +Subproject commit b3a1548cfaac77e9756168a8887270f8181487ad diff --git a/patches/cpw/mods/fml/common/registry/GameData.java.patch b/patches/cpw/mods/fml/common/registry/GameData.java.patch index df9307c..f9056ee 100644 --- a/patches/cpw/mods/fml/common/registry/GameData.java.patch +++ b/patches/cpw/mods/fml/common/registry/GameData.java.patch @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -@@ -1031,4 +1033,56 @@ +@@ -1032,4 +1034,56 @@ throw new RuntimeException("WHAT?"); } } diff --git a/patches/net/minecraftforge/common/ForgeVersion.java.patch b/patches/net/minecraftforge/common/ForgeVersion.java.patch index f320487..19a5df4 100644 --- a/patches/net/minecraftforge/common/ForgeVersion.java.patch +++ b/patches/net/minecraftforge/common/ForgeVersion.java.patch @@ -2,10 +2,10 @@ +++ ../src-work/minecraft/net/minecraftforge/common/ForgeVersion.java @@ -25,7 +25,7 @@ //This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version - public static final int revisionVersion = 3; + public static final int revisionVersion = 4; //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code. - public static final int buildVersion = 0; -+ public static final int buildVersion = 1420; // Cauldron ++ public static final int buildVersion = 1448; // Cauldron private static Status status = PENDING; private static String target = null; diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties index 9df6c23..f7b5716 100644 --- a/src/main/resources/fmlversion.properties +++ b/src/main/resources/fmlversion.properties @@ -1,6 +1,6 @@ fmlbuild.major.number=7 fmlbuild.minor.number=99 fmlbuild.revision.number=4 -fmlbuild.build.number=1420 +fmlbuild.build.number=1448 fmlbuild.mcversion=1.7.10 fmlbuild.mcpversion=9.05