diff --git a/gradle.properties b/gradle.properties index 498988443..2726e757a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,14 +6,14 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.18 - yarn_version=1.18+build.1 - loader_version=0.12.8 + minecraft_version=1.18.1 + yarn_version=1.18.1+build.7 + loader_version=0.12.12 fapi_version=0.44.0+1.18 # Dependencies energy_version=2.0.0-beta1 - rei_version=7.0.337 + rei_version=7.1.356 trinkets_version=3.0.2 autoswitch_version=-SNAPSHOT dashloader_version=2.0 diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index 19bcd5bed..bc978f5e9 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -30,7 +30,6 @@ import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; import net.minecraft.item.Items; -import net.minecraft.item.ToolMaterials; import net.minecraft.sound.BlockSoundGroup; import reborncore.RebornRegistry; import reborncore.common.powerSystem.RcEnergyTier; diff --git a/src/main/java/techreborn/init/TRToolMaterials.java b/src/main/java/techreborn/init/TRToolMaterials.java index bf3764a46..614bf4198 100644 --- a/src/main/java/techreborn/init/TRToolMaterials.java +++ b/src/main/java/techreborn/init/TRToolMaterials.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.init; import net.minecraft.item.ToolMaterial;