diff --git a/jsons/1.12.2.json b/jsons/1.12.2.json index 77f9b7fd8..fc24955a8 100644 --- a/jsons/1.12.2.json +++ b/jsons/1.12.2.json @@ -1,10 +1,10 @@ { "assetIndex": { "id": "1.12", - "sha1": "3b666765bafa02e84e24b371d9efd7a4d1b6e188", - "size": 169254, - "url": "https://launchermeta.mojang.com/mc/assets/1.12/3b666765bafa02e84e24b371d9efd7a4d1b6e188/1.12.json", - "totalSize": 127589960 + "sha1": "98c430c16a705f18a58a281b27caabf3ef09d40d", + "size": 169253, + "url": "https://launchermeta.mojang.com/mc/assets/1.12/98c430c16a705f18a58a281b27caabf3ef09d40d/1.12.json", + "totalSize": 127453671 }, "assets": "1.12", "downloads": { @@ -266,13 +266,13 @@ } }, { - "name": "com.mojang:realms:1.10.17", + "name": "com.mojang:realms:1.10.18", "downloads": { "artifact": { - "size": 3257404, - "sha1": "e6a623bf93a230b503b0e3ae18c196fcd5aa3299", - "path": "com/mojang/realms/1.10.17/realms-1.10.17.jar", - "url": "https://libraries.minecraft.net/com/mojang/realms/1.10.17/realms-1.10.17.jar" + "size": 3259151, + "sha1": "77a86d7596f49a6b01ad48f1a4a0d6546bc60df5", + "path": "com/mojang/realms/1.10.18/realms-1.10.18.jar", + "url": "https://libraries.minecraft.net/com/mojang/realms/1.10.18/realms-1.10.18.jar" } } }, @@ -719,6 +719,6 @@ "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}", "minimumLauncherVersion": 18, "releaseTime": "2017-09-18T08:39:46+00:00", - "time": "2017-12-07T09:55:13+00:00", + "time": "2018-01-18T09:43:47+00:00", "type": "release" } diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index 01d8f6974..7a98991ce 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -221,7 +221,7 @@ public SoundType func_185467_w() { return this.field_149762_H; -@@ -934,6 +952,1328 @@ +@@ -934,6 +952,1345 @@ { } @@ -1567,7 +1567,7 @@ public static void func_149671_p() { func_176215_a(0, field_176230_a, (new BlockAir()).func_149663_c("air")); -@@ -1230,31 +2570,6 @@ +@@ -1230,31 +2587,6 @@ block15.field_149783_u = flag; } } diff --git a/patches/minecraft/net/minecraft/entity/Entity.java.patch b/patches/minecraft/net/minecraft/entity/Entity.java.patch index 5b336dcdb..2f2c5feab 100644 --- a/patches/minecraft/net/minecraft/entity/Entity.java.patch +++ b/patches/minecraft/net/minecraft/entity/Entity.java.patch @@ -185,7 +185,7 @@ } public boolean func_174816_a(Explosion p_174816_1_, World p_174816_2_, BlockPos p_174816_3_, IBlockState p_174816_4_, float p_174816_5_) -@@ -2901,6 +2929,183 @@ +@@ -2901,6 +2930,183 @@ EnchantmentHelper.func_151385_b(p_174815_1_, p_174815_2_); } diff --git a/src/main/java/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java index 3d4593dd9..61a833a37 100644 --- a/src/main/java/net/minecraftforge/common/ForgeVersion.java +++ b/src/main/java/net/minecraftforge/common/ForgeVersion.java @@ -56,7 +56,7 @@ public class ForgeVersion //This number is incremented every minecraft release, never reset public static final int minorVersion = 23; //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 = 1; + public static final int revisionVersion = 2; //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; // This is the minecraft version we're building for - used in various places in Forge/FML code