xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Update to forge 1448, close #39

Browse Source
This commit is contained in:
Prototik 2015-06-10 23:38:24 +07:00
parent 995a11ceb9
commit 55d1d750ec
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -89,7 +89,7 @@ def gitInfo(String key) {
} }
ext.mcVersion = "1.7.10" ext.mcVersion = "1.7.10"
ext.forgeVersion = "1420" ext.forgeVersion = "1448"
ext.revision = buildInfo('nextBuildNumber') ext.revision = buildInfo('nextBuildNumber')
version = "${mcVersion}-${forgeVersion}.${revision}" version = "${mcVersion}-${forgeVersion}.${revision}"
println "Updated KCauldron version: ${version}" println "Updated KCauldron version: ${version}"
@ -108,7 +108,7 @@ tasks.packageUniversal {
'Implementation-Vendor' : 'Prototik', 'Implementation-Vendor' : 'Prototik',
'Implementation-Title' : project.name, 'Implementation-Title' : project.name,
'Implementation-Version': project.version, 'Implementation-Version': project.version,
'Forge-Version' : '10.13.3.1420', 'Forge-Version' : '10.13.3.1448',
'Specification-Vendor' : 'Bukkit Team', 'Specification-Vendor' : 'Bukkit Team',
'Specification-Title' : 'Bukkit', 'Specification-Title' : 'Bukkit',
'Specification-Version' : '1.7.10-R0.1-SNAPSHOT' 'Specification-Version' : '1.7.10-R0.1-SNAPSHOT'

2
forge

@ -1 +1 @@
Subproject commit bd6630810f3d4e04438ca77099b5fc19cf474b9c Subproject commit b3a1548cfaac77e9756168a8887270f8181487ad

2
patches/cpw/mods/fml/common/registry/GameData.java.patch
View File

@ -10,7 +10,7 @@
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@@ -1031,4 +1033,56 @@ @@ -1032,4 +1034,56 @@
throw new RuntimeException("WHAT?"); throw new RuntimeException("WHAT?");
} }
} }

4
patches/net/minecraftforge/common/ForgeVersion.java.patch
View File

@ -2,10 +2,10 @@
+++ ../src-work/minecraft/net/minecraftforge/common/ForgeVersion.java +++ ../src-work/minecraft/net/minecraftforge/common/ForgeVersion.java
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
//This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version //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. //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 = 0;
+ public static final int buildVersion = 1420; // Cauldron + public static final int buildVersion = 1448; // Cauldron
private static Status status = PENDING; private static Status status = PENDING;
private static String target = null; private static String target = null;

2
src/main/resources/fmlversion.properties
View File

@ -1,6 +1,6 @@
fmlbuild.major.number=7 fmlbuild.major.number=7
fmlbuild.minor.number=99 fmlbuild.minor.number=99
fmlbuild.revision.number=4 fmlbuild.revision.number=4
fmlbuild.build.number=1420 fmlbuild.build.number=1448
fmlbuild.mcversion=1.7.10 fmlbuild.mcversion=1.7.10
fmlbuild.mcpversion=9.05 fmlbuild.mcpversion=9.05