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
..
2021-01-14 14:41:17 -05:00
2020-11-15 00:03:32 +00:00