ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into better-script-info

Browse Source 
# Conflicts:
#	runelite-client/src/main/resources/scripts/ChatboxInputWidgetBuilder.rs2asm
#	runelite-client/src/main/resources/scripts/OptionsPanelRebuilder.rs2asm
#	runelite-client/src/main/resources/scripts/SpecbarRedraw.rs2asm
#	runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash
#	runelite-client/src/main/scripts/OptionsPanelRebuilder.hash
#	runelite-client/src/main/scripts/SpecbarRedraw.hash
This commit is contained in:
therealunull
2020-10-29 13:23:04 -04:00
parent c626769ca4 0b13503b1d
commit 1eab6b46cd
36 changed files with 603 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/runelite-client.gradle.kts
View File

@@ -88,8 +88,8 @@ dependencies {
testImplementation(group = "com.google.inject.extensions", name = "guice-testlib", version = "4.2.3")
testImplementation(group = "org.hamcrest", name = "hamcrest-library", version = "2.2")
testImplementation(group = "junit", name = "junit", version = "4.13.1")
testImplementation(group = "org.mockito", name = "mockito-core", version = "3.5.15")
testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.5.15")
testImplementation(group = "org.mockito", name = "mockito-core", version = "3.6.0")
testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.6.0")
testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.9.0")
testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
}