kyle-escobar 8a00bd3ece Merge branch 'master' of https://github.com/runelite/runelite into upstream-4-7-2020 ...

 Conflicts:

	http-api/src/main/java/net/runelite/http/api/item/ItemClient.java

	http-service/src/main/java/net/runelite/http/service/item/ItemController.java

	http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java

	http-service/src/main/java/net/runelite/http/service/item/ItemService.java

	http-service/src/main/java/net/runelite/http/service/item/RSItem.java

	http-service/src/main/java/net/runelite/http/service/item/RSItemResponse.java

	runelite-api/src/main/java/net/runelite/api/ScriptID.java

	runelite-api/src/main/java/net/runelite/api/Varbits.java

	runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java

	runelite-client/src/main/java/net/runelite/client/callback/Hooks.java

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

	runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java

	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java

	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java

	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryConfig.java

	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java

	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java

2020-04-07 21:16:50 -04:00

..

src/main

Merge branch 'master' of https://github.com/runelite/runelite into upstream-4-7-2020

2020-04-07 21:16:50 -04:00

http-api.gradle.kts

gradle: Refactor and update to gradle 6

2019-11-10 01:42:11 +01:00