PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-22 12:37:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 1.11

Browse source 
# Conflicts:
#	.gitignore
This commit is contained in:
Matthew Messinger 2016-11-28 03:44:40 -05:00
commit cd6a589c71
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -10,4 +10,4 @@ run/
.factorypath
logs/
.idea/
classes/
classes/

2
README.md
View file

@ -2,4 +2,4 @@
Turns players and mobs into ponies.
http://brohoof.com/minelittlepony
http://minelittlepony-mod.com

2
buildSrc

@ -1 +1 @@
Subproject commit 95e55a52799b8d1c70b7fdcb155e77c3f34e7b96
Subproject commit f4a8929efc6ecd2f797ddad1f28c48b2c3745104