Merge branch 'minecraft-1.10.2' into minecraft-1.11.2

# Conflicts: # gradle.properties
SquidDev-CC · Mar 5, 2017 · b50be1e · b50be1e
2 parents 19649f9 + 8414979
commit b50be1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Mod stuff
 mc_version=1.11.2
 forge_version=13.20.0.2226
-mod_version=1.3.2
+mod_version=1.3.3
 
 # Various libraries
 cc_version=1.80pr0

diff --git a/src/main/java/org/squiddev/cctweaks/core/patch/TileComputerBase_Patch.java b/src/main/java/org/squiddev/cctweaks/core/patch/TileComputerBase_Patch.java
@@ -116,7 +116,7 @@ public NBTTagCompound writeToNBT(NBTTagCompound compound) {
 		return compound;
 	}
 
-	@MergeVisitor.Rename(from = {"writeToNBT", "func_145841_b"})
+	@MergeVisitor.Rename(from = {"writeToNBT", "func_189515_b"})
 	@MergeVisitor.Stub
 	public NBTTagCompound native_writeToNBT(NBTTagCompound compound) {
 		return compound;