forked from xjboss/KCauldronX
Update to Forge 1420
This commit is contained in:
parent
0edf4ecfae
commit
9973a9f8e8
@ -65,10 +65,10 @@ def retrieveGitBranch() {
|
||||
}
|
||||
|
||||
ext.mcVersion = "1.7.10"
|
||||
ext.forgeVersion = "1408"
|
||||
ext.forgeVersion = "1420"
|
||||
ext.revision = retrieveBuildNumber()
|
||||
version = "${mcVersion}-${forgeVersion}.${revision}"
|
||||
println " # Updated KCauldron version: ${version}"
|
||||
println "Updated KCauldron version: ${version}"
|
||||
|
||||
launch4j {
|
||||
jreMinVersion = '1.6.0'
|
||||
@ -83,7 +83,7 @@ tasks.packageUniversal {
|
||||
'Implementation-Vendor': 'Prototik',
|
||||
'Implementationk-Title': 'KCauldron',
|
||||
'Implementation-Version': 'KCauldron-'+project.version,
|
||||
'Forge-Version': '10.13.3.1408',
|
||||
'Forge-Version': '10.13.3.1420',
|
||||
'Specification-Vendor': 'Bukkit Team',
|
||||
'Specification-Title': 'Bukkit',
|
||||
'Specification-Version': '1.7.10-R0.1-SNAPSHOT'
|
||||
|
2
forge
2
forge
@ -1 +1 @@
|
||||
Subproject commit 06398fa25990b458ee3183e0cf9066a3a75f221e
|
||||
Subproject commit bd6630810f3d4e04438ca77099b5fc19cf474b9c
|
@ -8,7 +8,7 @@
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -61,6 +62,11 @@
|
||||
@@ -67,6 +68,11 @@
|
||||
private static List<IFuelHandler> fuelHandlers = Lists.newArrayList();
|
||||
private static List<IWorldGenerator> sortedGeneratorList;
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
/**
|
||||
* Register a world generator - something that inserts new block types into the world
|
||||
*
|
||||
@@ -70,12 +76,18 @@
|
||||
@@ -76,12 +82,18 @@
|
||||
*/
|
||||
public static void registerWorldGenerator(IWorldGenerator generator, int modGenerationWeight)
|
||||
{
|
||||
@ -39,7 +39,7 @@
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -100,11 +112,27 @@
|
||||
@@ -106,11 +118,27 @@
|
||||
long zSeed = fmlRandom.nextLong() >> 2 + 1L;
|
||||
long chunkSeed = (xSeed * chunkX + zSeed * chunkZ) ^ worldSeed;
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
public static final int revisionVersion = 3;
|
||||
//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 = 1408; // Cauldron
|
||||
+ public static final int buildVersion = 1420; // Cauldron
|
||||
|
||||
private static Status status = PENDING;
|
||||
private static String target = null;
|
||||
|
@ -1,6 +1,6 @@
|
||||
fmlbuild.major.number=7
|
||||
fmlbuild.minor.number=99
|
||||
fmlbuild.revision.number=4
|
||||
fmlbuild.build.number=1408
|
||||
fmlbuild.build.number=1420
|
||||
fmlbuild.mcversion=1.7.10
|
||||
fmlbuild.mcpversion=9.05
|
||||
|
Loading…
Reference in New Issue
Block a user