ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
10,248 Commits 1 Branch 0 Tags
19bf6ed0836d482cc883ec9fd163e8a1170118d6
Commit Graph

10248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PKLite
19bf6ed083 Merge branch 'master' of https://github.com/runelite-extended/runelite 2019-07-30 06:40:17 -04:00
Crystalknoct
785479c648 skillcalculator: added newer bones (#1193) 
* criticalitem: added bones

Added Wyrm, Drake, Hydra bones to calcs

* skillcalculator: added new bones

Added wyrm, drake, hydra bones
 2019-07-29 20:55:29 -04:00
Tyler Bochard
93703a4353 Merge pull request #1189 from runelite-extended/private-server 
private-server: enforce osrs key if rs!=RSPS
 2019-07-29 15:10:08 -04:00
Zeruth
64f1b607a5 private-server: enforce osrs key if rs!=RSPS 2019-07-29 14:57:17 -04:00
Tyler Bochard
79fbae51d2 Merge pull request #1183 from tomcylke/local-injected-fix 
Gradle: Remove --local-injected
 2019-07-29 14:28:33 -04:00
PKLite
83208d4add Merge branch 'master' of https://github.com/runelite-extended/runelite 2019-07-29 14:15:24 -04:00
Thomas Cylke
2b92c9b938 Remove --local-injected from the run config 
Title
 2019-07-29 07:02:52 -04:00
Tyler Bochard
3e91376a47 Merge pull request #1181 from Kyleeld/quest 
upstream: merge
 2019-07-29 05:05:15 -04:00
Kyleeld
8683e26be1 Delete update.bat 2019-07-29 09:57:51 +01:00
Kyleeld
2b3d2cb377 Merge branch 'master' into quest 2019-07-29 09:57:25 +01:00
Kyle Eldridge
ef3733c042 Merge branch 'pr/7' into quest 2019-07-29 09:54:56 +01:00
Tyler Bochard
b0e70aced1 Update README.md 2019-07-29 04:52:02 -04:00
Kyle Eldridge
6866b38804 update quest items 2019-07-29 09:48:18 +01:00
Tyler Bochard
8600782c56 Update README.md 2019-07-29 04:47:41 -04:00
Tyler Bochard
e15436469f Merge pull request #1180 from runelite-extended/mournings-end 
runelite-api: mournings end I/II refactor
 2019-07-29 04:44:36 -04:00
Zeruth
54309d5482 runelite-api: mournings end I/II refactor 2019-07-29 04:43:14 -04:00
Tyler Bochard
ca9f7d6ce2 Merge pull request #1179 from runelite-extended/private-server 
runelite-client: restore private server support
 2019-07-29 04:40:58 -04:00
Crystalknoct
5b3cba79f9 npccontainer: Updated some Attackstyles (#1178) 
Armadyl ranged, and magic are reversed, dagannoth rex was set to attackstyle magic changed to melee
 2019-07-29 09:38:28 +01:00
Tyler Bochard
7189c64b27 Merge pull request #1175 from runelite-extended/upstream-merge 
project: Upstream merge
 2019-07-29 04:36:12 -04:00
Zeruth
e2ce3eb10f runelite-client: restore private server support, remove deprecated arguments 2019-07-29 04:31:36 -04:00
AttackOfTheMoons
e5d9dd4ceb slayer: Fix NPE when getting unsupported task (#9490) 2019-07-29 09:59:12 +02:00
Owain van Brakel
9bbf160bab Apply suggestions from code review 
upstream: Merge suggested changes
 2019-07-29 09:13:57 +02:00
Zeruth
e2f3060410 runeliteplus: fix wildcard imports 2019-07-29 02:02:08 -04:00
Zeruth
223ce8c92f small fixes 2019-07-29 01:53:03 -04:00
Zeruth
2e2c25843d Merge remote-tracking branch 'Upstream/master' 
# Conflicts:
#	http-api/src/main/java/net/runelite/http/api/ws/messages/party/PartyChatMessage.java
#	runelite-api/src/main/java/net/runelite/api/Quest.java
#	runelite-client/src/main/java/net/runelite/client/RuneLite.java
#	runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java
#	runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
#	runelite-client/src/main/java/net/runelite/client/ws/PartyService.java
#	runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
 2019-07-29 01:44:57 -04:00
Tyler Bochard
415248ae61 Merge pull request #1174 from runelite-extended/update 
runeliteplus: update / bootstrap
 2019-07-28 21:30:27 -04:00
Zeruth
aa35e67872 runeliteplus: update 2019-07-28 21:27:51 -04:00
Tyler Bochard
968d7e40bc Merge pull request #1172 from runelite-extended/discord-rpc 
discord: fix init
 2019-07-28 18:06:04 -04:00
Zeruth
fa272134ff discord: fix init 2019-07-28 18:03:10 -04:00
Tyler Bochard
a3ee9551c5 Merge pull request #1155 from Owain94/eventbus-double-sub 
eventbus: event interface & prevent double subscribing
 2019-07-28 17:44:46 -04:00
Tyler Bochard
effc9217a7 Merge pull request #1166 from Lucwousin/yar-yeet-dab 
gradle: injected-client things
 2019-07-28 17:43:51 -04:00
Tyler Bochard
75d091ee2c Merge pull request #1171 from runelite-extended/groundmarkers 
Fix Ground Marker
 2019-07-28 17:42:49 -04:00
Kyleeld
ef4074c6f9 Impling: crystal impling (#1139) 
* Impling: add crystal impling

Impling: add crystal impling

* Update Impling.java

* Update ImplingsConfig.java

* Update ImplingsPlugin.java

* Update Impling.java

* Update Impling.java
 2019-07-28 22:41:10 +01:00
Zeruth
cfc7456f00 groundmarker: fix 2019-07-28 17:36:36 -04:00
Tyler Bochard
4e0c4ccf77 Merge pull request #1168 from Owain94/file-handlers 
gradle: Close URLClassLoader to prevent leaking file locks
 2019-07-28 16:37:23 -04:00
Tyler Bochard
ea8306f783 Merge pull request #1169 from runelite-extended/bootstrap 
Update Bootstrap
 2019-07-28 16:36:45 -04:00
Zeruth
38748f3141 bootstrap: update to work with new deps 2019-07-28 16:31:52 -04:00
Owain van Brakel
f55d36414e gradle: Close URLClassLoader to prevent leaking file locks 2019-07-28 22:16:53 +02:00
ST0NEWALL
3fa53273fe worldlocation: Fix areas (#1163) 
* fix areas

Signed-off-by: PKLite <stonewall@pklite.xyz>

* fix areas again

Signed-off-by: PKLite <stonewall@pklite.xyz>
 2019-07-28 11:37:35 -04:00
Lucwousin
8bdb204019 gradle: injected-client things 
Move injector goal to injected-client(ish)
Keep injected-client classes in the correct package
Remove placeholder class/duplicate vanilla jar
 2019-07-28 14:00:18 +02:00
William Collishaw
529570d91a raids: Switch from Pattern splitting to Text.fromCSV (#9422) 2019-07-28 12:55:13 +02:00
Adam Witkowski
ac27c859a5 itemstats: Add support for Tai Bwo Wannai food (spiders on stick) (#9485) 2019-07-28 12:52:27 +02:00
AttackOfTheMoons
9469f25570 examine: Add support for examining Seed Vault items (#9431) 2019-07-28 12:50:37 +02:00
ST0NEWALL
81e99a2d9b loottracker: fix tob not being recorded 
* Hopefully fixes tob loot not showing. haven't been able to test it because me no good pvm

Signed-off-by: PKLite <stonewall@pklite.xyz>

* take out old import

Signed-off-by: PKLite <stonewall@pklite.xyz>

* implement Blue's change

* Update LootTrackerPlugin.java

* add missing import

Signed-off-by: PKLite <stonewall@pklite.xyz>
 2019-07-28 10:31:51 +01:00
Ganom
0023196ca1 aoewarnings: Update, refactor, and clean up. (#1164) 
* aoewarnings: Update, refactor, and clean up.

* Various Code Style Fixes
 2019-07-28 09:36:56 +01:00
Ganom
22e15fc3d2 resources: Wiki scrape latest ItemStats/NpcStats (#1165) 2019-07-28 09:02:53 +01:00
SebastiaanVanspauwen
bbf6552495 chat commands: add Prifddinas agility course kc and pb 2019-07-27 23:16:59 -04:00
Adam
633b7de527 Merge pull request #9472 from Alexsuperfly/sote-world-map-updates 
Prifddinas world map icon updates
 2019-07-27 23:15:36 -04:00
Alexsuperfly
12f52e72fa bosstimers: add Zalcano 2019-07-27 22:30:35 -04:00
Adam
3b33f3f7fa Merge pull request #9465 from abextm/prif-farm 
timetracking: Support Prifddinas patches
 2019-07-27 22:16:31 -04:00