diff --git a/src/api/java/appeng/api/features/IGrinderRegistry.java b/src/api/java/appeng/api/features/IGrinderRegistry.java
index 2a5e8d15e..1012f36d5 100644
--- a/src/api/java/appeng/api/features/IGrinderRegistry.java
+++ b/src/api/java/appeng/api/features/IGrinderRegistry.java
@@ -48,7 +48,7 @@ public interface IGrinderRegistry
 
 	/**
 	 * Add a new recipe with a single input and output and how many turns it requires.
-	 * 
+	 *
 	 * Will ignore duplicate recipes with the same input item.
 	 *
 	 * @param in The {@link ItemStack} to grind.
@@ -59,7 +59,7 @@ public interface IGrinderRegistry
 
 	/**
 	 * Add a new recipe with an input, output and a single optional output.
-	 * 
+	 *
 	 * Will ignore duplicate recipes with the same input item.
 	 *
 	 * @param in The {@link ItemStack} to grind.
@@ -72,7 +72,7 @@ public interface IGrinderRegistry
 
 	/**
 	 * add a new recipe with optional outputs, duplicates will not be added.
-	 * 
+	 *
 	 * Will ignore duplicate recipes with the same input item.
 	 *
 	 * @param in The {@link ItemStack} to grind.
@@ -82,13 +82,13 @@ public interface IGrinderRegistry
 	 * @param optional2 The second optional {@link ItemStack} to output of a certain chance.
 	 * @param chance2 chance to get the second optional output within 0.0 - 1.0
 	 * @param turns Amount of turns to turn the input into the output, with turns > 0.
-	 * 
+	 *
 	 */
 	void addRecipe( @Nonnull ItemStack in, @Nonnull ItemStack out, @Nonnull ItemStack optional, float chance, @Nonnull ItemStack optional2, float chance2, int turns );
 
 	/**
 	 * Remove the specific from the recipe list.
-	 * 
+	 *
 	 * @param recipe The recipe to be removed.
 	 * @return true, if it was removed
 	 */
@@ -106,11 +106,11 @@ public interface IGrinderRegistry
 
 	/**
 	 * Allows do add a custom ratio from an ore to dust when being grinded.
-	 * 
+	 *
 	 * The default ratio is 1 ore to 2 dusts.
-	 * 
+	 *
 	 * These have to be added before any recipe is registered. Otherwise it will use the default value.
-	 * 
+	 *
 	 * @param oredictName The name of the ore;
 	 * @param ratio The amount, must be > 0;
 	 */
