Matthew Messinger 8c03c42a3a Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony ... # Conflicts: # src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java		2018-07-22 15:52:09 -04:00
..
api/java	Move everything to main so gradles doesn't choke	2018-07-12 13:17:31 +02:00
hdskins	Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony	2018-07-22 15:52:09 -04:00
main	Fixed shadows rendering on sleeping players	2018-07-22 17:26:15 +02:00