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 upstream-4-9-2020

Browse Source 
 Conflicts:
	runelite-client/src/main/java/net/runelite/client/RuneLite.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
	runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
	runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java
	runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java
This commit is contained in:
kyle-escobar
2020-04-09 20:57:21 -04:00
parent b0a6b38536 ec3fbabbe2
commit 3e2da6c375
12 changed files with 151 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http-api/src/main/java/net/runelite/http/api/npc/NpcInfo.java
View File

@@ -29,7 +29,5 @@ import lombok.Data;
@Data
public class NpcInfo
{
private String name;
private int combat;
private int hitpoints;
}