From 286f3c7f08a54b862f3043790fc535a24f00b782 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Thu, 24 Oct 2019 21:46:50 +0200 Subject: [PATCH 1/2] 19w42a (#11) --- build.gradle.kts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 14c7ce4..c9ef7eb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,16 +46,16 @@ tasks.named("processResources") { dependencies { // transitive = false because Guava is conflicting on runClient - compile("us.myles:viaversion:2.1.4-19w40a") { isTransitive = false } - include("us.myles:viaversion:2.1.4-19w40a") + compile("us.myles:viaversion:2.1.4-19w42a") { isTransitive = false } + include("us.myles:viaversion:2.1.4-19w42a") compileOnly("com.google.code.findbugs:jsr305:3.0.2") - minecraft("com.mojang:minecraft:19w40a") - mappings("net.fabricmc:yarn:19w40a+build.4") + minecraft("com.mojang:minecraft:19w42a") + mappings("net.fabricmc:yarn:19w42a+build.1") 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") include("io.github.cottonmc:cotton-client-commands:0.4.2+1.14.3-SNAPSHOT") From 2f3ada6ebe7c241316cd8b6c1d75809b5208f134 Mon Sep 17 00:00:00 2001 From: creeper123123321 Date: Thu, 24 Oct 2019 19:40:06 -0300 Subject: [PATCH 2/2] fix rebuilding on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bbb53e6..451f904 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,5 +19,5 @@ deploy: install: true script: # 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