e89e2f51b7
# Conflicts: # src/engine/InterestManagement/InterestManager.java # src/engine/gameManager/SimulationManager.java # src/engine/mobileAI/MobAI.java # src/engine/objects/CharacterItemManager.java # src/engine/objects/Mine.java # src/engine/objects/PlayerCharacter.java