Back to News

Merge branch 'master' of https://bitbucket.org/Specy3/frostemu

•By Moh•changelogmain
Changelog
# Conflicts:\n# Build/FrostEmu_World.exe\n# Build/FrostEmu_World.exe.locked\n# Build/FrostEmu_World.pdb\n# Build/WorldDB/Scripts/Cmd/cmpl/cmpl_2-16-19-19-32.cs\n# Build/WorldDB/Scripts/Cmd/cmpl/cmpl_2-16-22-35-26.cs\n# Build/WorldDB/Scripts/Cmd/cmpl/cmpl_2-17-4-43-59.cs\n# Build/WorldDB/Scripts/Item/cmpl/cmpl_2-16-19-19-32.cs\n# Build/WorldDB/Scripts/Item/cmpl/cmpl_2-16-22-35-26.cs\n# Build/WorldDB/Scripts/Item/cmpl/cmpl_2-17-4-43-59.cs\n# Build/WorldDB/Scripts/Npc/cmpl/cmpl_2-16-19-19-31.cs\n# Build/WorldDB/Scripts/Npc/cmpl/cmpl_2-16-22-35-25.cs\n# Build/WorldDB/Scripts/Npc/cmpl/cmpl_2-17-4-43-58.cs\n# FrostEmu_World/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n# FrostEmu_World/obj/Debug/FrostEmu_World.csprojResolveAssemblyReference.cache\n# FrostEmu_World/obj/Debug/FrostEmu_World.exe\n# FrostEmu_World/obj/Debug/FrostEmu_World.pdb