bba169127c
# Conflicts: # project/assets/configs/bot.json # project/assets/configs/core.json # project/assets/database/bots/types/arenafighterevent.json # project/assets/database/bots/types/assault.json # project/assets/database/bots/types/bear.json # project/assets/database/bots/types/bossboar.json # project/assets/database/bots/types/bossboarsniper.json # project/assets/database/bots/types/bossbully.json # project/assets/database/bots/types/bossgluhar.json # project/assets/database/bots/types/bosskilla.json # project/assets/database/bots/types/bossknight.json # project/assets/database/bots/types/bosskojaniy.json # project/assets/database/bots/types/bosskolontay.json # project/assets/database/bots/types/bosssanitar.json # project/assets/database/bots/types/bosstagilla.json # project/assets/database/bots/types/bosszryachiy.json # project/assets/database/bots/types/exusec.json # project/assets/database/bots/types/followerbigpipe.json # project/assets/database/bots/types/followerbirdeye.json # project/assets/database/bots/types/followerboar.json # project/assets/database/bots/types/followerboarclose1.json # project/assets/database/bots/types/followerboarclose2.json # project/assets/database/bots/types/followerbully.json # project/assets/database/bots/types/followergluharassault.json # project/assets/database/bots/types/followergluharscout.json # project/assets/database/bots/types/followergluharsecurity.json # project/assets/database/bots/types/followerkojaniy.json # project/assets/database/bots/types/followerkolontayassault.json # project/assets/database/bots/types/followerkolontaysecurity.json # project/assets/database/bots/types/followerzryachiy.json # project/assets/database/bots/types/gifter.json # project/assets/database/bots/types/marksman.json # project/assets/database/bots/types/peacefullzryachiyevent.json # project/assets/database/bots/types/pmcbot.json # project/assets/database/bots/types/ravangezryachiyevent.json # project/assets/database/bots/types/sectantpriest.json # project/assets/database/bots/types/sectantwarrior.json # project/assets/database/bots/types/shooterbtr.json # project/assets/database/bots/types/usec.json # project/assets/database/globals.json # project/assets/database/locales/global/ch.json # project/assets/database/locales/global/cz.json # project/assets/database/locales/global/en.json # project/assets/database/locales/global/es-mx.json # project/assets/database/locales/global/es.json # project/assets/database/locales/global/fr.json # project/assets/database/locales/global/ge.json # project/assets/database/locales/global/hu.json # project/assets/database/locales/global/it.json # project/assets/database/locales/global/jp.json # project/assets/database/locales/global/kr.json # project/assets/database/locales/global/pl.json # project/assets/database/locales/global/po.json # project/assets/database/locales/global/ro.json # project/assets/database/locales/global/ru.json # project/assets/database/locales/global/sk.json # project/assets/database/locales/global/tu.json # project/assets/database/templates/achievements.json # project/assets/database/templates/handbook.json # project/src/generators/BotLootGenerator.ts # project/src/generators/LootGenerator.ts # project/src/models/eft/common/tables/IBotType.ts # project/src/models/spt/bots/IBotLootCache.ts # project/src/servers/HttpServer.ts # project/src/services/BotLootCacheService.ts # project/src/services/FenceService.ts # project/tests/controllers/InsuranceController.test.ts |
||
---|---|---|
.. | ||
areas.json | ||
production.json | ||
qte.json | ||
scavcase.json | ||
settings.json |