Merge remote-tracking branch 'upstream/master' into master

cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java

@@ -33,6 +33,7 @@ public class ItemDefinition
 	public final int id;
 
 	public String name = "null";
+	public String unknown1;
 
 	public int resizeX = 128;
 	public int resizeY = 128;
@@ -86,6 +87,8 @@ public class ItemDefinition
 	public int femaleOffset;
 	public int femaleHeadModel = -1;
 	public int femaleHeadModel2 = -1;
+	
+	public int category;
 
 	public int notedID = -1;
 	public int notedTemplate = -1;

cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java

@@ -68,6 +68,7 @@ public class ObjectDefinition
 	private int contouredGround = -1;
 	private int supportsItems = -1;
 	private int[] configChangeDest;
+	private int category;
 	private boolean isRotated = false;
 	private int varpID = -1;
 	private int ambientSoundId = -1;

cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java

@@ -92,6 +92,10 @@ public class ItemLoader
 				def.yOffset2d -= 65536;
 			}
 		}
+		else if (opcode == 9)
+		{
+			def.unknown1 = stream.readString();
+		}
 		else if (opcode == 11)
 		{
 			def.stackable = 1;
@@ -192,6 +196,10 @@ public class ItemLoader
 		{
 			def.femaleHeadModel2 = stream.readUnsignedShort();
 		}
+		else if (opcode == 94)
+		{
+			def.category = stream.readUnsignedShort();
+		}
 		else if (opcode == 95)
 		{
 			def.zan2d = stream.readUnsignedShort();

cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java

@@ -194,6 +194,10 @@ public class ObjectLoader
 			def.setRetextureToFind(retextureToFind);
 			def.setTextureToReplace(textureToReplace);
 		}
+		else if (opcode == 61)
+		{
+			def.setCategory(is.readUnsignedShort());
+		}
 		else if (opcode == 62)
 		{
 			def.setRotated(true);