Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts: # build.gradle # src/main/java/techreborn/blocks/BlockRubberLog.java # src/main/java/techreborn/init/ModRecipes.java # src/main/java/techreborn/items/tools/ItemElectricTreetap.java # src/main/java/techreborn/items/tools/ItemTreeTap.java
This commit is contained in:
commit
c1d2e875bf
4 changed files with 54 additions and 3 deletions
|
@ -185,7 +185,7 @@ uploadArchives {
|
|||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
//this is when the build is executed on the master node
|
||||
println 'Uploading to local Maven Repo'
|
||||
repository(url: "file:///var/www/maven/")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue