From f59a4775a96b7ea16a919b090bffa9428ba777d6 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 30 May 2018 15:00:54 +0300 Subject: [PATCH] Fixed license and updated Thermal and Forge deps --- build.gradle | 6 ++--- .../java/techreborn/init/ModTileEntities.java | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 06c2ae06f..831af2d21 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,7 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.12.2-14.23.3.2678" + version = "1.12.2-14.23.4.2705" mappings = "snapshot_20171003" replace "@MODVERSION@", project.version useDepAts = true @@ -122,8 +122,8 @@ dependencies { deobfCompile "mezz.jei:jei_1.12.2:+" deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.19-11" deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.+' - deobfCompile 'cofh:ThermalDynamics:1.12.2-2.3.9.3:universal', withoutOldJEI - deobfCompile 'cofh:ThermalExpansion:1.12.2-5.3.9.9:universal', withoutOldJEI + deobfCompile 'cofh:ThermalDynamics:1.12.2-2.5+:universal' + deobfCompile 'cofh:ThermalExpansion:1.12.2-5.5+:universal' deobfCompile 'MCMultiPart2:MCMultiPart:2.4.1' deobfCompile "li.cil.oc:OpenComputers:MC1.12.1-1.7.1+" deobfCompile "blusunrize:ImmersiveEngineering:0.12-+:deobf" diff --git a/src/main/java/techreborn/init/ModTileEntities.java b/src/main/java/techreborn/init/ModTileEntities.java index e62651d0a..cd1f7b671 100644 --- a/src/main/java/techreborn/init/ModTileEntities.java +++ b/src/main/java/techreborn/init/ModTileEntities.java @@ -1,3 +1,27 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2018 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.nbt.NBTTagCompound;