Finalized Merge of 2.0-StoreDataInLore

Rebased onto Master Branch commit e5438e7ae3
And moved to new branch v2.0

src/com/dre/brewery/BIngredients.java

@@ -128,11 +128,11 @@ public class BIngredients {
 		}
 
 		potionMeta.setDisplayName(P.p.color("&f" + cookedName));
-		if (!P.use1_14) {
+		//if (!P.use1_14) {
 			// Before 1.14 the effects duration would strangely be only a quarter of what we tell it to be
 			// This is due to the Duration Modifier, that is removed in 1.14
-			uid *= 4;
-		}
+		//	uid *= 4;
+		//}
 		// This effect stores the UID in its Duration
 		//potionMeta.addCustomEffect((PotionEffectType.REGENERATION).createEffect((uid * 4), 0), true);
 
@@ -363,7 +363,7 @@ public class BIngredients {
 	public String toString() {
 		return "BIngredients{" +
 				"cookedTime=" + cookedTime +
-				", total ingedients: " + getIngredientsCount() + '}';
+				", total ingredients: " + getIngredientsCount() + '}';
 	}
 
 	/*public void testStore(DataOutputStream out) throws IOException {