Merge branch 'lakebane-old' into lakebane-master

# Conflicts:
#	src/engine/gameManager/LootManager.java

src/engine/net/client/ClientMessagePump.java

@@ -1631,8 +1631,8 @@ public class ClientMessagePump implements NetMsgHandler {
             if (toRepair == null)
                 return;
 
-            if (toRepair.getItemBase().isGlass())
+            //if (toRepair.getItemBase().isGlass())
-                return;
+            //    return;
 
             //make sure item is in player's inventory or equipment
             if (!itemMan.inventoryContains(toRepair) && !itemMan.equippedContains(toRepair))
@@ -1654,6 +1654,12 @@ public class ClientMessagePump implements NetMsgHandler {
             }
             //TODO get cost to repair
             int cost = (int) ((max - dur) * 80.1);
+
+            //glass costs 3x as much to repair
+            if (toRepair.getItemBase().isGlass()){
+                cost *= 3;
+            }
+
             Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
 
             if (b != null)

src/engine/workthreads/HourlyJobThread.java

@@ -94,12 +94,11 @@ public class HourlyJobThread implements Runnable {
         // This will reset at 1am after the last mine
         // window closes.
 
-        if (LocalDateTime.now().getHour() == MINE_LATE_WINDOW + 1) {
+        if (LocalDateTime.now().getHour() == 3) {
 
             for (Mine mine : Mine.getMines()) {
-
-                if (mine.wasClaimed == true)
                 mine.wasClaimed = false;
+                mine.hasProduced = false;
             }
         }