Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2024-11-08 09:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into abstraction

Browse Source
This commit is contained in:
creeper123123321 2019-10-27 09:30:43 -03:00
commit 27ba08dc52
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -19,5 +19,5 @@ deploy:
install: true install: true
script: script:
# Set up git user name and tag this commit # Set up git user name and tag this commit
- if [ -z $TRAVIS_TAG ]; then git config --local user.name "creeper12313321"; git config --local user.email "creeper123123321@gmail.com"; export TRAVIS_TAG=build-$TRAVIS_JOB_NUMBER; git tag $TRAVIS_TAG; fi - if [ -z $TRAVIS_TAG ] && [ -z $(git tag -l --points-at HEAD) ]; then git config --local user.name "creeper12313321"; git config --local user.email "7974274+creeper123123321@users.noreply.github.com"; export TRAVIS_TAG=build-$TRAVIS_JOB_NUMBER; git tag $TRAVIS_TAG; fi
- ./gradlew clean build - ./gradlew clean build

6
build.gradle.kts
View File

@ -51,11 +51,11 @@ dependencies {
compileOnly("com.google.code.findbugs:jsr305:3.0.2") compileOnly("com.google.code.findbugs:jsr305:3.0.2")
minecraft("com.mojang:minecraft:19w40a") minecraft("com.mojang:minecraft:19w42a")
mappings("net.fabricmc:yarn:19w40a+build.4") mappings("net.fabricmc:yarn:19w42a+build.1")
modCompile("net.fabricmc:fabric-loader:0.6.3+build.167") modCompile("net.fabricmc:fabric-loader:0.6.3+build.167")
modCompile("net.fabricmc.fabric-api:fabric-api:0.4.3+build.247-1.15") modCompile("net.fabricmc.fabric-api:fabric-api:0.4.8+build.255-1.15")
modCompile("io.github.cottonmc:cotton-client-commands:0.4.2+1.14.3-SNAPSHOT") modCompile("io.github.cottonmc:cotton-client-commands:0.4.2+1.14.3-SNAPSHOT")
include("io.github.cottonmc:cotton-client-commands:0.4.2+1.14.3-SNAPSHOT") include("io.github.cottonmc:cotton-client-commands:0.4.2+1.14.3-SNAPSHOT")