Merge branch 'main' into development

# Conflicts:
#	.gitignore
This commit is contained in:
Daniel Ceregatti 2025-07-26 12:04:55 -07:00
commit 30981c8191
22 changed files with 27 additions and 10 deletions

1
.gitignore vendored
View file

@ -5,3 +5,4 @@ env.json
node_modules/
web/client/bin
web/client/obj
files/serverDZ.cfg.live

View file

@ -1 +1 @@
TYPES=./xml/types.xml
TYPES=./XML/types.xml

View file

@ -0,0 +1 @@
TYPES=./Extras/types.xml

View file

@ -0,0 +1 @@
TYPES=./server\ data/types.xml

View file

@ -0,0 +1 @@
TYPES=./Types/types_FBF.xml

View file

@ -0,0 +1 @@
TYPES=./Extra/types_MCK.xml

View file

@ -1,2 +1,2 @@
TYPES=./xml_and_clasnames/snafu_types.xml
CFGSPAWNABLETYPES=./xml_and_clasnames/snafuspawnabletypes25percent.xml
TYPES=./XML_and_Clasnames/SNAFU_types.xml
CFGSPAWNABLETYPES=./XML_and_Clasnames/snafuspawnabletypes25percent.xml

View file

@ -1,5 +1,4 @@
CFGSPAWNABLETYPES=./files/spawnabletypes/mmg_cfgspawnabletypes.xml
# Merge all the XML files into a single types.xml file:
# Merge all the XML files into a single types.xml file in the run time mods directory:
# cd /mods/221100/2663169692/files/types
# xmlmerge -o types.xml *.xml
TYPES=local
# xmlmerge -o /mods/221100/2663169692/types.xml *.xml
CFGSPAWNABLETYPES=./files/spawnabletypes/mmg_cfgspawnabletypes.xml

View file

@ -1,6 +1,6 @@
CFGSPAWNABLETYPES=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/RFFSHelis_cfgspawnabletypes.xml
#CFGEVENTSPAWNS=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/Banov/RFFSHelis_cfgeventspawns.xml
CFGEVENTSPAWNS=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/Chernarus/RFFSHelis_cfgeventspawns.xml
CFGEVENTSPAWNS=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/Banov/RFFSHelis_cfgeventspawns.xml
#CFGEVENTSPAWNS=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/Chernarus/RFFSHelis_cfgeventspawns.xml
#CFGEVENTSPAWNS=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/DeerIsle/RFFSHelis_cfgeventspawns.xml
#CFGEVENTSPAWNS=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/Namalsk/RFFSHelis_cfgeventspawns.xml
EVENTS=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/RFFSHelis_events.xml

View file

@ -0,0 +1 @@
TYPES=./Xmls/types\(NOT\ A\ REPLACER\).xml

View file

@ -0,0 +1 @@
TYPES=./00_Info/Types/example_types_complete.xml

View file

@ -0,0 +1 @@
TYPES=./XML/Types.xml

View file

@ -4,5 +4,5 @@ set -eE
MAP="PripyatGamma"
DIR=""
REPO="https://github.com/FrenchiestFry15/PripyatMissionFiles.git"
REPO="https://github.com/M4ketech/PripyatMissionFiles.git"
MPDIR="serverMission.Pripyat"

1
files/mods/@BoomLaysThings Symbolic link
View file

@ -0,0 +1 @@
2860643107

1
files/mods/@BowenCamoGear Symbolic link
View file

@ -0,0 +1 @@
2905759309

1
files/mods/@FlipTransport Symbolic link
View file

@ -0,0 +1 @@
1832448183

View file

@ -0,0 +1 @@
1890912719

1
files/mods/@MassClothing Symbolic link
View file

@ -0,0 +1 @@
2693659085

1
files/mods/@MuchCarKey Symbolic link
View file

@ -0,0 +1 @@
2049002856

View file

@ -0,0 +1 @@
1797720064

View file

@ -86,6 +86,7 @@ class Missions
class DayZ
{
template="dayzOffline.chernarusplus"; // Chernarus
// template="dayzOffline.sakhal"; // Sakhal
// template="dayzOffline.enoch"; // Livonia
// template="empty.banov"; // Banov
// template="empty.deerisle"; // Deer Isle

View file

@ -16,9 +16,11 @@ RUN apt-get update && apt-get -y upgrade && apt-get -y install --no-install-reco
jq \
libxml2-utils \
locales \
ltrace \
nano \
patch \
procps \
strace \
wget \
xmlstarlet