Minecraft/asys
Archived
0
Fork 0
Code Activity

Merge branch 'dev-webconsole' into dev-zond-recode

Browse Source 
# Conflicts:
#	build.gradle
This commit is contained in:
DmitriyMX
2017-06-15 22:54:21 +03:00
parent 1c7e4d3545 6ffb63ceb2
commit 846e37c31d
17 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcserver-manager/build.gradle
View File

@@ -9,7 +9,7 @@ configurations {
}
compileJava {
dependsOn ':bridge-protocol:compileJava'
dependsOn ':libprotocol:compileJava'
}
jar {
@@ -35,7 +35,7 @@ ext {
dependencies {
compile project(':core')
compile project(':webinterface')
include files(project(':bridge-protocol').sourceSets.main.output.classesDir)
include files(project(':libprotocol').sourceSets.main.output.classesDir)
compile group: 'io.netty', name: 'netty-codec', version: nettyVersion
compile group: 'io.netty', name: 'netty-codec-http', version: nettyVersion
}