Files
NGECore2/src/services/equipment
Treeku e5d4a633bf Merge remote-tracking branch 'origin/master' into CreatureObjectRefactor
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java
	src/services/ai/AIActor.java
	src/services/ai/states/AttackState.java
2014-08-16 22:19:19 +01:00
..