ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/runelite/runelite into masterupdate

Browse Source 
# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
This commit is contained in:
James Munson
2019-05-12 17:36:48 -07:00
parent 4a94c2fecb 7d22663756
commit ef790a286e
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
View File

@@ -24,6 +24,7 @@
*/
package net.runelite.client.plugins.antidrag;
import net.runelite.api.Constants;
import java.awt.Color;
import java.awt.event.KeyEvent;
import net.runelite.client.config.Alpha;

1
runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
View File

@@ -31,6 +31,7 @@ import static java.util.Arrays.asList;
import java.util.Collections;
import java.util.List;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
import lombok.Getter;
import net.runelite.api.ItemID;