Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Freenor & Bodhi's pearl cost system, rebased on to Exultant's version #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

pruby
Copy link

@pruby pruby commented Feb 11, 2013

The prisonpearl cost system has obviously been based on Exultant's version, but the git history shows it being off matthewbot's . This corrects the version history to produce what appears to just be their changes in the changeset.

@pruby
Copy link
Author

pruby commented Feb 11, 2013

Note: when compiling I still have one error against the CombatTag API, might have the wrong JAR:

CombatTagManager Line #39:
The method getNPCPlayerName(Entity) is undefined for the type CombatTagApi

@pruby
Copy link
Author

pruby commented Feb 11, 2013

Command used to merge on to Exultant/master was:

git merge --squash -s recursive -X ignore-all-space -X theirs bodhi/patch-2

Still some whitespace issues it didn't ignore, but can't see substantial changes other than their new code.

@erocs
Copy link

erocs commented Feb 12, 2013

Here's the build of Combat-Tag for 1.4.7. https://docs.google.com/file/d/0B1IAk9vOK8e-T1FabUVXbFhoMzA/edit?usp=sharing

@erocs
Copy link

erocs commented Feb 12, 2013

It builds fine for me with that Combat-Tag. https://docs.google.com/file/d/0B1IAk9vOK8e-T1V5TTlNTl9RT0U/edit?usp=sharing

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.

2 participants