Commit Graph

7506 Commits

Author SHA1 Message Date
gazivodag
cec8394ead Merge pull request #114 from farhan1666/olm-cripple-timer
Added olm cripple timer overlay
2019-04-25 09:48:34 -04:00
gazivodag
a1b710e578 Update OlmCrippleTimerPlugin.java 2019-04-25 09:42:02 -04:00
Farhan Ahmad
f402027fce Added olm cripple timer overlay 2019-04-25 14:38:19 +01:00
gazivodag
50b70d519f Merge pull request #111 from Lucwousin/bank_shit
Add options for hiding placeholders and seperators in tag tabs
2019-04-25 09:16:14 -04:00
Lucwousin
e26fc17958 Merge branch 'master' into bank_shit 2019-04-25 14:58:13 +02:00
Lucas
936173b9f8 Add options for hiding placeholders and seperators in tag tabs 2019-04-25 14:53:55 +02:00
Lucas
5b77d64b9c Merge remote-tracking branch 'orig_upstream/master' into ext 2019-04-25 14:52:55 +02:00
gazivodag
e7ffd51b01 Merge pull request #110 from Lucwousin/merge_update
Merge 1.5.21 update from upstream
2019-04-25 08:41:41 -04:00
Lucas
239a477886 Merge remote-tracking branch 'orig_upstream/master' into ext
# Conflicts:
#	runelite-client/pom.xml
2019-04-25 14:32:16 +02:00
Runelite auto updater
6f6832df7e [maven-release-plugin] prepare for next development iteration 2019-04-25 11:41:28 +00:00
Runelite auto updater
c0d1a94bca [maven-release-plugin] prepare release runelite-parent-1.5.21 2019-04-25 11:41:22 +00:00
Abex
864fe9acee Merge pull request #8636 from abextm/cache-code-2019-04-25-rev179
Cache code 2019 04 25 rev179
2019-04-25 05:19:32 -06:00
RuneLite Cache-Code Autoupdater
aba1f90ece Update Scripts to 2019-04-25-rev179 2019-04-25 05:08:48 -06:00
RuneLite Cache-Code Autoupdater
f54ef3def9 Update NPC IDs to 2019-04-25-rev179 2019-04-25 04:36:45 -06:00
RuneLite Cache-Code Autoupdater
de3931aaee Update Object IDs to 2019-04-25-rev179 2019-04-25 04:36:45 -06:00
RuneLite Cache-Code Autoupdater
1241c7f918 Update Item variations to 2019-04-25-rev179 2019-04-25 04:36:45 -06:00
RuneLite Cache-Code Autoupdater
065f17ae6c Update Item IDs to 2019-04-25-rev179 2019-04-25 04:36:45 -06:00
Tomas Slusny
7438416fde Merge pull request #8629 from Hydrox6/clue-easy-kourend-cryptic
clues: Fix Easy Cryptic & Beginner Emote
2019-04-25 10:21:55 +02:00
zeruth
5c6949231e Update ProfilesPlugin.java
Don't want that thing to open on startup. its ridiculous.
2019-04-25 01:44:33 -04:00
zeruth
20989f7dc9 Various
Nothing real interesting. lol.
2019-04-25 01:34:31 -04:00
Ganom
b23a5ba830 Merge pull request #109 from runelite-extended/update
Added Loot Assist Plugin
2019-04-24 22:29:00 -04:00
James Munson
c8afc32a15 Added loot assit 2019-04-24 19:26:55 -07:00
Ganom
d2eb73b67a Merge pull request #108 from Raieverr/master
Plugin Cleanup and Organization
2019-04-24 21:48:46 -04:00
Ganom
3c3bf45198 Adding types for rai 2019-04-24 21:43:48 -04:00
Jonathan
4ba20f55bf Update MenuEntrySwapperConfig.java 2019-04-24 19:27:13 -06:00
Jonathan
b5b1757688 Update MenuEntrySwapperPlugin.java 2019-04-24 19:24:17 -06:00
Jonathan
19156dc6f8 Update MusicCustomizerPlugin.java 2019-04-24 19:23:59 -06:00
Jonathan
b087791e27 Updated Type 2019-04-24 19:23:36 -06:00
Jonathan
ebc2436c56 Update TarnsLairPlugin.java 2019-04-24 19:23:12 -06:00
Jonathan
a7a1a25065 Updated Name 2019-04-24 19:20:16 -06:00
Jonathan
d3497e4b54 Updated Type 2019-04-24 19:19:47 -06:00
Ganom
a5b9582d69 Merge pull request #107 from runelite-extended/revert-91-slayer-estimate-task-completion
Revert "Slayer estimate task completion"
2019-04-24 20:58:15 -04:00
James
33722d2e12 Revert "Slayer estimate task completion" 2019-04-24 17:57:45 -07:00
Ganom
697effc160 Merge pull request #97 from ermalsh/status_Bar_toggle
Status bar toggle when not in combat
2019-04-24 20:41:59 -04:00
Ganom
f8be7498b9 Merge pull request #89 from daviscook477/slayer-highlight-superiors
Slayer highlight superiors
2019-04-24 20:41:47 -04:00
Ganom
8851c98727 Merge pull request #91 from daviscook477/slayer-estimate-task-completion
Slayer estimate task completion
2019-04-24 20:41:33 -04:00
Ganom
91660031fd Merge pull request #92 from Spedwards/feature/level-markers
Feature/level markers
2019-04-24 20:41:18 -04:00
Ganom
78fecb678c Merge pull request #96 from ermalsh/cart_pay_mes
Add: "Pay-fare" to swap "Board" on the Travel Cart
2019-04-24 20:41:02 -04:00
Ganom
1f5a59d5b0 Merge pull request #93 from mpalumbo6/runehacks
Adds mining plugin
2019-04-24 20:40:39 -04:00
Ganom
869f33d8d2 Merge pull request #95 from ermalsh/cannon_notify
Cannon notify
2019-04-24 20:40:25 -04:00
Ganom
663121bb18 Merge pull request #105 from runelite-extended/workpls
Update
2019-04-24 20:36:56 -04:00
James Munson
7f056bee04 Updated plugins 2019-04-24 17:35:45 -07:00
James Munson
e1ffdf24a2 Updated plugins 2019-04-24 17:32:47 -07:00
James Munson
eaacc5ef23 Merge branch 'master' of https://github.com/runelite/runelite into workpls
# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
2019-04-24 17:27:50 -07:00
James Munson
7498ca24c4 Merge branch 'master' of https://github.com/runelite-extended/runelite 2019-04-24 17:22:33 -07:00
James Munson
f6f1a4b7d0 Update 2019-04-24 17:22:23 -07:00
Ganom
f4bcb93b24 Merge pull request #104 from runelite-extended/revert-103-update
Revert "Update"
2019-04-24 20:18:37 -04:00
James
0f1c504653 Revert "Update" 2019-04-24 17:17:06 -07:00
James
36b73d9422 Merge pull request #103 from runelite-extended/update
Update
2019-04-24 17:15:05 -07:00
Ganom
fba19cd041 Update npc aggro plugin 2019-04-24 20:14:07 -04:00