From 42c1021c889b5e5c5928fb6b3497e68e4a459c1b Mon Sep 17 00:00:00 2001 From: malte0811 Date: Fri, 26 May 2017 17:33:09 +0200 Subject: [PATCH] Build 1.4-10 Removed a copyright header that Intellij put in build.gradle --- build.gradle | 20 +------------------- changelog.md | 7 +++++++ 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index f15ba21..00bbfda 100644 --- a/build.gradle +++ b/build.gradle @@ -1,23 +1,5 @@ def mainVersion = "1.4" -def buildNumber = "9" - -/* - * This file is part of Industrial Wires. - * Copyright (C) 2016-2017 malte0811 - * - * Industrial Wires is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Industrial Wires is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Industrial Wires. If not, see . - */ +def buildNumber = "10" // For those who want the bleeding edge buildscript { diff --git a/changelog.md b/changelog.md index f5cd504..1b55356 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,10 @@ +#####Version 1.4-10 + - added lock switches for control panels (backport from 1.11) + - Can only be turned on by someone with the correct key to prevent unauthorized access + - up to 10 keys can be added to a keyring to reduce inventory spam + - IC2 items can be added to the appropriate sections of the engineers toolbox (backport from 1.11) + - Components (lighted button, indicator light, etc.) on panels now actually light up (backport from 1.11) + - Fixed power loss when no energy is being transmitted #####Version 1.4-9 - added Control Panels - They can be used to control and monitor a lot of redstone signals from a few blocks