Merge branch 'jss2a98aj:1.7.10' into 1.7.10

src/main/java/baubles/api/expanded/BaubleExpandedSlots.java

@@ -110,7 +110,7 @@ public class BaubleExpandedSlots {
 			if(total > maximumOfType) {
 				total -= maximumOfType;
 				for(int i = 0; i < total; i++) {
-					for(int slotToCheck = slotsCurrentlyUsed(); slotToCheck > 0; slotToCheck--) {
+					for(int slotToCheck = slotsCurrentlyUsed(); slotToCheck >= 0; slotToCheck--) {
 						if(assignedSlots[slotToCheck].equals(type)) {
 							for(int slotToMove = slotToCheck + 1; slotToMove < slotLimit; slotToMove++) {
 								assignedSlots[slotToMove - 1] = assignedSlots[slotToMove];
@@ -156,7 +156,7 @@ public class BaubleExpandedSlots {
 	*/
 	public static boolean tryUnassignSlotOfType(String type) {
 		if(newSlotsRemaining < slotLimit && type != null && !type.equals(unknownType) && Loader.instance().getLoaderState() == LoaderState.PREINITIALIZATION) {
-			for(int slotToCheck = slotsCurrentlyUsed(); slotToCheck > 0; slotToCheck--) {
+			for(int slotToCheck = slotsCurrentlyUsed(); slotToCheck >= 0; slotToCheck--) {
 				if(assignedSlots[slotToCheck].equals(type)) {
 					for(int slotToMove = slotToCheck + 1; slotToMove < slotLimit; slotToMove++) {
 						assignedSlots[slotToMove - 1] = assignedSlots[slotToMove];

src/main/resources/assets/baubles/lang/en_US.lang

@@ -29,5 +29,6 @@ slot.leggings=§aLeggings§7
 slot.quiver=§aQuiver§7
 slot.ring=§aRing§7
 slot.shield=§aShield§7
+slot.universal=§aUniversal§7
 slot.unknown=§aUnknown§7
 slot.wings=§aWings§7