diff --git a/Jenkinsfile b/Jenkinsfile index c68b733c2..7ae0e3cdf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,6 +20,9 @@ pipeline { } stage('Publish') { + when { + branch '1.12.2' + } steps { sh './gradlew publish --no-daemon' } diff --git a/README.md b/README.md index a75f173eb..ab7771673 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ For more information, visit the main CurseForge Page by [clicking here](http://m Jenkins: [Click here](https://ci.ellpeck.de/blue/organizations/jenkins/ActuallyAdditions/) Maven: [Click here](https://maven.ellpeck.de/de/ellpeck/actuallyadditions/) -![](https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/master/pics/logo.png) +![](https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/main/pics/logo.png) diff --git a/build.gradle b/build.gradle index 78f346e4b..b62aae997 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ version = "1.12.2-r151" group = "de.ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" -if(hasProperty('buildnumber')){ - version = "${version}-${this.properties['buildnumber']}" +if (System.getenv('BUILD_NUMBER') != null) { + version += "." + System.getenv('BUILD_NUMBER') } minecraft { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java index 7648727ed..121c0f377 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java @@ -28,7 +28,7 @@ public class ThreadSpecialFetcher extends Thread { public void run() { ActuallyAdditions.LOGGER.info("Fetching Special People Stuff..."); try { - URL url = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/master/specialPeopleStuff.properties"); + URL url = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/main/specialPeopleStuff.properties"); Properties specialProperties = new Properties(); specialProperties.load(new InputStreamReader(url.openStream())); SpecialRenderInit.parse(specialProperties); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java index 31c77b900..1439e9940 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java @@ -30,7 +30,7 @@ public class ThreadUpdateChecker extends Thread { public void run() { ActuallyAdditions.LOGGER.info("Starting Update Check..."); try { - URL newestURL = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/master/update/updateVersions.properties"); + URL newestURL = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/main/update/updateVersions.properties"); Properties updateProperties = new Properties(); updateProperties.load(new InputStreamReader(newestURL.openStream()));