JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91e550bdcc
Mineplex2018-withcommit/Plugins/Mineplex.Core
History
Joseph Prezioso Jr 91e550bdcc Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
2016-04-06 19:40:01 -04:00
..
src/mineplex/core Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-06 19:40:01 -04:00
pom.xml Include version.properties in Mineplex.Core 2016-01-21 16:37:35 -05:00
version.properties Include version.properties in Mineplex.Core 2016-01-21 16:37:35 -05:00