Merge remote-tracking branch 'refs/remotes/origin/master-release-prep'

This commit is contained in:
FlightControl 2017-05-18 21:09:44 +02:00
commit 0e9caf2d3f
2 changed files with 2 additions and 2 deletions

View File

@ -1192,7 +1192,7 @@ do -- DETECTION_BASE
end
DetectedItem.Set = Set or SET_UNIT:New():FilterDeads():FilterCrashes()
DetectedItem.Index = DetectedItemIndex
DetectedItem.Index = DetectedItemIndex or self.DetectedItemCount
DetectedItem.ItemID = ItemPrefix .. "." .. self.DetectedItemMax
DetectedItem.ID = self.DetectedItemMax
DetectedItem.Removed = false

View File

@ -1,5 +1,5 @@
env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20170518_1415' )
env.info( 'Moose Generation Timestamp: 20170518_2107' )
local base = _G