diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/__resource.lua b/resources/[EGRP-CarPacks]/EGRP-Bcso/__resource.lua index 355917d8f..9122b2e8a 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Bcso/__resource.lua +++ b/resources/[EGRP-CarPacks]/EGRP-Bcso/__resource.lua @@ -15,51 +15,6 @@ resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5' data_file 'VEHICLE_VARIATION_FILE' 'data/Jtrailer/carvariations.meta' data_file 'VEHICLE_LAYOUTS_FILE' 'data/Jtrailer/dlctext.meta' - -- justice1 - files { - 'data/justice1/vehicles.meta', - 'data/justice1/carvariations.meta', - 'data/justice1/carcols.meta', - 'data/justice1/handling.meta', - 'data/justice1/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/justice1/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/justice1/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/justice1/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/justice1/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/justice1/dlctext.meta' - - -- justice1canine - files { - 'data/justice1canine/vehicles.meta', - 'data/justice1canine/carvariations.meta', - 'data/justice1canine/carcols.meta', - 'data/justice1canine/handling.meta', - 'data/justice1canine/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/justice1canine/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/justice1canine/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/justice1canine/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/justice1canine/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/justice1canine/dlctext.meta' - - -- justice1canineslick - files { - 'data/justice1canineslick/vehicles.meta', - 'data/justice1canineslick/carvariations.meta', - 'data/justice1canineslick/carcols.meta', - 'data/justice1canineslick/handling.meta', - 'data/justice1canineslick/vehiclelayouts.meta', -} - -data_file 'HANDLING_FILE' 'data/justice1canineslick/handling.meta' -data_file 'VEHICLE_METADATA_FILE' 'data/justice1canineslick/vehicles.meta' -data_file 'CARCOLS_FILE' 'data/justice1canineslick/carcols.meta' -data_file 'VEHICLE_VARIATION_FILE' 'data/justice1canineslick/carvariations.meta' -data_file 'VEHICLE_LAYOUTS_FILE' 'data/justice1canineslick/dlctext.meta' - -- justice1slick files { 'data/justice1slick/vehicles.meta', diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/carcols.meta b/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/carcols.meta deleted file mode 100644 index 70bff924b..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/carcols.meta +++ /dev/null @@ -1,1160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VehicleLight_car_utility - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - justice1 - - - - - - justice1 - - - - - - - VehicleLight_sirenlight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 860_justice1_modkit - - MKT_STANDARD - - - - speaker_18CHARGJ - speaker - - - misc_z - - VMT_CHASSIS - mod_col_1 - mod_col_1 - VMCP_DEFAULT - - - - - - - - - spotlight_18CHARGJ - spotlight - - - misc_z - - VMT_BONNET - chassis - chassis - VMCP_DEFAULT - - - - - - - - - antenna4_18CHARGJ - antenna4 - - - misc_z - - VMT_ROOF - chassis - chassis - VMCP_DEFAULT - - - - - - - - - noalpr4_18CHARGJ - noalpr4 - - - misc_z - - VMT_CHASSIS2 - boot - chassis - VMCP_DEFAULT - - - - - - - - - noalpr5_18CHARGJ - noalpr5 - - - misc_z - - VMT_CHASSIS2 - boot - chassis - VMCP_DEFAULT - - - - - - - - - puck_18CHARGJ - puck - - - misc_z - - VMT_CHASSIS3 - boot - chassis - VMCP_DEFAULT - - - - - - - - - rumbler_18CHARGJ - puck - - - misc_z - - VMT_CHASSIS4 - mod_col_1 - chassis - VMCP_DEFAULT - - - - - - - - - puck2_18CHARGJ - puck2 - - - misc_z - - VMT_CHASSIS3 - boot - chassis - VMCP_DEFAULT - - - - - - - - - badge1_18CHARGJ - badge1 - - - misc_z - - VMT_GRILL - chassis - chassis - VMCP_DEFAULT - - - - - - - - - badge2_18CHARGJ - badge2 - - - misc_z - - VMT_BUMPER_F - boot - chassis - VMCP_DEFAULT - - - - - - - - polyright_18CHARGJ - polyright - - polyleft_18CHARGJ - - - misc_v - misc_h - - VMT_PLTVANITY - door_pside_r - chassis - VMCP_DEFAULT - - - - - - - - barright_18CHARGJ - barright - - barleft_18CHARGJ - - - misc_v - misc_h - - VMT_PLTVANITY - door_pside_r - chassis - VMCP_DEFAULT - - - - - - - - - - polyleft_18CHARGJ - door_dside_r - - - - barleft_18CHARGJ - door_dside_r - - - - - - - - - \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/carvariations.meta b/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/carvariations.meta deleted file mode 100644 index f40a6fcd6..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/carvariations.meta +++ /dev/null @@ -1,62 +0,0 @@ - - - - - justice1 - - - - 0 - 134 - 0 - 64 - 64 - 64 - 64 - 64 - 64 - 64 - 64 - 64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 860_justice1_modkit - - - - - - - - - - \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/handling.meta b/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/handling.meta deleted file mode 100644 index 679f970fc..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/handling.meta +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - justice1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 440010 - 0 - 0 - AVERAGE - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/vehicles.meta deleted file mode 100644 index 47c001420..000000000 --- a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1/vehicles.meta +++ /dev/null @@ -1,138 +0,0 @@ - - - vehshare - - - - justice1 - justice1 - justice1 - justice1 - 18DODGE - null - null - null - null - - null - str392m - LAYOUT_STANDARD - BUFFALO_COVER_OFFSET_INFO - EXPLOSION_INFO_DEFAULT - - DEFAULT_FOLLOW_VEHICLE_CAMERA - BOX_VEHICLE_AIM_CAMERA - VEHICLE_BONNET_CAMERA_STANDARD - DEFAULT_POV_CAMERA_LOOKAROUND - - - - - - - - - - - - - - - - - - - - - - - - - - - - VFXVEHICLEINFO_CAR_GENERIC - - - - - - - - - - - - - - - - - - - - - - 500.000000 - 500.000000 - 500.000000 - 500.000000 - 500.000000 - 500.000000 - - - - - - - - - - - SWANKNESS_1 - - FLAG_FORCE_ENABLE_CHASSIS_COLLISION FLAG_EXTRAS_STRONG FLAG_USE_INTERIOR_RED_LIGHT FLAG_LAW_ENFORCEMENT FLAG_EMERGENCY_SERVICE FLAG_NO_RESPRAY FLAG_DONT_SPAWN_IN_CARGEN FLAG_REPORT_CRIME_IF_STANDING_ON FLAG_HAS_LIVERY - VEHICLE_TYPE_CAR - VPT_FRONT_AND_BACK_PLATES - VDT_RACE - VC_EMERGENCY - VWT_SPORT - - - - - - - - - - - - WHEEL_FRONT_RIGHT_CAMERA - WHEEL_FRONT_LEFT_CAMERA - WHEEL_REAR_RIGHT_CAMERA - WHEEL_REAR_LEFT_CAMERA - - - - - - - STD_POLICE3_FRONT_LEFT - STD_POLICE3_FRONT_RIGHT - STD_POLICE2_REAR_LEFT - STD_POLICE2_REAR_RIGHT - - - - - - vehicles_race_interior - vehicles_race_generic - - - vehicles_race_generic - justice1 - - - \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua index 76765322a..8c4aa4e6a 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/__resource.lua @@ -2250,6 +2250,39 @@ data_file 'CARCOLS_FILE' 'data/bmwi4gc/carcols.meta' data_file 'VEHICLE_VARIATION_FILE' 'data/bmwi4gc/carvariations.meta' data_file 'VEHICLE_LAYOUTS_FILE' 'data/bmwi4gc/dlctext.meta' + -- justice1 + files { + 'data/justice1/vehicles.meta', + 'data/justice1/carvariations.meta', + 'data/justice1/carcols.meta', + 'data/justice1/handling.meta', + 'data/justice1/vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'data/justice1/handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'data/justice1/vehicles.meta' +data_file 'CARCOLS_FILE' 'data/justice1/carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'data/justice1/carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'data/justice1/dlctext.meta' + + -- justice1canine + files { + 'data/justice1canine/vehicles.meta', + 'data/justice1canine/carvariations.meta', + 'data/justice1canine/carcols.meta', + 'data/justice1canine/handling.meta', + 'data/justice1canine/vehiclelayouts.meta', +} + +data_file 'HANDLING_FILE' 'data/justice1canine/handling.meta' +data_file 'VEHICLE_METADATA_FILE' 'data/justice1canine/vehicles.meta' +data_file 'CARCOLS_FILE' 'data/justice1canine/carcols.meta' +data_file 'VEHICLE_VARIATION_FILE' 'data/justice1canine/carvariations.meta' +data_file 'VEHICLE_LAYOUTS_FILE' 'data/justice1canine/dlctext.meta' + + + + client_script { 'vehicle_names.lua' diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1canine/carcols.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/carcols.meta similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1canine/carcols.meta rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/carcols.meta diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1canine/carvariations.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/carvariations.meta similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1canine/carvariations.meta rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/carvariations.meta diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1canine/handling.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/handling.meta similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1canine/handling.meta rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/handling.meta diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/antenna4_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/antenna4_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/antenna4_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/antenna4_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/badge1_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/badge1_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/badge1_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/badge1_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/badge2_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/badge2_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/badge2_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/badge2_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/justice1canine+hi.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/justice1canine+hi.ytd similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/justice1canine+hi.ytd rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/justice1canine+hi.ytd diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/justice1canine.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/justice1canine.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/justice1canine.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/justice1canine.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/justice1canine.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/justice1canine.ytd similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/justice1canine.ytd rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/justice1canine.ytd diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/justice1canine_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/justice1canine_hi.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/justice1canine_hi.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/justice1canine_hi.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/noalpr4_18CHargj.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/noalpr4_18CHargj.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/noalpr4_18CHargj.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/noalpr4_18CHargj.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/noalpr5_18CHargj.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/noalpr5_18CHargj.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/noalpr5_18CHargj.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/noalpr5_18CHargj.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/puck2_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/puck2_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/puck2_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/puck2_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/puck_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/puck_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/puck_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/puck_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/rumbler_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/rumbler_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/rumbler_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/rumbler_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/speaker_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/speaker_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/speaker_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/speaker_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/spotlight_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/spotlight_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/spotlight_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/justice1canine/spotlight_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1canine/vehicles.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/vehicles.meta similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/data/justice1canine/vehicles.meta rename to resources/[EGRP-CarPacks]/EGRP-Emergency/justice1canine/vehicles.meta diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/antenna4_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/antenna4_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/antenna4_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/antenna4_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/badge1_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/badge1_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/badge1_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/badge1_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/badge2_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/badge2_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/badge2_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/badge2_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/barleft_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/barleft_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/barleft_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/barleft_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/barright_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/barright_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/barright_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/barright_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/justice1+hi.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/justice1+hi.ytd similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/justice1+hi.ytd rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/justice1+hi.ytd diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/justice1.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/justice1.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/justice1.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/justice1.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/justice1.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/justice1.ytd similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/justice1.ytd rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/justice1.ytd diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/justice1_hi.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/justice1_hi.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/justice1_hi.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/justice1_hi.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/antenna4_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/antenna4_18CHARGJ.yft new file mode 100644 index 000000000..28ec7f916 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/antenna4_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:636cc926adddc663dc9d645371cb05a38d7e413e6dfecbc01148277c0ff0779d +size 21769 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/badge1_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/badge1_18CHARGJ.yft new file mode 100644 index 000000000..012564fed --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/badge1_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:857ed0d7a4bcd3fab85eac2f5d2a2bd652981aefac7bb5ba5a01f05bce9b2f9c +size 31457 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/badge2_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/badge2_18CHARGJ.yft new file mode 100644 index 000000000..f88590585 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/badge2_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8294ee77f798ef45ac5f865a47f258f19dfbd4e144d346fa2342c49232d54830 +size 64189 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/barleft_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/barleft_18CHARGJ.yft new file mode 100644 index 000000000..d68c88d9e --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/barleft_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd769a09a532cde378a12c84441aaf33d4dbc2e1d6ec34fad01801a0ce3de981 +size 81636 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/barright_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/barright_18CHARGJ.yft new file mode 100644 index 000000000..3ae8c6cd0 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/barright_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa9fcb765538306d6f22282d0d269e1c746f501a209dd5245077bb9e200c9a5c +size 81794 diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/noalpr4_18CHargj.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/noalpr4_18CHargj.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/noalpr4_18CHargj.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/noalpr4_18CHargj.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/noalpr5_18CHargj.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/noalpr5_18CHargj.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/noalpr5_18CHargj.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/noalpr5_18CHargj.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/polyleft_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/polyleft_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/polyleft_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/polyleft_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/polyright_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/polyright_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1/polyright_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/polyright_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/puck2_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/puck2_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/puck2_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/puck2_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/puck_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/puck_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/puck_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/puck_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/rumbler_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/rumbler_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/rumbler_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/rumbler_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/speaker_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/speaker_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/speaker_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/speaker_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/spotlight_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/spotlight_18CHARGJ.yft similarity index 100% rename from resources/[EGRP-CarPacks]/EGRP-Bcso/stream/justice1canine/spotlight_18CHARGJ.yft rename to resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/modkits/spotlight_18CHARGJ.yft diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/noalpr4_18CHargj.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/noalpr4_18CHargj.yft new file mode 100644 index 000000000..e6b194976 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/noalpr4_18CHargj.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afa47fc90bf43ac1578b8a3bf0fa10f55d64a86690eac4953e3ec3290df0417c +size 340444 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/noalpr5_18CHargj.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/noalpr5_18CHargj.yft new file mode 100644 index 000000000..50f2e4142 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/noalpr5_18CHargj.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:996a2e717121cd944d1c8f54d8c3577bee176a8e24637db1206773a627cfd9b4 +size 337158 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/polyleft_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/polyleft_18CHARGJ.yft new file mode 100644 index 000000000..29f4a5b9c --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/polyleft_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d24a24066c33ecce511eab5f48783632e999da4f1353342ca59b7eaffcc3738 +size 1289642 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/polyright_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/polyright_18CHARGJ.yft new file mode 100644 index 000000000..20427e5e9 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/polyright_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c13d37c3c83edef2fc1c1e63076a5364ce68746df034e0bb5fc04f3b2af3c441 +size 1300039 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/puck2_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/puck2_18CHARGJ.yft new file mode 100644 index 000000000..67effd191 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/puck2_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:846968dd2d052951861eb95e441ff4193822c4b258f464eb545b7e36793fceb6 +size 15821 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/puck_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/puck_18CHARGJ.yft new file mode 100644 index 000000000..67cc7c24f --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/puck_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7f0e24d86449713247fa2cccee555932f4578c303d0ee403cffcaf1b539d5f5 +size 15819 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/rumbler_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/rumbler_18CHARGJ.yft new file mode 100644 index 000000000..d64103c98 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/rumbler_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:173f16b7172135de2c7beaf9be7bfcd5a135cadfe1fdbf0043806c09f7957070 +size 99569 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/speaker_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/speaker_18CHARGJ.yft new file mode 100644 index 000000000..4bca34384 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/speaker_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:018713c211a032b1ce15e7ca445bf6da3f19ac00ab971c4703a6d142881c81d4 +size 75736 diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/spotlight_18CHARGJ.yft b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/spotlight_18CHARGJ.yft new file mode 100644 index 000000000..c46feed21 --- /dev/null +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/justice1/spotlight_18CHARGJ.yft @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6252e5853bbf6471817fc0465c46e2ba1f57466be16c6d0598a376181eedbdae +size 133402 diff --git a/resources/thinline_assets/config.lua b/resources/thinline_assets/config.lua index 8bd88e3ab..3d1a56ed7 100644 --- a/resources/thinline_assets/config.lua +++ b/resources/thinline_assets/config.lua @@ -9,7 +9,7 @@ TLS = { Keybind = 'f3' }, EUPUI = { - Enable = true, -- Set to false if you don't want to use the EUP UI. + Enable = false, -- Set to false if you don't want to use the EUP UI. Command = 'eup' -- Change the command used to access the UI }, HelmetUI = { diff --git a/server.cfg b/server.cfg index e08f5d04b..751eae6b9 100644 --- a/server.cfg +++ b/server.cfg @@ -205,7 +205,7 @@ ensure scenes-main ensure opticomsystem ensure ebu_pmjstc ensure ebu_trlights -ensure noexplodingpumps +//ensure noexplodingpumps ensure mth-K9 ensure ensure