Skip to content

Daily Merge#17

Merged
ob1bob69 merged 8 commits intoob1bob69:masterfrom
ismooch:master
Apr 11, 2014
Merged

Daily Merge#17
ob1bob69 merged 8 commits intoob1bob69:masterfrom
ismooch:master

Conversation

@ob1bob69
Copy link
Owner

No description provided.

ismooch and others added 8 commits April 7, 2014 02:24
-still needs some work
--originally submitted by Elite
-hubconfig
--fixed feather not remembering you after log on
-shcat2
--fixed chat thinking moderators were blue, and some moderators were
admins
-challenges
--fixed supporter challenges not opening doors for supporters
-vote
--removed messed up display times from vote list, only to have it
requested to be back in.
This reverts commit 60918b1.
-pinfo
--@cFerg 's now live version of pinfo with fixes
-wtfronts
-- if you die with less than 25, will be boosted to 25 @jrlizard
-- malaria in swamps (1 in 5 chance every 3 seconds) @jrlizard
-disenchant
--disenchant added to Fronts @jrlizard
-heal
-- heal added to abstaining members on fronts @jrlizard
if tool is unenchanted you are still able to unenchant it
-disenchant
--fixed unenchanted tools being double unenchanted @jrlizard
-moderate
--removed some uneeded things
ob1bob69 added a commit that referenced this pull request Apr 11, 2014
@ob1bob69 ob1bob69 merged commit b970700 into ob1bob69:master Apr 11, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants