Updated some things
Based on Greelan's review, I've updated the following: 1. Removed unnecessary ports 2. Clarified Max Heap needs "m" at the end 3. Added "" around startup args that were manually inserted
This commit is contained in:
parent
829c1e5614
commit
47f83ab12d
@ -1,9 +1,17 @@
|
|||||||
App.AdminMethod=STDIO
|
App.AdminMethod=STDIO
|
||||||
App.ApplicationPort1=8766
|
App.ApplicationPort1=8766
|
||||||
App.ApplicationPort2=27016
|
App.ApplicationPort2=27016
|
||||||
|
<<<<<<< Updated upstream
|
||||||
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}}
|
||||||
|
=======
|
||||||
|
App.ApplicationPort3=0
|
||||||
|
App.RemoteAdminPort=0
|
||||||
|
App.ApplicationReadyMode=RegexMatch
|
||||||
|
App.BaseDirectory=./wurm-unlimited/402370/
|
||||||
|
App.CommandLineArgs=ip="{{$ApplicationIPBinding}}" externalport="{{$ApplicationPort1}}" queryport="{{$ApplicationPort2}}" {{$FormattedArgs}}
|
||||||
|
>>>>>>> Stashed changes
|
||||||
App.LinuxCommandLineArgs=
|
App.LinuxCommandLineArgs=
|
||||||
App.WindowsCommandLineArgs=
|
App.WindowsCommandLineArgs=
|
||||||
App.CommandLineParameterDelimiter=
|
App.CommandLineParameterDelimiter=
|
||||||
@ -19,7 +27,11 @@ 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}]
|
||||||
|
=======
|
||||||
|
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.+$
|
||||||
|
@ -175,7 +175,11 @@
|
|||||||
{
|
{
|
||||||
"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",
|
||||||
|
=======
|
||||||
|
"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",
|
||||||
@ -195,5 +199,36 @@
|
|||||||
"ParamFieldName": "VMParams.JvmParam0",
|
"ParamFieldName": "VMParams.JvmParam0",
|
||||||
"IncludeInCommandLine": false,
|
"IncludeInCommandLine": false,
|
||||||
"DefaultValue": "-XX:+AggressiveOpts",
|
"DefaultValue": "-XX:+AggressiveOpts",
|
||||||
|
<<<<<<< Updated upstream
|
||||||
|
=======
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"DisplayName": "Override Java Location",
|
||||||
|
"Category": "Server Settings",
|
||||||
|
"Description": "If you receive \"Failed to load jvm.dll\", you may specify a custom location where the jvm.dll is located. Only change this if you know what you're doing!",
|
||||||
|
"Keywords": "custom,java,arguments,args,location",
|
||||||
|
"FieldName": "OverrideJavaRegEntry",
|
||||||
|
"InputType": "text",
|
||||||
|
"IsFlagArgument": false,
|
||||||
|
"ParamFieldName": "Runtime.OverrideJavaRegEntry",
|
||||||
|
"IncludeInCommandLine": false,
|
||||||
|
"DefaultValue": "false",
|
||||||
|
"EnumValues": {
|
||||||
|
"True": "true",
|
||||||
|
"False": "false"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"DisplayName": "Custom Java Location",
|
||||||
|
"Category": "Server Settings",
|
||||||
|
"Description": "If you receive \"Failed to load jvm.dll\", you may specify a custom location where the jvm.dll is located. Only change this if you know what you're doing!",
|
||||||
|
"Keywords": "custom,java,arguments,args,location",
|
||||||
|
"FieldName": "JavaPath",
|
||||||
|
"InputType": "text",
|
||||||
|
"IsFlagArgument": false,
|
||||||
|
"ParamFieldName": "Runtime.JavaPath",
|
||||||
|
"IncludeInCommandLine": false,
|
||||||
|
"DefaultValue": "C:\\Program Files\\Java\\jre1.8.0_321\\bin\\server",
|
||||||
|
>>>>>>> Stashed changes
|
||||||
}
|
}
|
||||||
]
|
]
|
Loading…
Reference in New Issue
Block a user