Commit Graph

670 Commits

Author SHA1 Message Date
TheRealNull
a2a295a054 Merge remote-tracking branch 'upstream/master' into runelite
Also pulled out a couple of our merged apis into our own classes. Getting much easier to keep up to date with their data

# Conflicts:
#	.github/FUNDING.yml
#	.github/workflows/CI.yml
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java
#	ci/build.sh
#	http-api/pom.xml
#	http-service/pom.xml
#	http-service/src/main/java/net/runelite/http/service/chat/ChatController.java
#	http-service/src/main/java/net/runelite/http/service/config/ConfigController.java
#	http-service/src/main/java/net/runelite/http/service/config/ConfigService.java
#	http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java
#	http-service/src/main/java/net/runelite/http/service/ge/Trade.java
#	http-service/src/test/java/net/runelite/http/service/config/ConfigServiceTest.java
#	http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/ObjectID.java
#	runelite-api/src/main/java/net/runelite/api/ParamHolder.java
#	runelite-api/src/main/java/net/runelite/api/ParamID.java
#	runelite-api/src/main/java/net/runelite/api/Preferences.java
#	runelite-api/src/main/java/net/runelite/api/ScriptEvent.java
#	runelite-api/src/main/java/net/runelite/api/ScriptID.java
#	runelite-api/src/main/java/net/runelite/api/SettingID.java
#	runelite-api/src/main/java/net/runelite/api/StructComposition.java
#	runelite-api/src/main/java/net/runelite/api/StructID.java
#	runelite-api/src/main/java/net/runelite/api/Varbits.java
#	runelite-api/src/main/java/net/runelite/api/events/PlayerChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/PostStructComposition.java
#	runelite-api/src/main/java/net/runelite/api/events/WidgetClosed.java
#	runelite-api/src/main/java/net/runelite/api/events/WidgetHiddenChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
#	runelite-api/src/main/java/net/runelite/api/events/WorldChanged.java
#	runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetModalMode.java
#	runelite-api/src/test/java/net/runelite/api/plugins/combatlevel/CombatLevelOverlayTest.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
#	runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginToggleButton.java
#	runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
#	runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java
#	runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
#	runelite-client/src/main/resources/net/runelite/client/runelite.properties
#	runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash
#	runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/discord/DiscordStateTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/util/ColorUtilTest.java
#	runelite-script-assembler-plugin/pom.xml
2021-01-14 14:41:17 -05:00
Adam
266fee2067 config service: handle fromJson() returning null
Treat it the same as handling a json syntax exception
2021-01-09 17:12:05 -05:00
Adam
0f17ecdaea http-api: add soul wars hiscores 2021-01-06 15:27:07 -05:00
Runelite auto updater
f9aa8d7eee Bump for 1.6.37-SNAPSHOT 2021-01-06 14:58:50 +00:00
Runelite auto updater
4b4eb6f3a0 Release 1.6.36 2021-01-06 14:58:41 +00:00
Adam
e3b75c8b7a ge: submit buy limit reset time 2020-12-25 19:58:22 -05:00
Adam
9a322c70d0 ge: add trade seq number
Occasionally the trades are delivered out of order, this allows us to reassemble them in the correct order
2020-12-25 19:19:41 -05:00
Adam
2c8984e380 ge: add user agent to trade message 2020-12-25 19:19:40 -05:00
Runelite auto updater
096f457d9f Bump for 1.6.36-SNAPSHOT 2020-12-09 12:22:49 +00:00
Runelite auto updater
3ac711ebf7 Release 1.6.35 2020-12-09 12:22:39 +00:00
Runelite auto updater
ed591b123b Bump for 1.6.34-SNAPSHOT 2020-12-02 12:21:36 +00:00
Runelite auto updater
eb1f86f6cb Release 1.6.33 2020-12-02 12:21:27 +00:00
Adam
f6a5463a57 Merge pull request #12834 from abextm/rsprofile-external
Per RuneScape-Profile configuration
2020-11-27 00:00:54 -05:00
Adam
0ca25d4f46 chat controller: return 404 if task is not found
This was returning a 200 with an empty body, causing the client to npe due to deserializing it as a Task with no task or location
2020-11-26 14:37:50 -05:00
Max Weber
e769ee0a7b http-api, http-service, rl-client: bulk upload configuration changes 2020-11-25 22:29:35 -07:00
Runelite auto updater
ea024ee756 Bump for 1.6.33-SNAPSHOT 2020-11-18 12:47:08 +00:00
Runelite auto updater
bec42bdaf2 Release 1.6.32 2020-11-18 12:46:59 +00:00
Runelite auto updater
b520e58034 Bump for 1.6.32-SNAPSHOT 2020-11-11 17:37:23 +00:00
Runelite auto updater
2b80bff4db Release 1.6.31 2020-11-11 17:37:14 +00:00
Adam
4f3d57d739 Fix offline worlds showing population of 65535
The service has been updated to return -1 when worlds are offline, and then the UI updated to display OFF when the count is less than 0
2020-11-09 12:41:50 -05:00
Runelite auto updater
95fcfd5f8c Bump for 1.6.31-SNAPSHOT 2020-10-28 12:32:25 +00:00
Runelite auto updater
cd2b9539c8 Release 1.6.30 2020-10-28 12:32:16 +00:00
Adam
9fc8f19c32 pluginhub controller: fix scheduled task delay
This was meant to be 30 minutes
2020-10-21 10:20:47 -04:00
Runelite auto updater
0e4cfaefa7 Bump for 1.6.30-SNAPSHOT 2020-10-21 11:17:01 +00:00
Runelite auto updater
09a2e771da Release 1.6.29 2020-10-21 11:16:52 +00:00
Adam
7a6c4ecc51 Add pluginhub user count tracking 2020-10-17 11:50:53 -04:00
Runelite auto updater
d19405129a Bump for 1.6.29-SNAPSHOT 2020-10-07 14:17:41 +00:00
Runelite auto updater
77ca99f9e0 Release 1.6.28 2020-10-07 14:17:31 +00:00
Adam
1799c9e593 loottracker: submit loot when not logged in
This is to aid the wiki drop log project. The data is not otherwise
stored.
2020-10-01 18:31:39 -04:00
Runelite auto updater
1091bc42cd Bump for 1.6.28-SNAPSHOT 2020-09-23 14:32:07 +00:00
Runelite auto updater
553f5b18f3 Release 1.6.27 2020-09-23 14:31:57 +00:00
Runelite auto updater
b83c97ed1c Bump for 1.6.27-SNAPSHOT 2020-09-02 11:36:42 +00:00
Runelite auto updater
581ca2fdd5 Release 1.6.26 2020-09-02 11:36:33 +00:00
Max Weber
431e09588b specify utf8 encoding
this should fix the following known bugs:
 - putting a U+2019 in the config causes it to become corrupted and
   ~double in size every launch
 - scripts become assembled incorrectly and the nbsp after your name in
   the chatbox becomes incorrect
 - the feed panel doesn't show emoji
2020-08-28 21:58:08 -04:00
Runelite auto updater
0fda0a6ef3 Bump for 1.6.26-SNAPSHOT 2020-08-26 11:32:41 +00:00
Runelite auto updater
766ffdb7ac Release 1.6.25 2020-08-26 11:32:32 +00:00
Adam
9c81e9b509 http-service: increase loot tracker retention to 90 days 2020-08-22 11:09:07 -04:00
Adam
86713e66ee loot tracker service: use bigint for kill id 2020-08-15 18:48:57 -04:00
Runelite auto updater
7d94e5b839 Bump for 1.6.25-SNAPSHOT 2020-08-06 11:26:05 +00:00
Runelite auto updater
abf6600241 Release 1.6.24 2020-08-06 11:25:56 +00: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
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
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