Ganom f79543acfe Merge branch 'master' of https://github.com/runelite/runelite ...

# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemMapping.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/MapClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/HitpointsDisplayStyle.java
#	runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java

2019-05-30 13:26:28 -04:00

..

config

Move EventBus implementation to runelite-client

2018-12-01 19:08:26 -05:00

game

Enable checkstyle on test sources

2019-03-04 14:56:46 -05:00

plugins

Merge branch 'master' of https://github.com/runelite/runelite

2019-05-30 13:26:28 -04:00

rs

Allow RS loading classes to be used with Guice

2018-07-21 23:05:19 +02:00

ui

Enable checkstyle on test sources

2019-03-04 14:56:46 -05:00

util

Merge branch 'item-util-2' of https://github.com/TheStonedTurtle/runelite into ult

2019-05-20 03:20:59 -07:00

RuneLiteModuleTest.java

Send launch properties around as bound constants

2018-07-21 23:05:22 +02:00