# Conflicts: # UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
Light settings, shader changes, prefab tweaks, model tweaks