Commit Graph

749 Commits

Author SHA1 Message Date
ThatGamerBlue
7b261b0cc7 Merge remote-tracking branch 'runelite/master' into 23072020
# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpots.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FaloTheBardClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/dpscounter/DpsCounterPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
#	runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java
#	runelite-script-assembler-plugin/pom.xml
2020-07-23 15:07:56 +01:00
Runelite auto updater
b5abb09152 Bump for 1.6.24-SNAPSHOT 2020-07-23 11:20:33 +00:00
Runelite auto updater
0bd97e19a3 Release 1.6.23 2020-07-23 11:20:24 +00:00
Cyborger1
4362adb876 itemstats: check for two handed interactions (#12168) 2020-07-21 02:13:11 -06:00
Owain van Brakel
d2a55e2a9d Merge remote-tracking branch 'origin/master' 2020-07-17 07:09:36 +02:00
OpenOSRS
402c4c2eb5 project: Update gradle dependencies 2020-07-17 00:03:51 +00:00
ThatGamerBlue
ea056d0604 Merge remote-tracking branch 'runelite/master' into rl-upstream-16072020
# Conflicts:
#	cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java
#	http-api/pom.xml
#	http-api/src/main/java/net/runelite/http/api/account/AccountClient.java
#	http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java
#	http-api/src/main/java/net/runelite/http/api/item/ItemClient.java
#	http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java
#	http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java
#	http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/EnumID.java
#	runelite-api/src/main/java/net/runelite/api/IndexDataBase.java
#	runelite-api/src/main/java/net/runelite/api/ItemComposition.java
#	runelite-api/src/main/java/net/runelite/api/PlayerComposition.java
#	runelite-api/src/main/java/net/runelite/api/ScriptID.java
#	runelite-api/src/main/java/net/runelite/api/VarbitComposition.java
#	runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
#	runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java
#	runelite-client/src/main/java/net/runelite/client/RuneLite.java
#	runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
#	runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
#	runelite-client/src/main/java/net/runelite/client/SessionClient.java
#	runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
#	runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
#	runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
#	runelite-client/src/main/java/net/runelite/client/game/WorldService.java
#	runelite-client/src/main/java/net/runelite/client/input/KeyListener.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
#	runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java
#	runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
#	runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RoomType.java
#	runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
#	runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java
#	runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
#	runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json
#	runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
#	runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java
2020-07-16 18:32:30 +01:00
Runelite auto updater
7f354ca5e4 Bump for 1.6.23-SNAPSHOT 2020-07-16 16:24:47 +00:00
Runelite auto updater
bd190d87ba Release 1.6.22 2020-07-16 16:24:36 +00:00
ThatGamerBlue
236215b616 client: re-add xtea keys 2020-07-13 00:43:52 +01:00
Adam
47c375cb03 client: use guice provided http client everywhere 2020-06-27 23:21:28 -04:00
Runelite auto updater
f7a233b90d Bump for 1.6.22-SNAPSHOT 2020-06-25 11:47:39 +00:00
Runelite auto updater
9f97c5a54c Release 1.6.21 2020-06-25 11:47:31 +00:00
Runelite auto updater
90729281a1 Bump for 1.6.21-SNAPSHOT 2020-06-18 11:23:53 +00:00
Runelite auto updater
b5ca6a9d7f Release 1.6.20 2020-06-18 11:23:44 +00:00
Runelite auto updater
0b3abecbc8 Bump for 1.6.20-SNAPSHOT 2020-06-12 15:50:43 +00:00
Runelite auto updater
74b0e7b27d Release 1.6.19 2020-06-12 15:50:33 +00:00
Owain van Brakel
ae9de3928f Merge remote-tracking branch 'runelite/master' 2020-06-12 11:47:08 +02:00
Adam
a1122ba141 ge: fix computing bought/sold amount
Use the total spent price instead of the delta spent price, as it is
being divided by the total quantity
2020-06-06 10:35:20 -04:00
Owain van Brakel
8627076955 Merge remote-tracking branch 'runelite/master' 2020-06-04 16:48:25 +02:00
Runelite auto updater
b9e660a939 Bump for 1.6.19-SNAPSHOT 2020-06-04 14:44:46 +00:00
Runelite auto updater
9de4189632 Release 1.6.18 2020-06-04 14:44:35 +00:00
Adam
2dd6fa41e9 ge: include both delta qty and qty 2020-06-04 10:14:01 -04:00
Owain van Brakel
5b45c860ec Merge remote-tracking branch 'runelite/master' 2020-06-04 11:33:43 +02:00
Adam
a803ba567b ge: include slot id 2020-06-03 20:44:45 -04:00
Owain van Brakel
9bd0d91b4d Merge remote-tracking branch 'runelite/master' 2020-06-03 07:07:04 +02:00
Adam
c67378c09e ge plugin: include if trade is synced on login 2020-06-01 09:56:09 -04:00
Adam
83756e8722 ge: submit spent price instead of computed per-item price 2020-06-01 09:56:09 -04:00
Owain van Brakel
3c370f992a Merge remote-tracking branch 'runelite/master' 2020-05-31 05:35:48 +02:00
Adam
6a2e15643f ge plugin: include world type in trades 2020-05-30 20:06:33 -04:00
Adam
17d6921a4a ge plugin: submit partially completed trades 2020-05-30 19:26:43 -04:00
Adam
6d46bb09c4 ge plugin: submit trades even when not logged in 2020-05-30 19:26:43 -04:00
Adam
2622cc2ac6 http-api: use separate class for ge trade history 2020-05-30 19:26:43 -04:00
Runelite auto updater
1e7299bcc6 Bump for 1.6.18-SNAPSHOT 2020-05-28 13:13:26 +00:00
Runelite auto updater
590c11edb4 Release 1.6.17 2020-05-28 13:13:17 +00:00
swazrgb
66db2c7986 Remove SoundsClient 2020-05-26 23:36:27 +02:00
swazrgb
87e4cbc921 Remove AnimationsClient 2020-05-26 23:35:24 +02:00
swazrgb
411680e98a Remove XteaClient 2020-05-26 23:34:48 +02:00
swazrgb
4769802524 Switch repo.runelite.net url to https 2020-05-26 23:33:42 +02:00
OpenOSRS
9c3ec9fb4c project: Update gradle dependencies 2020-05-22 00:03:26 +00:00
Runelite auto updater
10b502278e Bump for 1.6.17-SNAPSHOT 2020-05-21 11:43:06 +00:00
Runelite auto updater
79361aa17a Release 1.6.16 2020-05-21 11:42:57 +00:00
OpenOSRS
a991806940 project: Update gradle dependencies 2020-05-21 00:03:27 +00:00
Runelite auto updater
ac244c1425 Bump for 1.6.16-SNAPSHOT 2020-05-14 13:02:54 +00:00
Runelite auto updater
7ff66be6f2 Release 1.6.15 2020-05-14 13:02:48 +00:00
Runelite auto updater
b35ab9aecd Bump for 1.6.15-SNAPSHOT 2020-05-09 16:15:32 +00:00
Runelite auto updater
3865e838e5 Release 1.6.14 2020-05-09 16:15:23 +00:00
Owain van Brakel
04188f2d82 Merge remote-tracking branch 'runelite/master' 2020-05-01 20:08:11 +02:00
Runelite auto updater
1db99628a1 Bump for 1.6.14-SNAPSHOT 2020-05-01 15:44:43 +00:00
Runelite auto updater
bf76bd140e Release 1.6.13 2020-05-01 15:44:35 +00:00