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