  				if (Main.npcShop > 0)
 @@ -14568,6 +_,7 @@
  						{
- 							array[num6] = Lang.tip[50] + " " + text2;
- 						}
-+						tooltipNames[num6] = "Price";
- 						num6++;
+ 							array[num4] = Lang.tip[50] + " " + text2;
+ 						}
++						tooltipNames[num4] = "Price";
+ 						num4++;
  						if (num23 > 0)
  						{
 @@ -14589,10 +_,14 @@
  					else
  					{
- 						array[num6] = Lang.tip[51];
-+						tooltipNames[num6] = "Price";
- 						num6++;
+ 						array[num4] = Lang.tip[51];
++						tooltipNames[num4] = "Price";
+ 						num4++;
  						color = new Microsoft.Xna.Framework.Color((int)((byte)(120f * num22)), (int)((byte)(120f * num22)), (int)((byte)(120f * num22)), a);
  					}
  				}
 +				Microsoft.Xna.Framework.Color?[] overrideColor;
-+				ItemLoader.ModifyTooltips(Main.toolTip, ref num6, tooltipNames, ref array,
++				ItemLoader.ModifyTooltips(Main.toolTip, ref num4, tooltipNames, ref array,
 +					ref array2, ref array3, ref num, out overrideColor);
  				Vector2 zero = Vector2.Zero;
  				int num28 = 0;
- 				for (int j = 0; j < num6; j++)
+ 				for (int j = 0; j < num4; j++)
 @@ -14735,6 +_,10 @@
- 						else if (k == num6 - 1)
+ 						else if (k == num4 - 1)
  						{
  							baseColor = color;
 +						}

 
@@ -4199,7 +_,7 @@
 					}
 					else if (text == "version")
 					{
-						Console.WriteLine("Terraria Server " + Main.versionNumber);
+						Console.WriteLine("Terraria Server " + Main.versionNumber + " - " + ModLoader.ModLoader.versionedName);
 					}
 					else
 					{

 		public static bool dedServFPS = false;
 		public static int dedServCount1 = 0;
 		public static int dedServCount2 = 0;
@@ -205,7 +_,7 @@
 		public static int dedServCount1 = 0;
 		public static int dedServCount2 = 0;
 		public static bool superFast = false;
-		public static int MaxShopIDs = 22;
+		public static int MaxShopIDs = 22 + 1;
 		public static bool[] hairLoaded = new bool[134];
 		public static bool[] wingsLoaded = new bool[38];
 		public static bool[] goreLoaded = new bool[1087];
@@ -469,7 +_,7 @@
 		private static bool flameRingLoaded;
 		private Texture2D flameRingTexture;
