Browse Source

Merge branch 'refs/heads/pr/1' into mcserver

# Conflicts:
#	Minecraft/mcserver
pull/1011/head
Marvin Lehmann 9 years ago
parent
commit
6b5dbb93d7
  1. 2
      Minecraft/mcserver

2
Minecraft/mcserver

@ -61,7 +61,7 @@ functionsdir="${lgsmdir}/functions"
filesdir="${rootdir}/serverfiles"
systemdir="${filesdir}"
executabledir="${filesdir}"
executable="java -Xmx512M -Xms512M -jar minecraft_server.jar"
executable="java -Xmx512M -jar minecraft_server.jar"
servercfg="server.properties"
servercfgdir="${filesdir}"
servercfgfullpath="${servercfgdir}/${servercfg}"

Loading…
Cancel
Save