From 35a2a97e0021b0a2399a2ffd1c09530fbcb58b8d Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 7 Nov 2020 14:32:06 +0100 Subject: [PATCH] some master->main related fixes --- Jenkinsfile | 2 +- README.md | 2 +- .../common/misc/special/ThreadSpecialFetcher.java | 2 +- .../actuallyadditions/common/update/ThreadUpdateChecker.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a6b449c3a..d28a31f17 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { stage('Publish') { when { - branch 'master' + branch 'main' } 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/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java index e3ee3bef7..253d03a64 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/misc/special/ThreadSpecialFetcher.java @@ -18,7 +18,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/common/update/ThreadUpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/common/update/ThreadUpdateChecker.java index d9a706a28..ce410a8fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/update/ThreadUpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/update/ThreadUpdateChecker.java @@ -20,7 +20,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()));