Ganom b2d7c7cfd0 Merge branch 'master' of https://github.com/runelite/runelite into upstream ...

 Conflicts:

	runelite-api/src/main/java/net/runelite/api/Point.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/idlenotifier/IdleNotifierPlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeType.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java

	runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampConfig.java

	runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java

	runelite-client/src/test/java/net/runelite/client/plugins/woodcutting/WoodcuttingPluginTest.java

2020-03-05 07:31:50 -05:00

..

src

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

2020-03-05 07:31:50 -05:00

runelite-api.gradle.kts

project: create poms when building, and utilize them in bootstrap. (#2259)

2020-01-16 20:40:02 -05:00