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

Trying to merge the changes khobbits have done back to my branch. #6

Merged
merged 54 commits into from Jan 3, 2014

Conversation

Erbros
Copy link
Owner

@Erbros Erbros commented Jan 3, 2014

Not really sure if this is the right way to do it, never tried before :)

Adding bin folder to ignore list.
Updating project settings
Bukkit r5 (code not updated)
Pull out bank support for jackpot, causing issues with none bank eco plugins.
When someone buys a ticket on the last few seconds of a draw, the time will be extended, by a small amount.
Idea project files.
Add lottery tax target
Code cleanup
Yeah.. i know this is fugly, i'll fix it later.
First set of Translated messages
Version increase
Erbros added a commit that referenced this pull request Jan 3, 2014
Trying to merge the changes khobbits have done back to my branch.
@Erbros Erbros merged commit 52a494c into Erbros:master Jan 3, 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.

None yet

3 participants