Commit Graph
10257 Commits
Author SHA1 Message Date
Kyleeld 182ecfebd3 Update Impling.java 2019-07-30 15:30:03 +01:00
Kyleeld 68d8fdee11 Merge branch 'pr/8' into upstream 2019-07-30 14:44:40 +01:00
Tomas Slusny 19252d5605 Merge pull request #9512 from Darkkgreen/add-infernal-cape-to-clue-step
Add infernal cape and infernal max cape to master clue scroll step
2019-07-30 13:35:56 +02:00
Tomas Slusny e1d83f871e Merge pull request #9513 from Hydrox6/prif-item-mappings
Add item mappings for crystal equipment
2019-07-30 13:34:25 +02:00
Tomas Slusny 6ef1748379 Merge pull request #9509 from Hydrox6/prif-d-pick
cluescrolls: add dragon pick (or) to master emote clue
2019-07-30 11:16:41 +02:00
Hydrox6 49218b2022 Add item mappings for crystal equipment 2019-07-30 09:48:21 +01: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
Gustavo Rodrigues 1a453b48de Added infernal cape and infernal max cape to master clue scroll step 2019-07-29 17:07:34 -03:00
rlw0014 627b9904b5 timer plugin: remove tb timer when opponent dies 2019-07-29 15:43:34 -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
Hydrox6 7e6ff8be2a cluescrolls: add dragon pick (or) to master emote clue 2019-07-29 19:49:54 +01: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
Gamma91 ac8e0dd85d mining plugin: add Prifddinas rocks 2019-07-29 13:45:04 -04:00
TheStonedTurtle f9b6adfd8f timer plugin: add stamina timer for Guantlet potion 2019-07-29 10:36:22 -04:00
TheStonedTurtle f08dfbac17 itemstats: add Guantlet food and potion 2019-07-29 10:36:22 -04:00
AdamandRobbie McLeod 5d884787b7 chat commands: add gauntlet kc
Co-authored-by: Robbie McLeod <rbbi@users.noreply.github.com>
2019-07-29 09:58:00 -04:00
David 879628e876 fishing: Add support for Lava Eeels (#9477) 2019-07-29 15:44:46 +02:00
AdamandAlexsuperfly 908fd89830 timers: add divine potions
Co-authored-by: Alexsuperfly <alexcsumner@gmail.com>
2019-07-29 08:53:48 -04:00
David 9009e187de impling plugin: add Crystal implings 2019-07-29 08:52:37 -04:00
Tomas Slusny c2fe4c6d14 Merge pull request #9486 from Trevor159/clue-fix
hot cold clues: center level 38 wilderness dig location
2019-07-29 14:31:06 +02: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