Sollace 29c5f32f0d Merge branch 'master' into hdskins_rewrites ... # Conflicts: # src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java # src/hdskins/java/com/voxelmodpack/hdskins/PreviewTextureManager.java # src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java # src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java # src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java # src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java # src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java # src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java # src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java		2018-08-06 20:27:12 +02:00
..
api/java	Move everything to main so gradles doesn't choke	2018-07-12 13:17:31 +02:00
common/java/com/minelittlepony/gui	Default button id is 5k	2018-08-06 18:44:52 +02:00
hdskins	Merge branch 'master' into hdskins_rewrites	2018-08-06 20:27:12 +02:00
main	Merge branch 'master' into hdskins_rewrites	2018-08-06 20:27:12 +02:00