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

Dev #16

Merged
merged 72 commits into from
Jul 26, 2017
Merged

Dev #16

merged 72 commits into from
Jul 26, 2017

Conversation

Zedly
Copy link
Owner

@Zedly Zedly commented Jul 26, 2017

Changes on the dev branch seem to have produced a fairly stable version with 1.12 support.

brainiac94 and others added 29 commits December 22, 2016 17:30
Conflicts:
	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
Conflicts:
	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
Conflicts:
	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
Conflicts:
	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
Conflicts:
	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
@Zedly Zedly merged commit 315e6f3 into master Jul 26, 2017
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