Lucas 239a477886 Merge remote-tracking branch 'orig_upstream/master' into ext ...

# Conflicts:
#	runelite-client/pom.xml

2019-04-25 14:32:16 +02:00

..

net/runelite/client

Revert "Slayer estimate task completion"

2019-04-24 17:57:45 -07:00

skill_icons

Reduce world map icon sizes (#5086)

2018-08-24 14:55:35 +02:00

skill_icons_small

Reduce world map icon sizes (#5086)

2018-08-24 14:55:35 +02:00

util

Reduce world map icon sizes (#5086)

2018-08-24 14:55:35 +02:00

item_variations.json

Update Item variations to 2019-04-25-rev179

2019-04-25 04:36:45 -06:00

logback.xml

runelite-client: Write logs to log directory instead of cwd

2018-12-12 04:26:23 -07:00

npc_health.json

Add Karuulm slayer monsters to the NPC health list

2019-04-02 08:12:16 -04:00

runelite_transparent.png

Adds splash screen (#29)

2019-04-21 07:41:48 +01:00

runelite.png

Reduce world map icon sizes (#5086)

2018-08-24 14:55:35 +02:00

runeliteplus_transparent.png

Adds splash screen (#29)

2019-04-21 07:41:48 +01:00

runeliteplus.png

Adds splash screen (#29)

2019-04-21 07:41:48 +01:00