Yadciel/AMPTemplates
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strange commit

Browse Source 
Not sure what went wrong. This is the fixed files.
This commit is contained in:
James Manker 2022-02-13 14:27:15 -06:00
parent 47f83ab12d
commit 4f96ad7cef
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wurm-unlimited.kvp
View File

@ -1,17 +1,11 @@
App.AdminMethod=STDIO App.AdminMethod=STDIO
App.ApplicationPort1=8766 App.ApplicationPort1=8766
App.ApplicationPort2=27016 App.ApplicationPort2=27016
<<<<<<< Updated upstream
App.ApplicationReadyMode=RegexMatch
App.BaseDirectory=./wurm-unlimited/402370/
App.CommandLineArgs=ip={{$ApplicationIPBinding}} externalport={{$ApplicationPort1}} queryport={{$ApplicationPort2}} {{$FormattedArgs}}
=======
App.ApplicationPort3=0 App.ApplicationPort3=0
App.RemoteAdminPort=0 App.RemoteAdminPort=0
App.ApplicationReadyMode=RegexMatch App.ApplicationReadyMode=RegexMatch
App.BaseDirectory=./wurm-unlimited/402370/ App.BaseDirectory=./wurm-unlimited/402370/
App.CommandLineArgs=ip="{{$ApplicationIPBinding}}" externalport="{{$ApplicationPort1}}" queryport="{{$ApplicationPort2}}" {{$FormattedArgs}} App.CommandLineArgs=ip="{{$ApplicationIPBinding}}" externalport="{{$ApplicationPort1}}" queryport="{{$ApplicationPort2}}" {{$FormattedArgs}}
>>>>>>> Stashed changes
App.LinuxCommandLineArgs= App.LinuxCommandLineArgs=
App.WindowsCommandLineArgs= App.WindowsCommandLineArgs=
App.CommandLineParameterDelimiter= App.CommandLineParameterDelimiter=
@ -27,11 +21,7 @@ App.HasWritableConsole=false
App.RapidStartup=false App.RapidStartup=false
App.RootDir=./wurm-unlimited/ App.RootDir=./wurm-unlimited/
App.UpdateSource=Multi App.UpdateSource=Multi
<<<<<<< Updated upstream
App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":31,"UpdateSource":4,"UpdateSourceData":"402370","UpdateSourceArgs":null,"UpdateSourceVersion":null,"UpdateSourceTarget":null,"UnzipUpdateSource":false,"OverwriteExistingFiles":false,"ForceDownloadPlatform":0,"UpdateSourceConditionSetting":null,"UpdateSourceConditionValue":null}]
=======
App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":31,"UpdateSource":4,"UpdateSourceData":"402370","UpdateSourceArgs":null,"UpdateSourceVersion":null,"UpdateSourceTarget":null,"UnzipUpdateSource":false,"OverwriteExistingFiles":false,"ForceDownloadPlatform":0,"UpdateSourceConditionSetting":null,"UpdateSourceConditionValue":null},{"UpdateStageName":"Start Server","UpdateSourcePlatform":"All","UpdateSource":"StartApplication"},{"UpdateStageName":"Wait For Server Start","UpdateSourcePlatform":"All","UpdateSource":"WaitForStartupComplete"},{"UpdateStageName":"Stop Server","UpdateSourcePlatform":"All","UpdateSource":"ShutdownApplication"}] App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":31,"UpdateSource":4,"UpdateSourceData":"402370","UpdateSourceArgs":null,"UpdateSourceVersion":null,"UpdateSourceTarget":null,"UnzipUpdateSource":false,"OverwriteExistingFiles":false,"ForceDownloadPlatform":0,"UpdateSourceConditionSetting":null,"UpdateSourceConditionValue":null},{"UpdateStageName":"Start Server","UpdateSourcePlatform":"All","UpdateSource":"StartApplication"},{"UpdateStageName":"Wait For Server Start","UpdateSourcePlatform":"All","UpdateSource":"WaitForStartupComplete"},{"UpdateStageName":"Stop Server","UpdateSourcePlatform":"All","UpdateSource":"ShutdownApplication"}]
>>>>>>> Stashed changes
App.WorkingDir=402370 App.WorkingDir=402370
App.MaxUsers=100 App.MaxUsers=100
Console.ThrowawayMessageRegex=^(WARNING|ERROR): Shader.+$ Console.ThrowawayMessageRegex=^(WARNING|ERROR): Shader.+$

7
wurm-unlimitedconfig.json
View File

@ -175,11 +175,7 @@
{ {
"DisplayName": "Memory Limit", "DisplayName": "Memory Limit",
"Category": "Server Settings", "Category": "Server Settings",
<<<<<<< Updated upstream
"Description": "Java's maximum heap size",
=======
"Description": "Java's maximum heap size (Must include ####m at the end)", "Description": "Java's maximum heap size (Must include ####m at the end)",
>>>>>>> Stashed changes
"Keywords": "maximum,memory,limit", "Keywords": "maximum,memory,limit",
"FieldName": "MaxHeapSize", "FieldName": "MaxHeapSize",
"InputType": "text", "InputType": "text",
@ -199,8 +195,6 @@
"ParamFieldName": "VMParams.JvmParam0", "ParamFieldName": "VMParams.JvmParam0",
"IncludeInCommandLine": false, "IncludeInCommandLine": false,
"DefaultValue": "-XX:+AggressiveOpts", "DefaultValue": "-XX:+AggressiveOpts",
<<<<<<< Updated upstream
=======
}, },
{ {
"DisplayName": "Override Java Location", "DisplayName": "Override Java Location",
@ -229,6 +223,5 @@
"ParamFieldName": "Runtime.JavaPath", "ParamFieldName": "Runtime.JavaPath",
"IncludeInCommandLine": false, "IncludeInCommandLine": false,
"DefaultValue": "C:\\Program Files\\Java\\jre1.8.0_321\\bin\\server", "DefaultValue": "C:\\Program Files\\Java\\jre1.8.0_321\\bin\\server",
>>>>>>> Stashed changes
} }
] ]