Undo entity fire ticks
Undo system refactor
Merge branch 'undo_refactor'
Fix bad merge