mirror of
https://ceregatti.org/git/daniel/dayzdockerserver.git
synced 2025-08-09 08:33:35 +00:00
Merge branch 'main' into development
# Conflicts: # .gitignore
This commit is contained in:
commit
30981c8191
22 changed files with 27 additions and 10 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -5,3 +5,4 @@ env.json
|
||||||
node_modules/
|
node_modules/
|
||||||
web/client/bin
|
web/client/bin
|
||||||
web/client/obj
|
web/client/obj
|
||||||
|
files/serverDZ.cfg.live
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
TYPES=./xml/types.xml
|
TYPES=./XML/types.xml
|
||||||
|
|
1
files/mods/1797720064/xml.env
Normal file
1
files/mods/1797720064/xml.env
Normal file
|
@ -0,0 +1 @@
|
||||||
|
TYPES=./Extras/types.xml
|
1
files/mods/1832448183/xml.env
Normal file
1
files/mods/1832448183/xml.env
Normal file
|
@ -0,0 +1 @@
|
||||||
|
TYPES=./server\ data/types.xml
|
1
files/mods/1890912719/xml.env
Normal file
1
files/mods/1890912719/xml.env
Normal file
|
@ -0,0 +1 @@
|
||||||
|
TYPES=./Types/types_FBF.xml
|
1
files/mods/2049002856/xml.env
Normal file
1
files/mods/2049002856/xml.env
Normal file
|
@ -0,0 +1 @@
|
||||||
|
TYPES=./Extra/types_MCK.xml
|
|
@ -1,2 +1,2 @@
|
||||||
TYPES=./xml_and_clasnames/snafu_types.xml
|
TYPES=./XML_and_Clasnames/SNAFU_types.xml
|
||||||
CFGSPAWNABLETYPES=./xml_and_clasnames/snafuspawnabletypes25percent.xml
|
CFGSPAWNABLETYPES=./XML_and_Clasnames/snafuspawnabletypes25percent.xml
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
CFGSPAWNABLETYPES=./files/spawnabletypes/mmg_cfgspawnabletypes.xml
|
# Merge all the XML files into a single types.xml file in the run time mods directory:
|
||||||
# Merge all the XML files into a single types.xml file:
|
|
||||||
# cd /mods/221100/2663169692/files/types
|
# cd /mods/221100/2663169692/files/types
|
||||||
# xmlmerge -o types.xml *.xml
|
# xmlmerge -o /mods/221100/2663169692/types.xml *.xml
|
||||||
TYPES=local
|
CFGSPAWNABLETYPES=./files/spawnabletypes/mmg_cfgspawnabletypes.xml
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
CFGSPAWNABLETYPES=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/RFFSHelis_cfgspawnabletypes.xml
|
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/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/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/DeerIsle/RFFSHelis_cfgeventspawns.xml
|
||||||
#CFGEVENTSPAWNS=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/Namalsk/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
|
EVENTS=https://raw.githubusercontent.com/RedFalconKen/RedFalconFlightSystem-Heliz/main/Config%20Files/Event%20Spawn%20Config/RFFSHelis_events.xml
|
||||||
|
|
1
files/mods/2693659085/xml.env
Normal file
1
files/mods/2693659085/xml.env
Normal file
|
@ -0,0 +1 @@
|
||||||
|
TYPES=./Xmls/types\(NOT\ A\ REPLACER\).xml
|
1
files/mods/2860643107/xml.env
Normal file
1
files/mods/2860643107/xml.env
Normal file
|
@ -0,0 +1 @@
|
||||||
|
TYPES=./00_Info/Types/example_types_complete.xml
|
1
files/mods/2905759309/xml.env
Normal file
1
files/mods/2905759309/xml.env
Normal file
|
@ -0,0 +1 @@
|
||||||
|
TYPES=./XML/Types.xml
|
|
@ -4,5 +4,5 @@ set -eE
|
||||||
|
|
||||||
MAP="PripyatGamma"
|
MAP="PripyatGamma"
|
||||||
DIR=""
|
DIR=""
|
||||||
REPO="https://github.com/FrenchiestFry15/PripyatMissionFiles.git"
|
REPO="https://github.com/M4ketech/PripyatMissionFiles.git"
|
||||||
MPDIR="serverMission.Pripyat"
|
MPDIR="serverMission.Pripyat"
|
||||||
|
|
1
files/mods/@BoomLaysThings
Symbolic link
1
files/mods/@BoomLaysThings
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
2860643107
|
1
files/mods/@BowenCamoGear
Symbolic link
1
files/mods/@BowenCamoGear
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
2905759309
|
1
files/mods/@FlipTransport
Symbolic link
1
files/mods/@FlipTransport
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
1832448183
|
1
files/mods/@ForeverBurningCampfire
Symbolic link
1
files/mods/@ForeverBurningCampfire
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
1890912719
|
1
files/mods/@MassClothing
Symbolic link
1
files/mods/@MassClothing
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
2693659085
|
1
files/mods/@MuchCarKey
Symbolic link
1
files/mods/@MuchCarKey
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
2049002856
|
1
files/mods/@WindstridesClothingPack
Symbolic link
1
files/mods/@WindstridesClothingPack
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
1797720064
|
|
@ -86,6 +86,7 @@ class Missions
|
||||||
class DayZ
|
class DayZ
|
||||||
{
|
{
|
||||||
template="dayzOffline.chernarusplus"; // Chernarus
|
template="dayzOffline.chernarusplus"; // Chernarus
|
||||||
|
// template="dayzOffline.sakhal"; // Sakhal
|
||||||
// template="dayzOffline.enoch"; // Livonia
|
// template="dayzOffline.enoch"; // Livonia
|
||||||
// template="empty.banov"; // Banov
|
// template="empty.banov"; // Banov
|
||||||
// template="empty.deerisle"; // Deer Isle
|
// template="empty.deerisle"; // Deer Isle
|
||||||
|
|
|
@ -16,9 +16,11 @@ RUN apt-get update && apt-get -y upgrade && apt-get -y install --no-install-reco
|
||||||
jq \
|
jq \
|
||||||
libxml2-utils \
|
libxml2-utils \
|
||||||
locales \
|
locales \
|
||||||
|
ltrace \
|
||||||
nano \
|
nano \
|
||||||
patch \
|
patch \
|
||||||
procps \
|
procps \
|
||||||
|
strace \
|
||||||
wget \
|
wget \
|
||||||
xmlstarlet
|
xmlstarlet
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue