diff --git a/.gitignore b/.gitignore index 94961a481..406e0479b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,15 +21,9 @@ changelog.txt *.project *.classpath .idea/* -java_pid2412.hprof -/asmTemp/ /logs/ /classes/ -/gradle.properties -/buildSrc/.gradle/ -/buildSrc/build/ /src/main/resources/package-lock.json -/src/main/resources/node_modules/ /RebornCore/.gradle /RebornCore/build \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58a3503ba..09bee114a 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ plugins { id 'idea' id 'eclipse' id 'maven-publish' - id "org.cadixdev.licenser" version "0.5.0" - id "fabric-loom" version "0.8-SNAPSHOT" + id "org.cadixdev.licenser" version "0.6.1" + id "fabric-loom" version "0.9-SNAPSHOT" id "com.matthewprenger.cursegradle" version "1.4.0" id "de.undercouch.download" version "4.1.1" } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..35f5ac1b0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx2G \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf51..05679dc3c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/techreborn/compat/dashloader/DashDynamicBucketBakedModel.java b/src/main/java/techreborn/compat/dashloader/DashDynamicBucketBakedModel.java index c26e90c59..1db9f8644 100644 --- a/src/main/java/techreborn/compat/dashloader/DashDynamicBucketBakedModel.java +++ b/src/main/java/techreborn/compat/dashloader/DashDynamicBucketBakedModel.java @@ -1,3 +1,27 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2020 TechReborn + * + * 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 techreborn.compat.dashloader; import net.oskarstrom.dashloader.DashRegistry; diff --git a/src/main/java/techreborn/compat/dashloader/DashDynamicCellBakedModel.java b/src/main/java/techreborn/compat/dashloader/DashDynamicCellBakedModel.java index c2547d4a0..74902475d 100644 --- a/src/main/java/techreborn/compat/dashloader/DashDynamicCellBakedModel.java +++ b/src/main/java/techreborn/compat/dashloader/DashDynamicCellBakedModel.java @@ -1,3 +1,27 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2020 TechReborn + * + * 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 techreborn.compat.dashloader; import net.oskarstrom.dashloader.DashRegistry;