Vinny 5937957370 Merge remote-tracking branch 'remotes/origin/main' into VinnyTest ... # Conflicts: # ProjectNLD/Assets/Config/Data/Localize/EN/stringcfg_stringconfig.json # ProjectNLD/Assets/Config/Data/charactercfg_characterawaking.json # ProjectNLD/Assets/Config/Data/effectcfg_effectconfig.json # ProjectNLD/Assets/Config/Data/monstercfg_monster.json # ProjectNLD/Assets/PhxhSDK # ProjectNLD/Assets/Plugins/Android/OAID-SDK/oaidtest2-debug.aar		2025-11-17 18:54:52 +08:00
..
com.staggartcreations.splinemesher	【meta】	2025-04-30 18:00:38 +08:00
manifest.json	Merge remote-tracking branch 'remotes/origin/main' into VinnyTest	2025-11-17 18:54:52 +08:00