mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 22:57:21 +01:00
Revert "Revert "allow hatching potions to have a release date""
This reverts commit 485584c144.
# Conflicts:
# website/common/script/content/hatching-potions.js
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import defaults from 'lodash/defaults';
|
||||
import each from 'lodash/each';
|
||||
import assign from 'lodash/assign';
|
||||
import moment from 'moment';
|
||||
import t from './translation';
|
||||
import { tasksByCategory } from './tasks';
|
||||
@@ -19,7 +18,7 @@ import {
|
||||
|
||||
import achievements from './achievements';
|
||||
|
||||
import eggs from './eggs';
|
||||
import * as eggs from './eggs';
|
||||
import * as hatchingPotions from './hatching-potions';
|
||||
import * as stable from './stable';
|
||||
import gear from './gear';
|
||||
@@ -168,7 +167,7 @@ api.special = api.spells.special;
|
||||
|
||||
api.dropEggs = eggs.drops;
|
||||
api.questEggs = eggs.quests;
|
||||
api.eggs = assign({}, eggs.drops, eggs.quests);
|
||||
api.eggs = eggs.all;
|
||||
|
||||
api.timeTravelStable = {
|
||||
pets: {
|
||||
|
||||
Reference in New Issue
Block a user