Mazo 5e1a244123 Merge branch 'master' into feature/Nanites ... # Conflicts: # common/src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala # common/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala # common/src/main/scala/services/avatar/AvatarService.scala # common/src/main/scala/services/vehicle/VehicleService.scala # common/src/main/scala/services/vehicle/support/DeconstructionActor.scala # common/src/main/scala/services/vehicle/support/DelayedDeconstructionActor.scala # pslogin/src/main/scala/WorldSessionActor.scala		2018-06-12 17:30:38 +01:00
..
main/scala	Merge branch 'master' into feature/Nanites	2018-06-12 17:30:38 +01:00
test/scala	Merge pull request #220 from Fate-JH/inventory-items	2018-06-11 19:28:09 -04:00