From 3be6126aeaf87d749d56568650ac0a849ec6ebbf Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Tue, 24 Mar 2015 11:02:22 -0400
Subject: [PATCH] Javadocs!

---
 src/main/java/mekanism/common/util/MekanismUtils.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java
index a2b0b40d3..419b5ff71 100644
--- a/src/main/java/mekanism/common/util/MekanismUtils.java
+++ b/src/main/java/mekanism/common/util/MekanismUtils.java
@@ -1199,6 +1199,11 @@ public final class MekanismUtils
 		return "error";
 	}
 	
+	/**
+	 * Convert from the unit defined in the configuration to joules.
+	 * @param energy - energy to convert
+	 * @return energy converted to joules
+	 */
 	public static double convertToJoules(double energy)
 	{
 		switch(general.activeType)
@@ -1214,6 +1219,11 @@ public final class MekanismUtils
 		}
 	}
 	
+	/**
+	 * Convert from joules to the unit defined in the configuration.
+	 * @param energy - energy to convert
+	 * @return energy converted to configured unit
+	 */
 	public static double convertToDisplay(double energy)
 	{
 		switch(general.activeType)