JyrgensonRasmus b7706a57cf Merge branch 'master' of https://cgvrgit.ulno.net/Tuwi/BlockCraft ... # Conflicts: # Content/StarterContent/Maps/Minimal_Default_BuiltData.uasset # Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset # Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/7E/BEYC27T14FHBU6LF2F60RR.uasset # Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/8/3J/6B9RJI3FDPCETRKXUXCQ4C.uasset # Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/8O/GK06JAEJ82TQ0GA2QB0DJG.uasset		2023-04-29 15:51:15 +03:00
..
Characters	Initial commit	2023-04-28 21:33:18 +03:00
FX	Test2	2023-04-28 21:55:26 +03:00
Furniture	Merge branch 'master' of https://cgvrgit.ulno.net/Tuwi/BlockCraft	2023-04-29 15:51:15 +03:00
LevelPrototyping	Initial commit	2023-04-28 21:33:18 +03:00
Levels	558	2023-04-29 15:50:20 +03:00
MSPresets	558	2023-04-29 15:50:20 +03:00
Megascans	558	2023-04-29 15:50:20 +03:00
StarterContent	558	2023-04-29 15:50:20 +03:00
ThirdPerson	558	2023-04-29 15:50:20 +03:00
__ExternalActors__	Merge branch 'master' of https://cgvrgit.ulno.net/Tuwi/BlockCraft	2023-04-29 15:51:15 +03:00
__ExternalObjects__	Merge branch 'master' of https://cgvrgit.ulno.net/Tuwi/BlockCraft	2023-04-29 15:51:15 +03:00
Assets.umap	Test2	2023-04-28 21:55:26 +03:00
Gameplay.umap	Initial commit	2023-04-28 21:33:18 +03:00
NewBlueprint.uasset	Initial commit	2023-04-28 21:33:18 +03:00
Untitled.umap	AG Level	2023-04-29 15:45:26 +03:00