Zeruth 65c1794c2b Merge remote-tracking branch 'Upstream/master' into runelite-master ...

Still needs mixins fixed. so do not merge yet.

# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java

2019-07-10 20:06:09 -04:00

..

src

Merge remote-tracking branch 'Upstream/master' into runelite-master

2019-07-10 20:06:09 -04:00

pom.xml

Merge remote-tracking branch 'upstream/master' into runelite-master-1

2019-07-05 00:59:14 -04:00