Merge remote-tracking branch 'runelite/master'

2020-09-08 18:36:30 +01:00
parent b544904ec8 00fc1314f7
commit 06006bf7ae
38 changed files with 525 additions and 930 deletions
--- a/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java
@@ -340,10 +340,8 @@ public class ItemVariationMappingTest
 	}};

 	@Test
-	public void testMappedNames() throws Exception
+	public void testMappedNames()
 	{
-		ItemVariationMapping.load();
-
 		ITEMS_MAP.forEach((key, value) ->
 			assertEquals(value, (Integer) ItemVariationMapping.map(key)));
 	}