@@ -118,9 +118,9 @@ public interface IGrinderRegistry
 
 	/**
 	 * Remove a custom ratio for a specific ore name.
-	 * 
+	 *
 	 * Will use the default of 2 value afterwards.
-	 * 
+	 *
 	 * @param oredictName The name of the ore;
 	 */
 	boolean removeDustRatio( @Nonnull String oredictName );
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java
index 0f32147fe..6ecf79ade 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java
@@ -29,16 +29,16 @@ import appeng.api.storage.data.IAEStack;
 
 /**
  * DO NOT IMPLEMENT.
- * 
+ *
  * Will be injected when adding an {@link ICraftingWatcherHost} to a grid.
  */
 public interface ICraftingWatcher
 {
 	/**
 	 * Add a specific {@link IAEStack} to watch.
-	 * 
+	 *
 	 * Supports multiple values, duplicate ones will not be added.
-	 * 
+	 *
 	 * @param stack
 	 * @return true, if successfully added.
 	 */
@@ -46,7 +46,7 @@ public interface ICraftingWatcher
 
 	/**
 	 * Remove a specific {@link IAEStack} from the watcher.
-	 * 
+	 *
 	 * @param stack
 	 * @return true, if successfully removed.
 	 */
diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java
index 274494017..a75871470 100644
--- a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java
+++ b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java
@@ -26,16 +26,16 @@ package appeng.api.networking.energy;
 
 /**
  * DO NOT IMPLEMENT.
- * 
+ *
  * Will be injected when adding an {@link IEnergyWatcherHost} to a grid.
  */
 public interface IEnergyWatcher
 {
 	/**
 	 * Add a specific threshold to watch.
-	 * 
+	 *
 	 * Supports multiple values, duplicate ones will not be added.
-	 * 
+	 *
 	 * @param amount
 	 * @return true, if successfully added.
 	 */
@@ -43,7 +43,7 @@ public interface IEnergyWatcher
 
 	/**
 	 * Remove a specific threshold from the watcher.
-	 * 
+	 *
 	 * @param amount
 	 * @return true, if successfully removed.
 	 */
diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcher.java b/src/api/java/appeng/api/networking/storage/IStackWatcher.java
index c734eb78d..8d3bf81bb 100644
--- a/src/api/java/appeng/api/networking/storage/IStackWatcher.java
+++ b/src/api/java/appeng/api/networking/storage/IStackWatcher.java
@@ -29,16 +29,16 @@ import appeng.api.storage.data.IAEStack;
 
 /**
  * DO NOT IMPLEMENT.
- * 
+ *
  * Will be injected when adding an {@link IStackWatcherHost} to a grid.
  */
 public interface IStackWatcher
 {
 	/**
 	 * Add a specific {@link IAEStack} to watch.
-	 * 
+	 *
 	 * Supports multiple values, duplicate ones will not be added.
-	 * 
+	 *
 	 * @param stack
 	 * @return true, if successfully added.
 	 */
@@ -46,7 +46,7 @@ public interface IStackWatcher
 
 	/**
 	 * Remove a specific {@link IAEStack} from the watcher.
-	 * 
+	 *
 	 * @param stack
 	 * @return true, if successfully removed.
 	 */
diff --git a/src/api/java/appeng/api/parts/BusSupport.java b/src/api/java/appeng/api/parts/BusSupport.java
index 3f552620a..4a334d9e2 100644
--- a/src/api/java/appeng/api/parts/BusSupport.java
+++ b/src/api/java/appeng/api/parts/BusSupport.java
@@ -29,5 +29,5 @@ public enum BusSupport
 	CABLE,
 
 	DENSE_CABLE
-	
+
 }
diff --git a/src/api/java/appeng/api/parts/IPartModel.java b/src/api/java/appeng/api/parts/IPartModel.java
index 0173ba4b2..91b359a14 100644
--- a/src/api/java/appeng/api/parts/IPartModel.java
+++ b/src/api/java/appeng/api/parts/IPartModel.java
@@ -41,9 +41,9 @@ public interface IPartModel
 	/**
 	 * A solid {@link IPartModel} indicates that the rendering requires a cable connection, which will also result in
 	 * creating an intersection for the cable.
-	 * 
+	 *
 	 * This should be true for pretty much all parts.
-	 * 
+	 *
 	 * @return true for a solid part.
 	 */
 	default boolean requireCableConnection()
@@ -53,7 +53,7 @@ public interface IPartModel
 
 	/**
 	 * A collection of {@link ResourceLocation} used as models for a part.
-	 * 
+	 *
 	 * @return a collection of models, never null.
 	 */
 	@Nonnull
diff --git a/src/main/java/appeng/client/UnlistedProperty.java b/src/main/java/appeng/client/UnlistedProperty.java
index 5eaf655b7..a55d0701a 100644
--- a/src/main/java/appeng/client/UnlistedProperty.java
+++ b/src/main/java/appeng/client/UnlistedProperty.java
@@ -24,7 +24,7 @@ import net.minecraftforge.common.property.IUnlistedProperty;
 
 /**
  * A generic implementation for {@link IUnlistedProperty}.
- * 
+ *
  * @param <T>
  */
 public class UnlistedProperty<T> implements IUnlistedProperty<T>
diff --git a/src/main/java/appeng/client/render/TesrRenderHelper.java b/src/main/java/appeng/client/render/TesrRenderHelper.java
index e08f13e46..cf2d64234 100644
--- a/src/main/java/appeng/client/render/TesrRenderHelper.java
+++ b/src/main/java/appeng/client/render/TesrRenderHelper.java
@@ -121,7 +121,7 @@ public class TesrRenderHelper
 
 	/**
 	 * Render an item in 2D and the given text below it.
-	 * 
+	 *
 	 * @param spacing Specifies how far apart the item and the item stack amount are rendered.
 	 */
 	public static void renderItem2dWithAmount( IAEItemStack itemStack, float itemScale, float spacing )
diff --git a/src/main/java/appeng/core/stats/PlayerDifferentiator.java b/src/main/java/appeng/core/stats/PlayerDifferentiator.java
index 42c82bb7b..284187513 100644
--- a/src/main/java/appeng/core/stats/PlayerDifferentiator.java
+++ b/src/main/java/appeng/core/stats/PlayerDifferentiator.java
@@ -34,7 +34,7 @@ public class PlayerDifferentiator
 	/**
 	 * Can determine if an {@link net.minecraft.entity.player.EntityPlayer} is not a real player.
 	 * This is based on if the
-	 * 
+	 *
 	 * @param player is:
 	 * - null
 	 * - dead
diff --git a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java
index 9b75871c1..4c5629577 100644
--- a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java
+++ b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java
@@ -40,7 +40,7 @@ public class PlayerStatsRegistration
 
 	/**
 	 * is true if the {@link appeng.core.features.AEFeature#ACHIEVEMENTS} is enabled in the
-	 * 
+	 *
 	 * @param config
 	 */
 	private final boolean isAchievementFeatureEnabled;
diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java
index 143a162c4..8d42318f6 100644
--- a/src/main/java/appeng/core/worlddata/WorldData.java
+++ b/src/main/java/appeng/core/worlddata/WorldData.java
@@ -122,7 +122,7 @@ public final class WorldData implements IWorldData
 	 * Requires to start up from external from here
 	 *
 	 * drawback of the singleton build style
-	 * 
+	 *
 	 * @param server
 	 */
 	public static void onServerAboutToStart( MinecraftServer server )
diff --git a/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java b/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java
index 6d72a6f40..8e60f7042 100644
--- a/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java
+++ b/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java
@@ -31,7 +31,7 @@ import ic2.api.recipe.IRecipeInput;
 
 /**
  * Implementation of IRecipeInput for the macerator recipe.
- * 
+ *
  * @author GuntherDW
  */
 public class IC2RecipeInput implements IRecipeInput
diff --git a/src/main/java/appeng/me/energy/EnergyThreshold.java b/src/main/java/appeng/me/energy/EnergyThreshold.java
index 46ea3a074..1bbc88756 100644
--- a/src/main/java/appeng/me/energy/EnergyThreshold.java
+++ b/src/main/java/appeng/me/energy/EnergyThreshold.java
@@ -38,7 +38,7 @@ public class EnergyThreshold implements Comparable<EnergyThreshold>
 
 	/**
 	 * Special constructor to allow querying a for a subset of thresholds.
-	 * 
+	 *
 	 * @param lim
 	 * @param bound
 	 */
diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
index a20766ace..efa38b84f 100644
--- a/src/main/java/appeng/util/Platform.java
+++ b/src/main/java/appeng/util/Platform.java
@@ -908,7 +908,7 @@ public class Platform
 
 	/**
 	 * Returns a random element from the given collection.
-	 * 
+	 *
 	 * @return null if the collection is empty
 	 */
 	@Nullable
diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java
index f120b779f..3587b4cc5 100644
--- a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java
+++ b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java
@@ -54,12 +54,12 @@ public class ItemComparisonHelper
 
 	/**
 	 * Compare the two {@link ItemStack}s based on the same {@link Item} and damage value.
-	 * 
+	 *
 	 * In case of the item being damageable, only the {@link Item} will be considered.
 	 * If not it will also compare both damage values.
-	 * 
+	 *
 	 * Ignores NBT.
-	 * 
+	 *
 	 * @return true, if both are equal.
 	 */
 	public boolean isEqualItemType( final ItemStack that, final ItemStack other )
@@ -77,11 +77,11 @@ public class ItemComparisonHelper
 
 	/**
 	 * A wrapper around {@link ItemStack#isItemEqual(ItemStack)}.
-	 * 
+	 *
 	 * The benefit is to compare two null item stacks, without any additional null checks.
-	 * 
+	 *
 	 * Ignores NBT.
-	 * 
+	 *
 	 * @return true, if both are equal.
 	 */
 	public boolean isEqualItem( @Nonnull final ItemStack left, @Nonnull final ItemStack right )
@@ -100,7 +100,7 @@ public class ItemComparisonHelper
 
 	/**
 	 * Compares two {@link ItemStack} and their NBT tag for equality.
-	 * 
+	 *
 	 * Use this when a precise check is required and the same item is required.
 	 * Not just something with different NBT tags.
 	 *
@@ -115,7 +115,7 @@ public class ItemComparisonHelper
 	 * Similar to {@link ItemComparisonHelper#isEqualItem(ItemStack, ItemStack)},
 	 * but it can further check, if both match the same {@link FuzzyMode}
 	 * or are considered equal by the {@link OreDictionary}
-	 * 
+	 *
 	 * @param mode how to compare the two {@link ItemStack}s
 	 * @return true, if both are matching the mode or considered equal by the {@link OreDictionary}
 	 */