From 389314b325efe5b1b0c8e7606de071e66645db97 Mon Sep 17 00:00:00 2001
From: Brandon McPhail <mcphailb@gmail.com>
Date: Sun, 26 May 2013 00:37:11 -0600
Subject: [PATCH 1/3] Enforced Shield -> Reinforced Shield

Changed spelling
---
 locales/en/app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en/app.json b/locales/en/app.json
index 866edf0d5b..43d2956e92 100644
--- a/locales/en/app.json
+++ b/locales/en/app.json
@@ -286,7 +286,7 @@
       "sheild1Text": "Decreases HP loss by 3%",
     "sheild2Name" : "Buckler",
       "sheild2Text": "Decreases HP loss by 4%",
-    "sheild3Name" : "Enforced Shield",
+    "sheild3Name" : "Reinforced Shield",
       "sheild3Text": "Decreases HP loss by 5%",
     "sheild4Name" : "Red Shield",
       "sheild4Text": "Decreases HP loss by 7%",

From fc14eadc088a7d2eb393df6d0119dbc1b78bedc2 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 27 May 2013 14:37:57 +0100
Subject: [PATCH 2/3] habitrpg-shared: fix cron, so it doesn't run fully for
 new users

---
 src/app/index.coffee | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/app/index.coffee b/src/app/index.coffee
index a7c03cd9a2..69efcc842c 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -135,17 +135,21 @@ ready (model) ->
   require('./unlock').app(exports, model)
   require('./filters').app(exports, model)
 
+  ###
+    Cron
+  ###
   uObj = misc.hydrate(user.get())
-  cron = ->
-    #return setTimeout(cron, 1) if model._txnQueue.length > 0
-    # habitrpg-shared/algos requires uObj.habits, uObj.dailys etc instead of uObj.tasks
-    _.each ['habit','daily','todo','reward'], (type) ->
-      uObj["#{type}s"] = _.where(uObj.tasks, {type:type}); true
-    paths = {}
-    algos.cron(uObj, {paths:paths})
-    lostHp = delete paths['stats.hp'] # we'll set this manually so we can get a cool animation
-    _.each paths, (v,k) -> user.pass({cron:true}).set(k,helpers.dotGet(k, uObj)); true
-    if lostHp
-      browser.resetDom(model)
-      setTimeout (-> user.set('stats.hp', uObj.stats.hp)), 750
-  cron() if algos.shouldCron(uObj)
+  # habitrpg-shared/algos requires uObj.habits, uObj.dailys etc instead of uObj.tasks
+  _.each ['habit','daily','todo','reward'], (type) ->
+    uObj["#{type}s"] = _.where(uObj.tasks, {type:type}); true
+  paths = {}
+  algos.cron(uObj, {paths:paths})
+  if !_.isEmpty(paths)
+    if paths['lastCron'] and _.size(paths) is 1
+      user.set "lastCron", uObj.lastCron
+    else
+      lostHp = delete paths['stats.hp'] # we'll set this manually so we can get a cool animation
+      _.each paths, (v,k) -> user.pass({cron:true}).set(k,helpers.dotGet(k, uObj)); true
+      if lostHp
+        browser.resetDom(model)
+        setTimeout (-> user.set('stats.hp', uObj.stats.hp)), 750
\ No newline at end of file

From 3d6dafb368edc96446e8e16a1a5d8b038ac04db3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 27 May 2013 14:51:56 +0100
Subject: [PATCH 3/3] set derby-ui-boot dependency to
 f04ba2c7e7b3a8f1462a6e70fe4f81055d74c4b2 (new versions are for racer 0.5)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cfdf575156..4c80dc0ef7 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "derby": "git://github.com/lefnire/derby#habitrpg",
     "racer": "git://github.com/lefnire/racer#habitrpg",
     "racer-db-mongo": "git://github.com/lefnire/racer-db-mongo#habitrpg",
-    "derby-ui-boot": "git://github.com/codeparty/derby-ui-boot#master",
+    "derby-ui-boot": "git://github.com/codeparty/derby-ui-boot#f04ba2c7e7b3a8f1462a6e70fe4f81055d74c4b2",
     "derby-auth": "git://github.com/lefnire/derby-auth#master",
     "connect-mongo": "*",
     "passport-facebook": "*",