Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.130.0",
+  "version": "4.130.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.130.0",
+  "version": "4.130.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.8.3",

website/client/src/components/shops/buyModal.vue

@@ -515,7 +515,7 @@ export default {
       return 45 - moment().diff(moment(this.user.flags.lastFreeRebirth), 'days');
     },
     nonSubscriberHourglasses () {
-      return (!this.user.purchased.plan.customerId && this.getPriceClass() === 'hourglasses');
+      return (!this.user.purchased.plan.customerId && !this.user.purchased.plan.consecutive.trinkets && this.getPriceClass() === 'hourglasses');
     },
   },
   watch: {