diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java
index 4c63a1542..b1121ac86 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ActuallyAdditionsAPI.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ActuallyAdditionsAPI.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/booklet/BookletPage.java b/src/main/java/de/ellpeck/actuallyadditions/api/booklet/BookletPage.java
index e22994256..8f6bfb708 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/booklet/BookletPage.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/booklet/BookletPage.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IBookletPage.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletPage.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.booklet;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletChapter.java b/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletChapter.java
index 85900c627..9730575a2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletChapter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletChapter.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IBookletChapter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IBookletChapter.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.booklet;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletEntry.java b/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletEntry.java
index c053dfa1f..50394efbb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletEntry.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletEntry.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IBookletEntry.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IBookletEntry.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.booklet;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IAtomicReconstructor.java
index 32f4a7fe3..1f72b5536 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IAtomicReconstructor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IAtomicReconstructor.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IAtomicReconstructor.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IAtomicReconstructor.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.internal;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IBookletGui.java b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IBookletGui.java
index 65f381e6d..5aa51bf4e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IBookletGui.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IBookletGui.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IBookletGui.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IBookletGui.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.internal;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IEntrySet.java b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IEntrySet.java
index 90e493e9f..cc924adf4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IEntrySet.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IEntrySet.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("IEntrySet.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.api.internal;
 
 import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IMethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IMethodHandler.java
index e2406dbf3..d52887aca 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IMethodHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IMethodHandler.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("IMethodHandler.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.api.internal;
 
 import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/lens/ILensItem.java b/src/main/java/de/ellpeck/actuallyadditions/api/lens/ILensItem.java
index e1faa032f..bfc67122e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/lens/ILensItem.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/ILensItem.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ILensItem.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ILensItem.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.lens;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java b/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java
index ba920d659..64bb1941c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java
@@ -1,11 +1,11 @@
 /*
- * This file ("Lens.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("Lens.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.lens;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/lens/LensConversion.java b/src/main/java/de/ellpeck/actuallyadditions/api/lens/LensConversion.java
index 6122acf12..7bf050b63 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/lens/LensConversion.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/lens/LensConversion.java
@@ -1,11 +1,11 @@
 /*
- * This file ("LensNone.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("LensConversion.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.lens;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/package-info.java b/src/main/java/de/ellpeck/actuallyadditions/api/package-info.java
index f2612d9f4..73e5863c0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/package-info.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/package-info.java
@@ -1,11 +1,11 @@
 /*
- * This file ("package-info.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("package-info.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 @API(owner = ActuallyAdditionsAPI.MOD_ID, apiVersion = ActuallyAdditionsAPI.API_VERSION, provides = ActuallyAdditionsAPI.API_ID)
 package de.ellpeck.actuallyadditions.api;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java
index 845a3e17b..295076b34 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BallOfFurReturn.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BallOfFurReturn.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.recipe;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java
index d45d66120..025cab8c3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CoffeeIngredient.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CoffeeIngredient.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.recipe;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/ColorLensChangerByDyeMeta.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/ColorLensChangerByDyeMeta.java
index 02831cfdb..6d9935f72 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/ColorLensChangerByDyeMeta.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/ColorLensChangerByDyeMeta.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("ColorLensChangerByDyeMeta.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.api.recipe;
 
 import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java
index 7a6c04d8b..94dec798e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CrusherRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CrusherRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.recipe;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/IColorLensChanger.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/IColorLensChanger.java
index e30de60e2..873f119cf 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/IColorLensChanger.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/IColorLensChanger.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("IColorLensChanger.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.api.recipe;
 
 import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java
index 42b4e9657..efcf2e8aa 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("LensNoneRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("LensConversionRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.recipe;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java
index 7c02f8855..7ee6d3aea 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TreasureChestLoot.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TreasureChestLoot.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.recipe;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/tile/IPhantomTile.java b/src/main/java/de/ellpeck/actuallyadditions/api/tile/IPhantomTile.java
index 3cae62727..6a3e9d7f6 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/api/tile/IPhantomTile.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/api/tile/IPhantomTile.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IPhantomTile.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IPhantomTile.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.api.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
index 748dca3df..58a6fbe45 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ActuallyAdditions.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ActuallyAdditions.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java
index 3b9db821f..96f30fb2a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitAchievements.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitAchievements.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.achievement;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java
index e9dd58bbd..a05bee1e2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TheAchievements.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TheAchievements.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.achievement;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java
index b90d3110b..49a07aa49 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockAtomicReconstructor.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockAtomicReconstructor.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java
index da6fdd6d2..c659f8f51 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBlackLotus.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockBlackLotus.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockBlackLotus.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java
index bb38a8c6b..0e7eb8290 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockBreaker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockBreaker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java
index 27bd04c36..3e9ce3d33 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockCanolaPress.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockCanolaPress.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java
index 3b4bb6a5d..bb769fd7e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockCoalGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockCoalGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java
index 106879a53..633f7f027 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockCoffeeMachine.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockCoffeeMachine.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
index eeb54a9ba..ef0a5935b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockColoredLamp.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockColoredLamp.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java
index 7171b2035..7313e14cd 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockCompost.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockCompost.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java
index 59ddb5ecd..1549c2f78 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockCrystal.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockCrystal.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java
index d88d5516e..21ffa9d0b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockDirectionalBreaker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockDirectionalBreaker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java
index fd7e33566..439c1dedb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockDropper.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockDropper.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java
index 9da4e915b..34b858746 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockEnergizer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockEnergizer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java
index dd10a1579..8a9222479 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockFeeder.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockFeeder.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java
index 532b85d4d..5bdeeb1c4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockFermentingBarrel.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockFermentingBarrel.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java
index dde47a345..6fa79b9a8 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockFireworkBox.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockFireworkBox.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java
index 1c6d40530..b5c77544b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockFishingNet.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockFishingNet.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java
index 8f91920b5..df6fa97c7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockFluidCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockFluidCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java
index 29d2df273..624d98a11 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockFurnaceDouble.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockFurnaceDouble.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java
index f104e27ae..d4bdf27a8 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockFurnaceSolar.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockFurnaceSolar.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java
index b2bad00d1..3a0a44839 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGeneric.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockGeneric.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockGeneric.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java
index 16a3d8867..aba472621 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockGiantChest.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockGiantChest.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java
index d0dd697f2..b8dfbca0d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockGreenhouseGlass.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockGreenhouseGlass.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java
index d8971ee53..a1c30dcf6 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockGrinder.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockGrinder.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java
index 31ed59697..e1f1e158f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockHeatCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockHeatCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java
index c765d7838..9e1005344 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockInputter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockInputter.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java
index bdc9da2a4..749c58698 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockItemRepairer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockItemRepairer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java
index 139007ade..28c32b17f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("BlockItemViewer.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.blocks;
 
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java
index 6bbd89dc5..bd3a5e032 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockLampPowerer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockLampPowerer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
@@ -59,7 +59,7 @@ public class BlockLampPowerer extends BlockBase{
     private void updateLamp(World world, BlockPos pos){
         if(!world.isRemote){
             BlockPos coords = WorldUtil.getCoordsFromSide(WorldUtil.getDirectionByPistonRotation(PosUtil.getMetadata(pos, world)), pos, 0);
-            if(coords != null && PosUtil.getBlock(coords, world) instanceof BlockColoredLamp){
+            if(PosUtil.getBlock(coords, world) instanceof BlockColoredLamp){
                 if(world.isBlockIndirectlyGettingPowered(pos) > 0){
                     if(!((BlockColoredLamp)PosUtil.getBlock(coords, world)).isOn){
                         PosUtil.setBlock(coords, world, InitBlocks.blockColoredLampOn, PosUtil.getMetadata(coords, world), 2);
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java
index 700ed980b..cf9082756 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockLaserRelay.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockLaserRelay.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java
index ae0bc9315..c697f25af 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockLavaFactoryController.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockLavaFactoryController.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java
index 0c90045e0..23588dba8 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockLeafGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockLeafGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java
index 89f0c83e3..a615e4278 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockMiner.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockMiner.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java
index 1e986cbb0..e075f8994 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockMisc.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockMisc.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java
index ada610e7b..73915ce8a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockOilGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockOilGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java
index e253de5e3..972cf7115 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockPhantom.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockPhantom.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java
index 29ee417b4..4ea74795c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockPhantomBooster.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockPhantomBooster.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java
index 164e6fdb8..fce11ebba 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockRangedCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockRangedCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java
index 305b9420e..e500c6277 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockSlabs.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockSlabs.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java
index f3f8824f3..da9763969 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockSmileyCloud.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockSmileyCloud.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java
index 18872e4d6..e08920456 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockTreasureChest.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockTreasureChest.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java
index 43024f909..1a5374715 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockWallAA.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockWallAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java
index e51460d6f..83ac0de7f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockWildPlant.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockWildPlant.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java
index c4ed64801..90ce2f589 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockXPSolidifier.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockXPSolidifier.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/IHudDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/IHudDisplay.java
index bacb6f808..1f63dac41 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/IHudDisplay.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/IHudDisplay.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IHudDisplay.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IHudDisplay.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java
index 25e616800..e80e9e106 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitBlocks.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitBlocks.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java
index c4f68b925..aa5043483 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockBase.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockBase.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java
index e2760b900..55a7cf025 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockBushBase.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockBushBase.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
index 9c438c630..c4e77e4e7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockContainerBase.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockContainerBase.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java
index 6dacad292..35c4df6a0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockFluidFlowing.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockFluidFlowing.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java
index 68025798e..5a83bf300 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockPlant.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockPlant.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java
index 9635e8238..b6a40b8ec 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockStair.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockStair.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java
index 26f1eeca4..db31f8fb7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemBlockBase.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemBlockBase.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java
index 8e7a06c0c..89c6c04a4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TheColoredLampColors.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TheColoredLampColors.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.metalists;
@@ -40,13 +40,11 @@ public enum TheColoredLampColors{
     public static TheColoredLampColors getColorFromDyeName(String color){
         if(color.substring(0, 3).equals("dye")){
             String actualName = color.substring(3);
-            if(actualName != null){
-                for(int i = 0; i < values().length; i++){
-                    String aName = values()[i].name;
-                    if(aName != null){
-                        if(aName.toLowerCase(Locale.ROOT).equals(actualName.toLowerCase(Locale.ROOT))){
-                            return values()[i];
-                        }
+            for(int i = 0; i < values().length; i++){
+                String aName = values()[i].name;
+                if(aName != null){
+                    if(aName.toLowerCase(Locale.ROOT).equals(actualName.toLowerCase(Locale.ROOT))){
+                        return values()[i];
                     }
                 }
             }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java
index 865a60d3e..c0bc99a76 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TheMiscBlocks.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TheMiscBlocks.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.metalists;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java
index 3257d776d..a441f6f18 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TheWildPlants.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TheWildPlants.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.metalists;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java
index d180e5027..90165222f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiBooklet.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("RenderCompost.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.render;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java
index 012edb494..0cdde1858 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java
@@ -1,11 +1,11 @@
 /*
- * This file ("RenderReconstructorLens.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("RenderReconstructorLens.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.render;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java
index 8860a96c0..d7863c45e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java
@@ -1,11 +1,11 @@
 /*
- * This file ("RenderSmileyCloud.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("RenderSmileyCloud.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.blocks.render;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
index ee400e060..c33813a33 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletUtils.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletUtils.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java
index ccbae9e75..52b61ca2e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiAAAchievements.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiAAAchievements.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiAAAchievements.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java
index d5c538424..620a190a7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiBooklet.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiBooklet.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java
index 1a874c7bd..3c934dcbb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitBooklet.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitBooklet.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java
index cf4e0f776..e1d62430f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookmarkButton.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookmarkButton.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.button;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java
index 0367918d7..bea62f103 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IndexButton.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IndexButton.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.button;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java
index b185df808..74edd1462 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TexturedButton.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TexturedButton.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.button;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java
index ded33f46e..36b23604b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletChapter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletChapter.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.chapter;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java
index c73d63726..909bda254 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCoffee.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletChapterCoffee.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletChapterCoffee.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.chapter;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java
index 8631d823f..c6cbafdaa 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapterCrusher.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletChapterCrusher.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletChapterCrusher.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.chapter;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java
index aaa6391cc..6ea6c37b5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletEntry.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletEntry.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.entry;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java
index 52599f884..3ecad48be 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntryAllSearch.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletEntryAllSearch.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletEntryAllSearch.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.entry;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/EntrySet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/EntrySet.java
index 37923e087..313563212 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/EntrySet.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/EntrySet.java
@@ -1,11 +1,11 @@
 /*
- * This file ("EntrySet.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("EntrySet.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.entry;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPageAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPageAA.java
index 7a5834efb..4a56bd6de 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPageAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/BookletPageAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletPage.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletPageAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.page;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java
index 9f5be5112..39dc11a65 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PageCoffeeRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PageCoffeeRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.page;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java
index 7301019e1..a619a0229 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PageCrafting.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PageCrafting.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.page;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java
index d5073a86a..79506db4f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PageCrusherRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PageCrusherRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.page;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java
index c35e00c80..ab91f082e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PageFurnace.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PageFurnace.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.page;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java
index a70555d77..b271125a9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PagePicture.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PagePicture.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.page;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java
index 4fca61c9f..00913b407 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PageReconstructor.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PageReconstructor.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.page;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java
index 999eb571d..8c4d6aba1 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageTextOnly.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PageTextOnly.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PageTextOnly.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.booklet.page;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java
index 54c76569e..a690c45d9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigCategories.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ConfigCategories.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ConfigCategories.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.config;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java
index 22f03b52c..00d3a61f6 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigValues.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ConfigValues.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ConfigValues.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.config;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java
index cbdd70a40..a661502e8 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/ConfigurationHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ConfigurationHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ConfigurationHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.config;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java
index 4e90478b4..661c2da8a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiConfiguration.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiConfiguration.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiConfiguration.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.config;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java
index ec8280c6a..5540bad0b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/GuiFactory.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiFactory.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiFactory.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.config;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java
index f1fc862da..72f4539fa 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigBoolValues.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ConfigBoolValues.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ConfigBoolValues.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.config.values;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java
index ad9674be5..133065418 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ConfigCrafting.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ConfigCrafting.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.config.values;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java
index 59344495d..f159538df 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ConfigIntValues.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ConfigIntValues.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.config.values;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java
index 22487592d..f595547d4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BlockCrafting.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BlockCrafting.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.crafting;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java
index 8952b998c..ea13c0fac 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CrusherCrafting.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CrusherCrafting.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.crafting;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java
index db4d3894b..7c28e618a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java
@@ -1,11 +1,11 @@
 /*
- * This file ("FoodCrafting.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("FoodCrafting.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.crafting;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java
index 3a7c57cf9..57dca57d1 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitCrafting.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitCrafting.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.crafting;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java
index 7eeac6768..284d367fc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemCrafting.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemCrafting.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.crafting;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java
index fb86597fd..b5fbb7530 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java
@@ -1,11 +1,11 @@
 /*
- * This file ("MiscCrafting.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("MiscCrafting.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.crafting;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java
index e7449f327..32a2d8cf5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ToolCrafting.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ToolCrafting.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.crafting;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java
index daef36f91..5479b8d0e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CreativeTab.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CreativeTab.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.creative;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityFireworkBoxMinecart.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityFireworkBoxMinecart.java
index c51543040..f981b39d7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityFireworkBoxMinecart.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityFireworkBoxMinecart.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("EntityFireworkBoxMinecart.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.entity;
 
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityRFMinecart.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityRFMinecart.java
index 992f260d1..df41879fb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityRFMinecart.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityRFMinecart.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("EntityRFMinecart.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.entity;
 
 import cofh.api.energy.EnergyStorage;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java
index 2cd429c80..2b8f0dd02 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("InitEntities.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.entity;
 
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/BreakEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/BreakEvent.java
index 3b6e3919d..5f55b873a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/BreakEvent.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/BreakEvent.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("BreakEvent.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.event;
 
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java
index cb2a57119..8dfdc7968 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvent.java
@@ -1,11 +1,11 @@
 /*
- * This file ("EntityLivingEvent.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("EntityLivingEvent.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.event;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java
index 9d5dbd8dd..f04d33520 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/HudEvent.java
@@ -1,11 +1,11 @@
 /*
- * This file ("HudEvent.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("HudEvent.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.event;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java
index 0e6df4853..2f40dbbbb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/InitEvents.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitEvents.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitEvents.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.event;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java
index fa9e4b1e7..b80a36a02 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LivingDropEvent.java
@@ -1,11 +1,11 @@
 /*
- * This file ("LivingDropEvent.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("LivingDropEvent.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.event;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java
index 2d14f6a0e..8dcab818a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/LogoutEvent.java
@@ -1,11 +1,11 @@
 /*
- * This file ("LogoutEvent.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("LogoutEvent.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.event;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java
index 1ce77e9aa..7ba8f90dc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/PlayerObtainEvents.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PlayerObtainEvents.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PlayerObtainEvents.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.event;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java
index 334f28ff8..c55a4aab9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/TooltipEvent.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TooltipEvent.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TooltipEvent.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.event;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java
index 74b1bc10a..1d7ff205c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldDecorationEvent.java
@@ -1,11 +1,11 @@
 /*
- * This file ("WorldDecorationEvent.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("WorldDecorationEvent.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.event;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java
index 00459099a..71cd54f45 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java
@@ -1,11 +1,11 @@
 /*
- * This file ("WorldLoadingEvents.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("WorldLoadingEvents.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.event;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java
index 8c5608b18..4bf1bc563 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("FluidAA.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("FluidAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.fluids;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java
index 2e26ad67e..ab3aa0166 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitFluids.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitFluids.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.fluids;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java
index 46c9cefe3..7fd06f9d5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitVillager.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitVillager.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.gen;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java
index 5e3bdb36f..d259200d7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/JamVillagerTradeHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("JamVillagerTradeHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("JamVillagerTradeHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.gen;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java
index 9203e8194..a9d2bcf54 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java
@@ -1,11 +1,11 @@
 /*
- * This file ("OreGen.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("OreGen.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.gen;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java
index 53207952f..9df54a8f6 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java
@@ -1,11 +1,11 @@
 /*
- * This file ("VillageComponentCustomCropField.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("VillageComponentCustomCropField.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.gen;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java
index aa68cc7dc..1486545d8 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java
@@ -1,11 +1,11 @@
 /*
- * This file ("VillageComponentJamHouse.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("VillageComponentJamHouse.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.gen;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java
index 2c1cad542..03beb12de 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageCustomCropFieldHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("VillageCustomCropFieldHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("VillageCustomCropFieldHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.gen;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java
index 2aeab7dc7..be505da63 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageJamHouseHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("VillageJamHouseHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("VillageJamHouseHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.gen;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java
index bb2dfd1b0..f4b5b23f2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerBreaker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerBreaker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java
index 9501a4f0a..3ea5df3d7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerCanolaPress.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerCanolaPress.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java
index d42bc6aa9..e323a9701 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerCoalGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerCoalGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java
index bafb1d5b0..766b286a0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerCoffeeMachine.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerCoffeeMachine.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java
index 933c268c6..ce6884a44 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerCrafter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerCrafter.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java
index 424381fcf..d5861d404 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerDirectionalBreaker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerDirectionalBreaker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java
index 7e801193e..3e6b2813c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerDrill.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerDrill.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java
index 4c885893a..25afb9fa6 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerDropper.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerDropper.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java
index fca361c78..18b246952 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerEnergizer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerEnergizer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java
index 3069509aa..4f6529846 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerEnervator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerEnervator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java
index dc734e067..b6f12d630 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerFeeder.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerFeeder.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java
index 1395a970d..b049878d4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerFermentingBarrel.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerFermentingBarrel.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java
index 5c2c9d909..e04b3b5b4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerFluidCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerFluidCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java
index 3c70d264d..fedf70c6b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerFurnaceDouble.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerFurnaceDouble.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java
index 72df215f6..20d6dc92e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerGiantChest.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerGiantChest.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java
index 8cfb5f1eb..eda54b0d9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerGrinder.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerGrinder.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java
index 5dda30f55..7e969ab4f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerInputter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerInputter.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java
index 72ebc5ab5..eee32cf93 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerInputter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerLaserRelayItemWhitelist.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java
index 216b79e02..2b6671a0c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerMiner.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerMiner.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java
index 73342ea35..95d6e2f79 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerOilGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerOilGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java
index a96707cc1..7cce38d01 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerPhantomPlacer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerPhantomPlacer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java
index df17640af..e01e96812 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerRangedCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerRangedCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java
index 90682e099..7b5b2b1fe 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerRepairer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerRepairer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java
index 586303d7a..ad92f124a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerSmileyCloud.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerSmileyCloud.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java
index d20d040fe..fef13feb7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ContainerXPSolidifier.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ContainerXPSolidifier.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java
index 0fd136b54..9431b5293 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java
index 9cc21ac2a..17702341a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiBreaker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiBreaker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java
index 67b8739da..f84f7f6bd 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiCanolaPress.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiCanolaPress.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java
index bfd37e45f..80c587492 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiCoalGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiCoalGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java
index acaad95c5..63a1344e1 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiCoffeeMachine.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiCoffeeMachine.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java
index 171c49262..1730b2908 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCrafter.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiCrafter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiCrafter.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java
index a769a1b36..a1522fc6a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiDirectionalBreaker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiDirectionalBreaker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java
index db2e1c464..fb68bb13e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiDrill.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiDrill.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java
index fcf10d836..2f4cc5c0e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiDropper.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiDropper.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java
index e84fb4eb6..ab54d5215 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiEnergizer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiEnergizer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java
index c82acebd3..69d2114b3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiEnervator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiEnervator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java
index 5aa8d3ca9..b2c45c534 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiFeeder.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiFeeder.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java
index 59bd13efb..1a79c8bec 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiFermentingBarrel.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiFermentingBarrel.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java
index e19eab4df..e4d69c04e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiFluidCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiFluidCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java
index 436c2e602..4baab8f37 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiFurnaceDouble.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiFurnaceDouble.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java
index d6c673f30..90f688909 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiGiantChest.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiGiantChest.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java
index 2c0abe989..993d9d411 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiGrinder.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiGrinder.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java
index 10ae2acfb..1926f78ac 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiInputter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiInputter.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java
index 9e80b01b0..14d6a043b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiOilGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiLaserRelayItemWhitelist.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java
index bc65456c5..a688a0086 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiMiner.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiMiner.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java
index 4938c3ebe..5571b488e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiOilGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiOilGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java
index a6802ec58..d76208187 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiPhantomPlacer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiPhantomPlacer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java
index 965c6e391..6a8c8e865 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiRangedCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiRangedCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java
index 121498598..1f4939f5c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiRepairer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiRepairer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java
index 58564a0e1..64bae0eda 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiSmileyCloud.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiSmileyCloud.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java
index bd22443bf..c2057b8bf 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java
@@ -1,11 +1,11 @@
 /*
- * This file ("GuiXPSolidifier.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("GuiXPSolidifier.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java
index 77042179f..9f7cb5d36 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotFilter.java
@@ -1,11 +1,11 @@
 /*
- * This file ("SlotFilter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("SlotFilter.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.slot;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java
index 91e13df92..277ec57be 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java
@@ -1,11 +1,11 @@
 /*
- * This file ("SlotImmovable.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("SlotImmovable.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.slot;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java
index 98b004186..2eece5500 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotOutput.java
@@ -1,11 +1,11 @@
 /*
- * This file ("SlotOutput.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("SlotOutput.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.inventory.slot;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java
index 95fd3d25c..131546425 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitForeignPaxels.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitForeignPaxels.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java
index 0cde605b8..75d009276 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitItems.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitItems.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java
index 4ee7a25fd..7ff24acd4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemAllToolAA.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemAllToolAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java
index ca1f386d9..fe4932fc9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAxeAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemAxeAA.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemAxeAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java
index 7baf5e9d5..4f80708d2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemBattery.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemBattery.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java
index 85380abdd..3ec17dcc9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemBooklet.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemBooklet.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
@@ -60,15 +60,13 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{
         if(player.isSneaking()){
             Block block = PosUtil.getBlock(pos, world);
             ItemStack blockStack = new ItemStack(block, 1, PosUtil.getMetadata(pos, world));
-            if(blockStack != null){
-                BookletPage page = BookletUtils.getFirstPageForStack(blockStack);
-                if(page != null){
-                    if(world.isRemote){
-                        forcedEntry = new EntrySet(page, page.getChapter(), page.getChapter().getEntry(), ActuallyAdditionsAPI.bookletEntries.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1);
-                    }
-                    this.onItemRightClick(stack, world, player, hand);
-                    return EnumActionResult.SUCCESS;
+            BookletPage page = BookletUtils.getFirstPageForStack(blockStack);
+            if(page != null){
+                if(world.isRemote){
+                    forcedEntry = new EntrySet(page, page.getChapter(), page.getChapter().getEntry(), ActuallyAdditionsAPI.bookletEntries.indexOf(page.getChapter().getEntry())/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1);
                 }
+                this.onItemRightClick(stack, world, player, hand);
+                return EnumActionResult.SUCCESS;
             }
         }
         return EnumActionResult.FAIL;
@@ -101,30 +99,28 @@ public class ItemBooklet extends ItemBase implements IHudDisplay{
             Block block = PosUtil.getBlock(posHit.getBlockPos(), minecraft.theWorld);
             if(block != null && !block.isAir(minecraft.theWorld.getBlockState(posHit.getBlockPos()), minecraft.theWorld, posHit.getBlockPos())){
                 ItemStack blockStack = new ItemStack(block, 1, PosUtil.getMetadata(posHit.getBlockPos(), minecraft.theWorld));
-                if(blockStack != null){
-                    int height = resolution.getScaledHeight()/5*3;
-                    if(player.isSneaking()){
-                        BookletPage page = BookletUtils.getFirstPageForStack(blockStack);
-                        if(page != null){
-                            String strg1 = page.getChapter().getLocalizedName();
-                            String strg2 = "Page "+page.getID();
-                            String strg3 = "Right-Click to open...";
+                int height = resolution.getScaledHeight()/5*3;
+                if(player.isSneaking()){
+                    BookletPage page = BookletUtils.getFirstPageForStack(blockStack);
+                    if(page != null){
+                        String strg1 = page.getChapter().getLocalizedName();
+                        String strg2 = "Page "+page.getID();
+                        String strg3 = "Right-Click to open...";
 
-                            AssetUtil.renderStackToGui(page.getChapter().getDisplayItemStack() != null ? page.getChapter().getDisplayItemStack() : new ItemStack(InitItems.itemBooklet), resolution.getScaledWidth()/2-10, height+41, 1F);
-                            minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg1, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg1)/2, height+20, StringUtil.DECIMAL_COLOR_WHITE);
-                            minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg2, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg2)/2, height+30, StringUtil.DECIMAL_COLOR_WHITE);
-                            minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.GOLD+strg3, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg3)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE);
-                        }
-                        else{
-                            String strg = TextFormatting.DARK_RED+"No Info available! Sorry :(";
-                            minecraft.fontRendererObj.drawStringWithShadow(strg, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE);
-                        }
+                        AssetUtil.renderStackToGui(page.getChapter().getDisplayItemStack() != null ? page.getChapter().getDisplayItemStack() : new ItemStack(InitItems.itemBooklet), resolution.getScaledWidth()/2-10, height+41, 1F);
+                        minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg1, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg1)/2, height+20, StringUtil.DECIMAL_COLOR_WHITE);
+                        minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.YELLOW+""+TextFormatting.ITALIC+strg2, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg2)/2, height+30, StringUtil.DECIMAL_COLOR_WHITE);
+                        minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.GOLD+strg3, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg3)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE);
                     }
                     else{
-                        String strg = TextFormatting.DARK_GREEN+""+TextFormatting.ITALIC+"Sneak!";
+                        String strg = TextFormatting.DARK_RED+"No Info available! Sorry :(";
                         minecraft.fontRendererObj.drawStringWithShadow(strg, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE);
                     }
                 }
+                else{
+                    String strg = TextFormatting.DARK_GREEN+""+TextFormatting.ITALIC+"Sneak!";
+                    minecraft.fontRendererObj.drawStringWithShadow(strg, resolution.getScaledWidth()/2-minecraft.fontRendererObj.getStringWidth(strg)/2, height+60, StringUtil.DECIMAL_COLOR_WHITE);
+                }
             }
         }
     }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java
index a2b0467d6..32797572e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemChestToCrateUpgrade.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemChestToCrateUpgrade.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java
index 7fb0cabc8..388dcbfda 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffee.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemCoffee.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemCoffee.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java
index 9e65ea4f8..003698d73 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCoffeeBean.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemCoffeeBean.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemCoffeeBean.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java
index ae6e6f355..f3443eff3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrafterOnAStick.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemCrafterOnAStick.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemCrafterOnAStick.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java
index 9dd9eb46a..44b1841aa 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemCrystal.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemCrystal.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
index 0d20dd8ab..00907f0c6 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemDrill.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemDrill.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java
index a3899da8a..79f1fd2f9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrillUpgrade.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemDrillUpgrade.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemDrillUpgrade.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java
index 1abfdd164..601538b90 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemDust.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemDust.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java
index 4bbfe18c9..5d7b51e9d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFertilizer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemFertilizer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemFertilizer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFireworkBoxMinecart.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFireworkBoxMinecart.java
index d217abf62..8c76e25eb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFireworkBoxMinecart.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFireworkBoxMinecart.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("ItemFireworkBoxMinecart.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.items;
 
 import de.ellpeck.actuallyadditions.mod.entity.EntityFireworkBoxMinecart;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java
index 8b0f32c60..1bebbe094 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemFoods.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemFoods.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java
index 3b1c5e464..6b215de75 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGeneric.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemGeneric.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemGeneric.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java
index 73ec81110..edcd69ddb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemGrowthRing.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemGrowthRing.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java
index c8cbcc13f..0d755aaf9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemHairyBall.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemHairyBall.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemHairyBall.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java
index 39aa9b4f2..dd95ae6e3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemJams.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemJams.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java
index 8b6b1e676..06da31f84 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemKnife.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemKnife.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemKnife.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java
index 2e723e48d..ba94a6f9c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemLaserWrench.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemLaserWrench.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
@@ -50,18 +50,20 @@ public class ItemLaserWrench extends ItemBase{
                 }
                 else{
                     BlockPos savedPos = ItemPhantomConnector.getStoredPosition(stack);
-                    TileEntity savedTile = world.getTileEntity(savedPos);
-                    if(ItemPhantomConnector.getStoredWorld(stack) == world && savedTile instanceof TileEntityLaserRelay && ((TileEntityLaserRelay)savedTile).isItem == ((TileEntityLaserRelay)tile).isItem && LaserRelayConnectionHandler.getInstance().addConnection(savedPos, pos)){
-                        ItemPhantomConnector.clearStorage(stack);
+                    if(savedPos != null){
+                        TileEntity savedTile = world.getTileEntity(savedPos);
+                        if(ItemPhantomConnector.getStoredWorld(stack) == world && savedTile instanceof TileEntityLaserRelay && ((TileEntityLaserRelay)savedTile).isItem == ((TileEntityLaserRelay)tile).isItem && LaserRelayConnectionHandler.getInstance().addConnection(savedPos, pos)){
+                            ItemPhantomConnector.clearStorage(stack);
 
-                        ((TileEntityLaserRelay)world.getTileEntity(savedPos)).sendUpdate();
-                        ((TileEntityLaserRelay)world.getTileEntity(pos)).sendUpdate();
+                            ((TileEntityLaserRelay)world.getTileEntity(savedPos)).sendUpdate();
+                            ((TileEntityLaserRelay)world.getTileEntity(pos)).sendUpdate();
 
-                        player.addChatComponentMessage(new TextComponentString(StringUtil.localize("tooltip."+ModUtil.MOD_ID+".laser.connected.desc")));
-                    }
-                    else{
-                        player.addChatComponentMessage(new TextComponentString(StringUtil.localize("tooltip."+ModUtil.MOD_ID+".laser.cantConnect.desc")));
-                        ItemPhantomConnector.clearStorage(stack);
+                            player.addChatComponentMessage(new TextComponentString(StringUtil.localize("tooltip."+ModUtil.MOD_ID+".laser.connected.desc")));
+                        }
+                        else{
+                            player.addChatComponentMessage(new TextComponentString(StringUtil.localize("tooltip."+ModUtil.MOD_ID+".laser.cantConnect.desc")));
+                            ItemPhantomConnector.clearStorage(stack);
+                        }
                     }
                 }
                 return EnumActionResult.SUCCESS;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java
index 92cbac320..5433cfed6 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemLeafBlower.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemLeafBlower.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java
index 6bf7110ae..81f94f184 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemMagnetRing.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemMagnetRing.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMinecartAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMinecartAA.java
index bd23205d4..bae0b854c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMinecartAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMinecartAA.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("ItemMinecartAA.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.items;
 
 import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java
index f4b689562..fe4970b63 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemMisc.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemMisc.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java
index 4fd624182..9b5cd5753 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemPhantomConnector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemPhantomConnector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java
index 663e570be..0039db059 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPickaxeAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemPickaxeAA.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemPickaxeAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java
index 9fe1c4f14..a0e07c307 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemPotionRing.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemPotionRing.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java
index 0f580e005..81b2a3778 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("ItemRarmorModuleReconstructor.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.items;
 
 import cofh.api.energy.IEnergyContainerItem;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java
index 1cee8bfe0..0cd6cfe18 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemResonantRice.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemResonantRice.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemResonantRice.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java
index e58bbfe55..4cab8b5a2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemShovelAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemShovelAA.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemShovelAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java
index 3faa54230..fe5d61eff 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSolidifiedExperience.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemSolidifiedExperience.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemSolidifiedExperience.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java
index 31cdb9117..a79f1f040 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemSpawnerChanger.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("ItemSpawnerChanger.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.items;
 
 import de.ellpeck.actuallyadditions.mod.config.ConfigValues;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java
index 7b5ca10f0..1d32fae1d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemTeleStaff.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemTeleStaff.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java
index b4852521b..c7e9b099b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemWaterRemovalRing.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemWaterRemovalRing.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java
index 50dca5adb..bfec90675 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWingsOfTheBats.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemWingsOfTheBats.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemWingsOfTheBats.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java
index 8a1a8ae15..0d67fe3b9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemArmorAA.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemArmorAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java
index 6e40d567d..a00dbb530 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemBase.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemBase.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java
index 98634a849..d25b51340 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemEnergy.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemEnergy.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java
index 8312c2da7..0e3cb1888 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemFoodBase.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemFoodBase.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java
index 8bc6bfdcc..419b83765 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemHoeAA.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemHoeAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java
index 1ff8c36a9..7fcfe94c4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSeed.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemSeed.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemSeed.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java
index 573bfa58a..f96611c28 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemSwordAA.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemSwordAA.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.base;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java
index aa46e8544..9c97e14cd 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemToolAA.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("ItemToolAA.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.items.base;
 
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java
index 5ba2e0d6c..9f40e9179 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/ItemLens.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemLens.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemLens.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.lens;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java
index 905e27d74..a4868ef1e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java
@@ -1,11 +1,11 @@
 /*
- * This file ("LensColor.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("LensColor.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.lens;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java
index e7151d65e..b775c93e2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java
@@ -1,11 +1,11 @@
 /*
- * This file ("LensDeath.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("LensDeath.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.lens;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java
index 96cccebea..2a602a22c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDetonation.java
@@ -1,11 +1,11 @@
 /*
- * This file ("LensDetonation.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("LensDetonation.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.lens;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java
index 62da1ae6d..bff78205a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("LensDisruption.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.items.lens;
 
 import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java
index 98c1c027a..5e175c355 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("LensNoneRecipeHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("LensRecipeHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.lens;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java
index 7a500c180..d24bb9df1 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/Lenses.java
@@ -1,11 +1,11 @@
 /*
- * This file ("Lenses.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("Lenses.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.lens;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java
index ab719ca13..2023c3912 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheCrystals.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TheCrystals.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TheCrystals.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.metalists;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java
index c54c6bea7..bdc3a222c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheDusts.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TheDusts.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TheDusts.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.metalists;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java
index 7d40f48ca..eeb5e2b97 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheFoods.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TheFoods.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TheFoods.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.metalists;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java
index 2056c0a79..b545cddac 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheJams.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TheJams.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TheJams.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.metalists;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java
index 556ceb3b6..e367a7a1f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TheMiscItems.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TheMiscItems.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.metalists;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java
index 4e1ade2f2..d38de6336 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ThePotionRings.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ThePotionRings.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.items.metalists;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java
index 8baa62f86..b14e09905 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java
@@ -1,11 +1,11 @@
 /*
- * This file ("JEIActuallyAdditionsPlugin.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("JEIActuallyAdditionsPlugin.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei;
@@ -34,11 +34,13 @@ import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
 import mezz.jei.api.recipe.transfer.IRecipeTransferRegistry;
 import net.minecraft.item.ItemStack;
 
+import javax.annotation.Nonnull;
+
 @JEIPlugin
 public class JEIActuallyAdditionsPlugin implements IModPlugin{
 
     @Override
-    public void register(IModRegistry registry){
+    public void register(@Nonnull IModRegistry registry){
         IJeiHelpers helpers = registry.getJeiHelpers();
 
         registry.addRecipeCategories(
@@ -98,7 +100,7 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin{
     }
 
     @Override
-    public void onRuntimeAvailable(IJeiRuntime jeiRuntime){
+    public void onRuntimeAvailable(@Nonnull IJeiRuntime jeiRuntime){
 
     }
 }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java
index 8c7507482..1be528381 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java
@@ -1,11 +1,11 @@
 /*
- * This file ("RecipeWrapperWithButton.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("RecipeWrapperWithButton.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java
index 89b47f6f9..cccb2e9cc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeCategory.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletRecipeCategory.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletRecipeCategory.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.booklet;
@@ -49,12 +49,12 @@ public class BookletRecipeCategory implements IRecipeCategory{
     }
 
     @Override
-    public void drawExtras(Minecraft minecraft){
+    public void drawExtras(@Nonnull Minecraft minecraft){
 
     }
 
     @Override
-    public void drawAnimations(Minecraft minecraft){
+    public void drawAnimations(@Nonnull Minecraft minecraft){
 
     }
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java
index ddae626ff..33a224d70 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletRecipeHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletRecipeHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.booklet;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java
index 00596b513..0462ce14a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java
@@ -1,11 +1,11 @@
 /*
- * This file ("BookletRecipeWrapper.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("BookletRecipeWrapper.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.booklet;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java
index 95c20d762..a11f109d0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CoffeeMachineRecipeCategory.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CoffeeMachineRecipeCategory.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.coffee;
@@ -49,12 +49,12 @@ public class CoffeeMachineRecipeCategory implements IRecipeCategory{
     }
 
     @Override
-    public void drawExtras(Minecraft minecraft){
+    public void drawExtras(@Nonnull Minecraft minecraft){
 
     }
 
     @Override
-    public void drawAnimations(Minecraft minecraft){
+    public void drawAnimations(@Nonnull Minecraft minecraft){
 
     }
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java
index e2c796052..5183f9605 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CoffeeMachineRecipeHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CoffeeMachineRecipeHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.coffee;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java
index 80f04422e..e9ec62477 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CoffeeMachineRecipeWrapper.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CoffeeMachineRecipeWrapper.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.coffee;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java
index d00501956..d35fc4345 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CrusherRecipeCategor.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CrusherRecipeCategory.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.crusher;
@@ -52,12 +52,12 @@ public class CrusherRecipeCategory implements IRecipeCategory{
     }
 
     @Override
-    public void drawExtras(Minecraft minecraft){
+    public void drawExtras(@Nonnull Minecraft minecraft){
 
     }
 
     @Override
-    public void drawAnimations(Minecraft minecraft){
+    public void drawAnimations(@Nonnull Minecraft minecraft){
 
     }
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeHandler.java
index 698e59d7a..12d04e76d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CrusherRecipeHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CrusherRecipeHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.crusher;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java
index 6326b1c93..13b48b5f3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CrusherRecipeWrapper.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CrusherRecipeWrapper.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.crusher;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java
index 6608d1111..a5eb30d0d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeCategory.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ReconstructorRecipeCategory.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ReconstructorRecipeCategory.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.reconstructor;
@@ -52,12 +52,12 @@ public class ReconstructorRecipeCategory implements IRecipeCategory{
     }
 
     @Override
-    public void drawExtras(Minecraft minecraft){
+    public void drawExtras(@Nonnull Minecraft minecraft){
         AssetUtil.renderStackToGui(RECONSTRUCTOR, 34, 19, 1.0F);
     }
 
     @Override
-    public void drawAnimations(Minecraft minecraft){
+    public void drawAnimations(@Nonnull Minecraft minecraft){
 
     }
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java
index ed8e90b36..10370ed68 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ReconstructorRecipeHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ReconstructorRecipeHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.reconstructor;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java
index c2f270e24..3caf25099 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ReconstructorRecipeWrapper.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ReconstructorRecipeWrapper.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.jei.reconstructor;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java
index c08369f8c..dbcf3b8d6 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitArmorMaterials.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitArmorMaterials.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitArmorMaterials.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.material;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java
index c645223e2..e6b8e299a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/material/InitToolMaterials.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitToolMaterials.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitToolMaterials.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.material;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java
index 20433ae43..98eca7a82 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/BannerHelper.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("BannerHelper.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.misc;
 
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java
index 3f0d7d5cd..8a066e6b7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DamageSources.java
@@ -1,11 +1,11 @@
 /*
- * This file ("DamageSources.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("DamageSources.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java
index 31f093b83..48f21c546 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java
@@ -1,11 +1,11 @@
 /*
- * This file ("DispenserHandlerFertilize.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("DispenserHandlerFertilize.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java
index f8235e5e5..2f38f0a32 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DungeonLoot.java
@@ -1,11 +1,11 @@
 /*
- * This file ("DungeonLoot.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("DungeonLoot.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java
index e2753ae57..eb8523558 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/EntityColoredParticleFX.java
@@ -1,11 +1,11 @@
 /*
- * This file ("EntityColoredParticleFX.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("EntityColoredParticleFX.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java
index 9c6e2427a..4c1eb9d9e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("LaserRelayConnectionHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("LaserRelayConnectionHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc;
@@ -132,7 +132,7 @@ public class LaserRelayConnectionHandler{
             firstNetwork.connections.add(new ConnectionPair(firstRelay, secondRelay));
         }
         //Only second network exists
-        else if(secondNetwork != null){
+        else{
             secondNetwork.connections.add(new ConnectionPair(firstRelay, secondRelay));
         }
         WorldData.makeDirty();
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/MethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/MethodHandler.java
index 7ab847f44..12f6fcc95 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/MethodHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/MethodHandler.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("MethodHandler.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.misc;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java
index 3c188adcd..a4174845c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/SoundHandler.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("SoundHandler.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.misc;
 
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java
index b551acbb7..20f8a26a4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java
@@ -1,11 +1,11 @@
 /*
- * This file ("WorldData.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("WorldData.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java
index 832b13f30..da8871f7b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/ISmileyCloudEasterEgg.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ISmileyCloudEasterEgg.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ISmileyCloudEasterEgg.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc.cloud;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java
index 977152179..13d1adcb7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java
@@ -1,11 +1,11 @@
 /*
- * This file ("SmileyCloudEasterEggs.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("SmileyCloudEasterEggs.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc.cloud;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java
index 41bbca263..9f7303753 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java
@@ -1,11 +1,11 @@
 /*
- * This file ("RenderSpecial.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("RenderSpecial.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc.special;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java
index be90ec6cd..4888f758a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java
@@ -1,11 +1,11 @@
 /*
- * This file ("SpecialRenderInit.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("SpecialRenderInit.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc.special;
@@ -36,7 +36,7 @@ public class SpecialRenderInit{
     public static void parse(Properties properties){
         for(String key : properties.stringPropertyNames()){
             String[] values = properties.getProperty(key).split("@");
-            if(values != null && values.length > 0){
+            if(values.length > 0){
                 String itemName = values[0];
 
                 int meta;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java
index 6fce22f5c..516232490 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/ThreadSpecialFetcher.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ThreadSpecialFetcher.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ThreadSpecialFetcher.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.misc.special;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java
index d4c570a6e..63c0385c3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("INEIRecipeHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("INEIRecipeHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java
index 37d43ec4d..e26b9dcc3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEIActuallyAdditionsConfig.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEIActuallyAdditionsConfig.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java
index 5aa9843ce..1e826e08d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEIBookletRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEIBookletRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java
index aec86f53e..8b5de32e5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEICoffeeMachineRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEICoffeeMachineRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java
index 9c4bbed13..df4c32ba2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEICompostRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEICompostRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java
index 86feeffe4..23db6e621 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEICrusherRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEICrusherRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java
index 40a3ff087..6c8653919 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEIFurnaceDoubleRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEIFurnaceDoubleRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java
index a7b1c3ad9..363917801 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEIHairyBallRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEIHairyBallRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java
index eb2d06c85..43f4b8dea 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEIReconstructorRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEIReconstructorRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java
index 86f29539d..acc580ca5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEIScreenEvents.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEIScreenEvents.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java
index 0c0ec8e33..dc81fb8e5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java
@@ -1,11 +1,11 @@
 /*
- * This file ("NEITreasureChestRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("NEITreasureChestRecipe.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.nei;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java
index 0f8e48585..10e43d8d2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PacketHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PacketHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.network;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java
index 11b95a104..e3f69eb5f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketParticle.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PacketParticle.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PacketParticle.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.network;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketUpdateTileEntity.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketUpdateTileEntity.java
index c69f908dc..2983d6f6b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketUpdateTileEntity.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketUpdateTileEntity.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PacketUpdateTileEntity.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PacketUpdateTileEntity.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.network;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java
index 3e46569b8..936d19ec5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IButtonReactor.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IButtonReactor.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IButtonReactor.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.network.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java
index 93fb7f525..3b6e87c22 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/INumberReactor.java
@@ -1,11 +1,11 @@
 /*
- * This file ("INumberReactor.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("INumberReactor.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.network.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java
index f3e6c9fc9..786cbfbc1 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/IStringReactor.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IStringReactor.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IStringReactor.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.network.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java
index 017310db8..445699555 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiButton.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PacketGuiButton.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PacketGuiButton.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.network.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java
index 37f9d162f..df773b034 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiNumber.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PacketGuiNumber.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PacketGuiNumber.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.network.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java
index 5db75eb07..a8bbe7456 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/gui/PacketGuiString.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PacketGuiString.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PacketGuiString.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.network.gui;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java
index dcf06e9ba..4fb863ddd 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ore/InitOreDict.java
@@ -1,11 +1,11 @@
 /*
- * This file ("InitOreDict.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("InitOreDict.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.ore;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java
index 9bcf39d80..5cb1fb702 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ClientProxy.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ClientProxy.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.proxy;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java
index d319fff77..b8ddd495c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IProxy.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IProxy.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.proxy;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java
index 15bbd6199..5f21fead0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ServerProxy.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ServerProxy.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.proxy;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java
index 1c26d7e77..677381eca 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/CrusherRecipeRegistry.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CrusherRecipeRegistry.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CrusherRecipeRegistry.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.recipe;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java
index 080f057f9..4df41d6c9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/FuelHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("FuelHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("FuelHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.recipe;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java
index 0adf325fd..39bdc73cc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/HairyBallHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("HairyBallHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("HairyBallHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.recipe;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java
index 76b96dc15..74d34d374 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/TreasureChestHandler.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TreasureChestHandler.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TreasureChestHandler.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.recipe;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java
index 59113953f..be0601cfd 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IEnergyDisplay.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IEnergyDisplay.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergySaver.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergySaver.java
index c6f432f56..d96edb3e7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergySaver.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergySaver.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IEnergySaver.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IEnergySaver.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IFluidSaver.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IFluidSaver.java
index f6ac5393b..c96800dd3 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IFluidSaver.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IFluidSaver.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IFluidSaver.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IFluidSaver.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IRedstoneToggle.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IRedstoneToggle.java
index ca5712b50..d1aed5785 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IRedstoneToggle.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IRedstoneToggle.java
@@ -1,11 +1,11 @@
 /*
- * This file ("IRedstoneToggle.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("IRedstoneToggle.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java
index 77c8f61f9..90d5b65f2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityAtomicReconstructor.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityAtomicReconstructor.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java
index 1e53019ea..715985108 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityBase.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityBase.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java
index b927e26ab..7d03154bf 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBreaker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityBreaker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityBreaker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
@@ -81,30 +81,28 @@ public class TileEntityBreaker extends TileEntityInventoryBase implements IRedst
         EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(PosUtil.getMetadata(this.pos, this.worldObj));
 
         BlockPos coordsBlock = WorldUtil.getCoordsFromSide(sideToManipulate, this.pos, 0);
-        if(coordsBlock != null){
-            Block blockToBreak = PosUtil.getBlock(coordsBlock, this.worldObj);
-            IBlockState stateToBreak = this.worldObj.getBlockState(coordsBlock);
-            if(!this.isPlacer && blockToBreak != null && !(blockToBreak instanceof BlockAir) && blockToBreak.getBlockHardness(stateToBreak, this.worldObj, coordsBlock) > -1.0F){
-                List<ItemStack> drops = blockToBreak.getDrops(this.worldObj, coordsBlock, stateToBreak, 0);
-                float chance = ForgeEventFactory.fireBlockHarvesting(drops, this.worldObj, coordsBlock, this.worldObj.getBlockState(coordsBlock), 0, 1, false, null);
+        Block blockToBreak = PosUtil.getBlock(coordsBlock, this.worldObj);
+        IBlockState stateToBreak = this.worldObj.getBlockState(coordsBlock);
+        if(!this.isPlacer && blockToBreak != null && !(blockToBreak instanceof BlockAir) && blockToBreak.getBlockHardness(stateToBreak, this.worldObj, coordsBlock) > -1.0F){
+            List<ItemStack> drops = blockToBreak.getDrops(this.worldObj, coordsBlock, stateToBreak, 0);
+            float chance = ForgeEventFactory.fireBlockHarvesting(drops, this.worldObj, coordsBlock, this.worldObj.getBlockState(coordsBlock), 0, 1, false, null);
 
-                if(Util.RANDOM.nextFloat() <= chance){
-                    if(WorldUtil.addToInventory(this, drops, false, true)){
-                        if(!ConfigValues.lessBlockBreakingEffects){
-                            this.worldObj.playAuxSFX(2001, coordsBlock, Block.getStateId(stateToBreak));
-                        }
-                        WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.pos);
-                        WorldUtil.addToInventory(this, drops, true, true);
-                        this.markDirty();
+            if(Util.RANDOM.nextFloat() <= chance){
+                if(WorldUtil.addToInventory(this, drops, false, true)){
+                    if(!ConfigValues.lessBlockBreakingEffects){
+                        this.worldObj.playAuxSFX(2001, coordsBlock, Block.getStateId(stateToBreak));
                     }
+                    WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.pos);
+                    WorldUtil.addToInventory(this, drops, true, true);
+                    this.markDirty();
                 }
             }
-            else if(this.isPlacer){
-                int theSlot = WorldUtil.findFirstFilledSlot(this.slots);
-                this.setInventorySlotContents(theSlot, WorldUtil.useItemAtSide(sideToManipulate, this.worldObj, this.pos, this.slots[theSlot]));
-                if(this.slots[theSlot] != null && this.slots[theSlot].stackSize <= 0){
-                    this.slots[theSlot] = null;
-                }
+        }
+        else if(this.isPlacer){
+            int theSlot = WorldUtil.findFirstFilledSlot(this.slots);
+            this.setInventorySlotContents(theSlot, WorldUtil.useItemAtSide(sideToManipulate, this.worldObj, this.pos, this.slots[theSlot]));
+            if(this.slots[theSlot] != null && this.slots[theSlot].stackSize <= 0){
+                this.slots[theSlot] = null;
             }
         }
     }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java
index d11cfdab2..0f32c69eb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityCanolaPress.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityCanolaPress.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java
index 1700ea0b6..ed536e6d0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityCoalGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityCoalGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java
index b004276f2..a91b7d92a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityCoffeeMachine.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityCoffeeMachine.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java
index 5f9993bec..fdcd75c26 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCompost.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityCompost.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityCompost.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java
index e4788635a..45872dd8c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityDirectionalBreaker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityDirectionalBreaker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
@@ -84,22 +84,20 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem
 
             for(int i = 0; i < RANGE; i++){
                 BlockPos coordsBlock = WorldUtil.getCoordsFromSide(sideToManipulate, this.pos, i);
-                if(coordsBlock != null){
-                    Block blockToBreak = PosUtil.getBlock(coordsBlock, this.worldObj);
-                    if(blockToBreak != null && !(blockToBreak instanceof BlockAir) && blockToBreak.getBlockHardness(this.worldObj.getBlockState(coordsBlock), this.worldObj, this.pos) > -1.0F){
-                        List<ItemStack> drops = blockToBreak.getDrops(this.worldObj, coordsBlock, this.worldObj.getBlockState(coordsBlock), 0);
-                        float chance = ForgeEventFactory.fireBlockHarvesting(drops, this.worldObj, coordsBlock, this.worldObj.getBlockState(coordsBlock), 0, 1, false, null);
+                Block blockToBreak = PosUtil.getBlock(coordsBlock, this.worldObj);
+                if(blockToBreak != null && !(blockToBreak instanceof BlockAir) && blockToBreak.getBlockHardness(this.worldObj.getBlockState(coordsBlock), this.worldObj, this.pos) > -1.0F){
+                    List<ItemStack> drops = blockToBreak.getDrops(this.worldObj, coordsBlock, this.worldObj.getBlockState(coordsBlock), 0);
+                    float chance = ForgeEventFactory.fireBlockHarvesting(drops, this.worldObj, coordsBlock, this.worldObj.getBlockState(coordsBlock), 0, 1, false, null);
 
-                        if(Util.RANDOM.nextFloat() <= chance){
-                            if(WorldUtil.addToInventory(this, drops, false, true)){
-                                if(!ConfigValues.lessBlockBreakingEffects){
-                                    this.worldObj.playAuxSFX(2001, coordsBlock, Block.getStateId(this.worldObj.getBlockState(coordsBlock)));
-                                }
-                                WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.getPos(), i);
-                                WorldUtil.addToInventory(this, drops, true, true);
-                                this.storage.extractEnergy(ENERGY_USE, false);
-                                this.markDirty();
+                    if(Util.RANDOM.nextFloat() <= chance){
+                        if(WorldUtil.addToInventory(this, drops, false, true)){
+                            if(!ConfigValues.lessBlockBreakingEffects){
+                                this.worldObj.playAuxSFX(2001, coordsBlock, Block.getStateId(this.worldObj.getBlockState(coordsBlock)));
                             }
+                            WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.getPos(), i);
+                            WorldUtil.addToInventory(this, drops, true, true);
+                            this.storage.extractEnergy(ENERGY_USE, false);
+                            this.markDirty();
                         }
                     }
                 }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java
index 81211d751..3811eeafc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDropper.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityDropper.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityDropper.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java
index 7b9059379..8ea0bdef1 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityEnergizer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityEnergizer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java
index 852eec83a..211d74a9e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityEnervator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityEnervator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java
index ee2437aee..c57c2d6aa 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFeeder.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityFeeder.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityFeeder.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java
index b2775098e..5b53cac26 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityFermentingBarrel.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityFermentingBarrel.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java
index 313b5355b..b5c044993 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityFireworkBox.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityFireworkBox.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java
index ce0cb97e8..31f6cd66b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFishingNet.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityFishingNet.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityFishingNet.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java
index e83c081d0..08b922cb5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityFluidCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityFluidCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
@@ -60,39 +60,37 @@ public class TileEntityFluidCollector extends TileEntityBase implements IFluidHa
         EnumFacing sideToManipulate = WorldUtil.getDirectionByPistonRotation(PosUtil.getMetadata(this.pos, this.worldObj));
         BlockPos coordsBlock = WorldUtil.getCoordsFromSide(sideToManipulate, this.pos, 0);
 
-        if(coordsBlock != null){
-            Block blockToBreak = PosUtil.getBlock(coordsBlock, this.worldObj);
-            if(!this.isPlacer && blockToBreak != null && PosUtil.getMetadata(coordsBlock, this.worldObj) == 0 && Util.BUCKET <= this.tank.getCapacity()-this.tank.getFluidAmount()){
-                if(blockToBreak instanceof IFluidBlock && ((IFluidBlock)blockToBreak).getFluid() != null){
-                    if(this.tank.fill(new FluidStack(((IFluidBlock)blockToBreak).getFluid(), Util.BUCKET), false) >= Util.BUCKET){
-                        this.tank.fill(new FluidStack(((IFluidBlock)blockToBreak).getFluid(), Util.BUCKET), true);
-                        WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.pos);
-                    }
-                }
-                else if(blockToBreak == Blocks.LAVA || blockToBreak == Blocks.FLOWING_LAVA){
-                    if(this.tank.fill(new FluidStack(FluidRegistry.LAVA, Util.BUCKET), false) >= Util.BUCKET){
-                        this.tank.fill(new FluidStack(FluidRegistry.LAVA, Util.BUCKET), true);
-                        WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.pos);
-                    }
-                }
-                else if(blockToBreak == Blocks.WATER || blockToBreak == Blocks.FLOWING_WATER){
-                    if(this.tank.fill(new FluidStack(FluidRegistry.WATER, Util.BUCKET), false) >= Util.BUCKET){
-                        this.tank.fill(new FluidStack(FluidRegistry.WATER, Util.BUCKET), true);
-                        WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.pos);
-                    }
+        Block blockToBreak = PosUtil.getBlock(coordsBlock, this.worldObj);
+        if(!this.isPlacer && blockToBreak != null && PosUtil.getMetadata(coordsBlock, this.worldObj) == 0 && Util.BUCKET <= this.tank.getCapacity()-this.tank.getFluidAmount()){
+            if(blockToBreak instanceof IFluidBlock && ((IFluidBlock)blockToBreak).getFluid() != null){
+                if(this.tank.fill(new FluidStack(((IFluidBlock)blockToBreak).getFluid(), Util.BUCKET), false) >= Util.BUCKET){
+                    this.tank.fill(new FluidStack(((IFluidBlock)blockToBreak).getFluid(), Util.BUCKET), true);
+                    WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.pos);
                 }
             }
-            else if(this.isPlacer && PosUtil.getBlock(coordsBlock, this.worldObj).isReplaceable(this.worldObj, coordsBlock)){
-                if(this.tank.getFluidAmount() >= Util.BUCKET){
-                    Block block = this.tank.getFluid().getFluid().getBlock();
-                    if(block != null){
-                        BlockPos offsetPos = this.pos.offset(sideToManipulate);
-                        Block blockPresent = PosUtil.getBlock(offsetPos, this.worldObj);
-                        boolean placeable = !(blockPresent instanceof BlockLiquid) && !(blockPresent instanceof IFluidBlock) && blockPresent.isReplaceable(this.worldObj, offsetPos);
-                        if(placeable){
-                            PosUtil.setBlock(offsetPos, this.worldObj, block, 0, 3);
-                            this.tank.drain(Util.BUCKET, true);
-                        }
+            else if(blockToBreak == Blocks.LAVA || blockToBreak == Blocks.FLOWING_LAVA){
+                if(this.tank.fill(new FluidStack(FluidRegistry.LAVA, Util.BUCKET), false) >= Util.BUCKET){
+                    this.tank.fill(new FluidStack(FluidRegistry.LAVA, Util.BUCKET), true);
+                    WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.pos);
+                }
+            }
+            else if(blockToBreak == Blocks.WATER || blockToBreak == Blocks.FLOWING_WATER){
+                if(this.tank.fill(new FluidStack(FluidRegistry.WATER, Util.BUCKET), false) >= Util.BUCKET){
+                    this.tank.fill(new FluidStack(FluidRegistry.WATER, Util.BUCKET), true);
+                    WorldUtil.breakBlockAtSide(sideToManipulate, this.worldObj, this.pos);
+                }
+            }
+        }
+        else if(this.isPlacer && PosUtil.getBlock(coordsBlock, this.worldObj).isReplaceable(this.worldObj, coordsBlock)){
+            if(this.tank.getFluidAmount() >= Util.BUCKET){
+                Block block = this.tank.getFluid().getFluid().getBlock();
+                if(block != null){
+                    BlockPos offsetPos = this.pos.offset(sideToManipulate);
+                    Block blockPresent = PosUtil.getBlock(offsetPos, this.worldObj);
+                    boolean placeable = !(blockPresent instanceof BlockLiquid) && !(blockPresent instanceof IFluidBlock) && blockPresent.isReplaceable(this.worldObj, offsetPos);
+                    if(placeable){
+                        PosUtil.setBlock(offsetPos, this.worldObj, block, 0, 3);
+                        this.tank.drain(Util.BUCKET, true);
                     }
                 }
             }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidPlacer.java
index fcbf2bed1..ce5084996 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidPlacer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidPlacer.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityFluidPlacer.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 public class TileEntityFluidPlacer extends TileEntityFluidCollector{
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java
index 95bae6e95..7e87da414 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityFurnaceDouble.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityFurnaceDouble.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java
index ed4740804..93438f8c0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityFurnaceSolar.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityFurnaceSolar.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java
index 5c22be285..dbab33fdc 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityGiantChest.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityGiantChest.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java
index 4dfdaac40..dc9961d52 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGreenhouseGlass.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityGreenhouseGlass.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityGreenhouseGlass.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
@@ -68,8 +68,8 @@ public class TileEntityGreenhouseGlass extends TileEntityBase{
     }
 
     public BlockPos blockToFertilize(){
-        for(int i = -1; i > 0; i--){
-            BlockPos offset = PosUtil.offset(this.pos, 0, i, 0);
+        for(int i = this.pos.getY()-1; i > 0; i--){
+            BlockPos offset = new BlockPos(this.pos.getX(), i, this.pos.getZ());
             Block block = PosUtil.getBlock(this.pos, this.worldObj);
             if(block != null && !(this.worldObj.isAirBlock(offset))){
                 if((block instanceof IGrowable || block instanceof IPlantable) && !(block instanceof BlockGrass)){
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java
index 6aa38d368..f1da78834 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityGrinder.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityGrinder.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java
index ca111de61..1a9bb167f 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinderDouble.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityGrinderDouble.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 public class TileEntityGrinderDouble extends TileEntityGrinder{
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java
index 04703218f..ff98d7cea 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityHeatCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityHeatCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java
index 19010a69f..a7a1b386a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityInputter.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityInputter.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputterAdvanced.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputterAdvanced.java
index 0845f636f..f4d7739bd 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputterAdvanced.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputterAdvanced.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityInputterAdvanced.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 public class TileEntityInputterAdvanced extends TileEntityInputter{
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java
index 884dd300c..3b8a9e1f1 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityInventoryBase.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityInventoryBase.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java
index 554233eb2..c9f25474d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityItemRepairer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityItemRepairer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java
index 15084e533..0107bce58 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityItemViewer.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler;
@@ -8,6 +18,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.items.IItemHandler;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -31,17 +42,19 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
 
     private SpecificItemHandlerInfo getSwitchedIndexHandler(int i){
         List<GenericItemHandlerInfo> infos = this.getItemHandlerInfos();
-        Collections.sort(infos);
-        int currentI = 0;
         if(infos != null && !infos.isEmpty()){
-            for(GenericItemHandlerInfo info : infos){
-                for(IItemHandler handler : info.handlers){
-                    int slotAmount = handler.getSlots();
-                    if(currentI+slotAmount > i){
-                        return new SpecificItemHandlerInfo(handler, i-currentI, info.relayInQuestion);
-                    }
-                    else{
-                        currentI += slotAmount;
+            Collections.sort(infos);
+            int currentI = 0;
+            if(!infos.isEmpty()){
+                for(GenericItemHandlerInfo info : infos){
+                    for(IItemHandler handler : info.handlers){
+                        int slotAmount = handler.getSlots();
+                        if(currentI+slotAmount > i){
+                            return new SpecificItemHandlerInfo(handler, i-currentI, info.relayInQuestion);
+                        }
+                        else{
+                            currentI += slotAmount;
+                        }
                     }
                 }
             }
@@ -92,7 +105,7 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
     private boolean isWhitelisted(SpecificItemHandlerInfo handler, ItemStack stack){
         boolean whitelisted = handler.relayInQuestion.isWhitelisted(stack);
         TileEntityLaserRelayItem connected = this.getConnectedRelay();
-        if(connected != handler.relayInQuestion){
+        if(connected != null && connected != handler.relayInQuestion){
             return whitelisted && connected.isWhitelisted(stack);
         }
         else{
@@ -223,19 +236,19 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
         }
 
         @Override
-        public int compareTo(GenericItemHandlerInfo other){
-            if(other != null){
-                boolean thisWhitelist = this.relayInQuestion instanceof TileEntityLaserRelayItemWhitelist;
-                boolean otherWhitelist = other.relayInQuestion instanceof TileEntityLaserRelayItemWhitelist;
+        public int compareTo(@Nonnull GenericItemHandlerInfo other){
+            boolean thisWhitelist = this.relayInQuestion instanceof TileEntityLaserRelayItemWhitelist;
+            boolean otherWhitelist = other.relayInQuestion instanceof TileEntityLaserRelayItemWhitelist;
 
-                if(!thisWhitelist && otherWhitelist){
-                    return 1;
-                }
-                else if(thisWhitelist && !otherWhitelist){
-                    return -1;
-                }
+            if(!thisWhitelist && otherWhitelist){
+                return 1;
+            }
+            else if(thisWhitelist && !otherWhitelist){
+                return -1;
+            }
+            else{
+                return 0;
             }
-            return 0;
         }
     }
 }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java
index 2979da094..8568574fb 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityLaserRelay.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityLaserRelay.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java
index 3d6add3c4..447a140b0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityLaserRelayEnergy.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import cofh.api.energy.IEnergyReceiver;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java
index 545ca07ff..ffe069c0b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityLaserRelayItem.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java
index 32eeff4a5..5acf816e8 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityLaserRelayItemWhitelist.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java
index df91f798e..89c2118db 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityLavaFactoryController.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityLavaFactoryController.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java
index e95cf7373..29094edb5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityLeafGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityLeafGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java
index 71218f421..50294e2ee 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityMiner.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityMiner.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java
index 970dd4a83..199c8576a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityOilGenerator.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityOilGenerator.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java
index b2e5a5753..c1c3a2841 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBooster.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityPhantomBooster.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityPhantomBooster.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBreaker.java
index 2985f6214..9dcedab03 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBreaker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomBreaker.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityPhantomBreaker.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 public class TileEntityPhantomBreaker extends TileEntityPhantomPlacer{
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java
index 82dbc792b..5b3abc9ec 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityPhantomEnergyface.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityPhantomEnergyface.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java
index 145c3378a..bdf5bc832 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityPhantomItemface.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityPhantomItemface.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java
index 7a890b370..1692a5467 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityPhantomLiquiface.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityPhantomLiquiface.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java
index 029a59b26..0c077bfce 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomPlacer.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityPhantomPlacer.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityPhantomPlacer.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java
index bda187eec..bc1383612 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomRedstoneface.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityPhantomRedstoneface.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import net.minecraft.block.Block;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java
index bcd426668..1bb0c119a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomface.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityPhantomface.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityPhantomface.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlacer.java
index efc71d633..8161fcae0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlacer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlacer.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("TileEntityPlacer.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.tile;
 
 public class TileEntityPlacer extends TileEntityBreaker{
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java
index 603d11e5e..3c9f3d194 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityRangedCollector.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityRangedCollector.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityRangedCollector.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java
index 839960dba..1f48b2241 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntitySmileyCloud.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntitySmileyCloud.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntitySmileyCloud.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java
index 5a09920e0..b59203d13 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java
@@ -1,11 +1,11 @@
 /*
- * This file ("TileEntityXPSolidifier.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("TileEntityXPSolidifier.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.tile;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java
index 3f75021c1..26268a2d7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ThreadUpdateChecker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ThreadUpdateChecker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.update;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java
index cf2d896ab..e524f6705 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java
@@ -1,11 +1,11 @@
 /*
- * This file ("UpdateChecker.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("UpdateChecker.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.update;
@@ -17,7 +17,7 @@ import de.ellpeck.actuallyadditions.mod.util.Util;
 public class UpdateChecker{
 
     public static final String DOWNLOAD_LINK = "http://ellpeck.de/actadddownload";
-    public static final String CHANGELOG_LINK = "http://ellpeck.de/actaddchangelog/";
+    public static final String CHANGELOG_LINK = "http://ellpeck.de/actaddchangelog";
     public static boolean checkFailed;
     public static boolean needsUpdateNotify;
     public static int updateVersionInt;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java
index a7b7c691e..7c8709710 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateCheckerClientNotificationEvent.java
@@ -1,11 +1,11 @@
 /*
- * This file ("UpdateCheckerClientNotificationEvent.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("UpdateCheckerClientNotificationEvent.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.update;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
index 23e317e3e..543ed5d11 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
@@ -1,11 +1,11 @@
 /*
- * This file ("AssetUtil.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("AssetUtil.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java
index f07454a4a..b0c69d660 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/CompatUtil.java
@@ -1,11 +1,11 @@
 /*
- * This file ("CompatUtil.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("CompatUtil.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FakePlayerUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FakePlayerUtil.java
index 89eed29d7..bb9ad1ad7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FakePlayerUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FakePlayerUtil.java
@@ -1,11 +1,11 @@
 /*
- * This file ("FakePlayerUtil.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("FakePlayerUtil.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java
index 372c81316..c1611bb95 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java
@@ -1,11 +1,11 @@
 /*
- * This file ("FluidStateMapper.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("FluidStateMapper.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java
index ba8fc0fd1..6df817aa9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java
@@ -1,3 +1,13 @@
+/*
+ * This file ("IColorProvidingItem.java") is part of the Actually Additions mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015-2016 Ellpeck Ellpeck
+ */
+
 package de.ellpeck.actuallyadditions.mod.util;
 
 import net.minecraft.client.renderer.color.IItemColor;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java
index bbee0a09a..4b24dffe9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ItemUtil.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ItemUtil.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ItemUtil.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ModUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ModUtil.java
index 1f4d68da4..5d6922e7a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ModUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ModUtil.java
@@ -1,11 +1,11 @@
 /*
- * This file ("ModUtil.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("ModUtil.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/PosUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/PosUtil.java
index b84b4d060..94d01ad84 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/PosUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/PosUtil.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PosUtil.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PosUtil.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java
index 53db6ddfb..5ce6162fa 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java
@@ -1,11 +1,11 @@
 /*
- * This file ("RecipeUtil.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("RecipeUtil.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java
index 508a3f4f4..08415eb40 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StringUtil.java
@@ -1,11 +1,11 @@
 /*
- * This file ("StringUtil.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("StringUtil.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java
index da45f63bb..ad545e38e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java
@@ -1,11 +1,11 @@
 /*
- * This file ("Util.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("Util.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
index d964ef0ba..e8b1203a5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
@@ -1,11 +1,11 @@
 /*
- * This file ("WorldUtil.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("WorldUtil.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util;
@@ -79,10 +79,7 @@ public class WorldUtil{
 
     public static TileEntity getTileEntityFromSide(EnumFacing side, World world, BlockPos pos){
         BlockPos c = getCoordsFromSide(side, pos, 0);
-        if(c != null){
-            return world.getTileEntity(c);
-        }
-        return null;
+        return world.getTileEntity(c);
     }
 
     /**
@@ -169,13 +166,11 @@ public class WorldUtil{
 
     public static void dropItemAtSide(EnumFacing side, World world, BlockPos pos, ItemStack stack){
         BlockPos coords = getCoordsFromSide(side, pos, 0);
-        if(coords != null){
-            EntityItem item = new EntityItem(world, coords.getX()+0.5, coords.getY()+0.5, coords.getZ()+0.5, stack);
-            item.motionX = 0;
-            item.motionY = 0;
-            item.motionZ = 0;
-            world.spawnEntityInWorld(item);
-        }
+        EntityItem item = new EntityItem(world, coords.getX()+0.5, coords.getY()+0.5, coords.getZ()+0.5, stack);
+        item.motionX = 0;
+        item.motionY = 0;
+        item.motionZ = 0;
+        world.spawnEntityInWorld(item);
     }
 
     public static EnumFacing getDirectionBySidesInOrder(int side){
@@ -259,7 +254,7 @@ public class WorldUtil{
         }
 
         //Load the slots again
-        if(!actuallyDo && backupSlots != null){
+        if(!actuallyDo){
             for(int i = 0; i < backupSlots.length; i++){
                 inventory.setInventorySlotContents(i, backupSlots[i]);
             }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java
index d20c3e30c..750a7a699 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentClientData.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PersistentClientData.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PersistentClientData.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util.playerdata;
@@ -34,20 +34,20 @@ public class PersistentClientData{
     public static void saveBookPage(GuiBooklet gui){
         NBTTagCompound baseCompound = getBaseCompound();
         NBTTagCompound worldCompound = getCompoundForWorld(baseCompound);
-        //Save Entry etc.
         if(worldCompound != null){
+            //Save Entry etc.
             worldCompound.setTag("SavedEntry", gui.currentEntrySet.writeToNBT());
             worldCompound.setString("SearchWord", gui.searchField.getText());
-        }
 
-        //Save Bookmarks
-        NBTTagList list = new NBTTagList();
-        for(int i = 0; i < gui.bookmarkButtons.length; i++){
-            BookmarkButton button = (BookmarkButton)gui.bookmarkButtons[i];
+            //Save Bookmarks
+            NBTTagList list = new NBTTagList();
+            for(int i = 0; i < gui.bookmarkButtons.length; i++){
+                BookmarkButton button = (BookmarkButton)gui.bookmarkButtons[i];
 
-            list.appendTag(button.assignedEntry.writeToNBT());
+                list.appendTag(button.assignedEntry.writeToNBT());
+            }
+            worldCompound.setTag("Bookmarks", list);
         }
-        worldCompound.setTag("Bookmarks", list);
 
         writeCompound(baseCompound, worldCompound);
     }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java
index 80bcb3501..6833c403b 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/playerdata/PersistentServerData.java
@@ -1,11 +1,11 @@
 /*
- * This file ("PersistentServerData.java") is part of the Actually Additions Mod for Minecraft.
+ * This file ("PersistentServerData.java") is part of the Actually Additions mod for Minecraft.
  * It is created and owned by Ellpeck and distributed
  * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
+ * http://ellpeck.de/actaddlicense
  * View the source code at https://github.com/Ellpeck/ActuallyAdditions
  *
- * © 2016 Ellpeck
+ * © 2015-2016 Ellpeck Ellpeck
  */
 
 package de.ellpeck.actuallyadditions.mod.util.playerdata;