diff options
| author | shedaniel <daniel@shedaniel.me> | 2020-04-18 15:54:50 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2020-04-18 15:54:50 +0800 |
| commit | c1f14ed94f2dcc40008099e3abc4b0eaa5dd05cf (patch) | |
| tree | 981ffcf6d3636d157ddd875b80c177fe369a7911 | |
| parent | 8e617f5a6c92a21be270ec190261d979deac965f (diff) | |
| download | RoughlyEnoughItems-c1f14ed94f2dcc40008099e3abc4b0eaa5dd05cf.tar.gz RoughlyEnoughItems-c1f14ed94f2dcc40008099e3abc4b0eaa5dd05cf.tar.bz2 RoughlyEnoughItems-c1f14ed94f2dcc40008099e3abc4b0eaa5dd05cf.zip | |
Fix license
Signed-off-by: shedaniel <daniel@shedaniel.me>
| -rwxr-xr-x | build.gradle | 4 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/api/fluid/FluidSupportProvider.java | 23 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/impl/FluidSupportProviderImpl.java | 23 |
3 files changed, 48 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle index 13b572b6e..7333b744a 100755 --- a/build.gradle +++ b/build.gradle @@ -118,14 +118,14 @@ def releaseChangelog = "No changelog" task releaseOnCf { def df = new SimpleDateFormat("yyyy-MM-dd HH:mm") df.setTimeZone(TimeZone.getTimeZone("UTC")) - def currentBranch + def branch if (System.env.BRANCH_NAME) { branch = System.env.BRANCH_NAME branch = branch.substring(branch.lastIndexOf("/")+1) } else { branch = "git rev-parse --abbrev-ref HEAD".execute().in.text.trim() } - if (currentBranch == "HEAD") { + if (branch == "HEAD") { branch = "git rev-parse --short HEAD".execute().in.text.trim() } def time = df.format(new Date()) diff --git a/src/main/java/me/shedaniel/rei/api/fluid/FluidSupportProvider.java b/src/main/java/me/shedaniel/rei/api/fluid/FluidSupportProvider.java index a8636d35e..0356e887d 100644 --- a/src/main/java/me/shedaniel/rei/api/fluid/FluidSupportProvider.java +++ b/src/main/java/me/shedaniel/rei/api/fluid/FluidSupportProvider.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.fluid; import me.shedaniel.rei.api.EntryStack; diff --git a/src/main/java/me/shedaniel/rei/impl/FluidSupportProviderImpl.java b/src/main/java/me/shedaniel/rei/impl/FluidSupportProviderImpl.java index dede539c0..19e5d36db 100644 --- a/src/main/java/me/shedaniel/rei/impl/FluidSupportProviderImpl.java +++ b/src/main/java/me/shedaniel/rei/impl/FluidSupportProviderImpl.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.impl; import com.google.common.collect.Lists; |
