Merge branch 'master' into update/forge_enhanced

This commit is contained in:
Michael (Parker) Parker 2020-04-17 13:30:10 -04:00 committed by GitHub
commit a04a9b1877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

View File

@ -74,7 +74,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
* [Cuberite](/minecraft_java/cuberite/) * [Cuberite](/minecraft_java/cuberite/)
* [Forge](/minecraft_java/forge/) * [Forge](/minecraft_java/forge/)
* [Feed The Beast](/minecraft_java/ftb/) * [Feed The Beast](/minecraft_java/ftb/)
* [Magma](/minecraft/magma/) * [Magma](/minecraft_java/magma/)
* [Paper](/minecraft_java/paper) * [Paper](/minecraft_java/paper)
* [Spigot](/minecraft_java/spigot/) * [Spigot](/minecraft_java/spigot/)
* [spongeforge](/minecraft_java/spongeforge/) * [spongeforge](/minecraft_java/spongeforge/)

View File

@ -3,7 +3,7 @@
"meta": { "meta": {
"version": "PTDL_v1" "version": "PTDL_v1"
}, },
"exported_at": "2020-04-14T13:21:38-04:00", "exported_at": "2020-04-16T20:29:22-04:00",
"name": "Forge Enhanced", "name": "Forge Enhanced",
"author": "parker@parkervcp.com", "author": "parker@parkervcp.com",
"description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.",

View File

@ -17,7 +17,7 @@
}, },
"scripts": { "scripts": {
"installation": { "installation": {
"script": "#!\/bin\/ash\r\n\r\napk add --no-cache wget binutils xz\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting file from: https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb\"\r\n\r\nwget https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb -O openttd.deb\r\n\r\nar -x openttd.deb\r\n\r\ntar -xvf data.tar.xz\r\n\r\nmv usr\/share\/games\/openttd\/* .\/\r\n\r\nmv usr\/games\/openttd .\/\r\n\r\nchmod +x openttd\r\n\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/${OPENGFX_VERSION}\/opengfx-${OPENGFX_VERSION}-all.zip -O opengfx.zip\r\n\r\nunzip opengfx.zip \r\n\r\ntar --strip-components=1 -C baseset\/ -xvf opengfx*.tar\r\n\r\nrm open*zip open*tar open*gz debian-binary open*deb\r\n\r\n[ -f \/home\/container\/openttd.cfg ] || curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/tycoon_games\/openttd\/openttd.cfg > openttd.cfg", "script": "#!\/bin\/ash\r\n\r\napk add --no-cache wget binutils xz curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting file from: https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb\"\r\n\r\nwget https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb -O openttd.deb\r\n\r\nar -x openttd.deb\r\n\r\ntar -xvf data.tar.xz\r\n\r\nmv usr\/share\/games\/openttd\/* .\/\r\n\r\nmv usr\/games\/openttd .\/\r\n\r\nchmod +x openttd\r\n\r\nwget https:\/\/cdn.openttd.org\/opengfx-releases\/${OPENGFX_VERSION}\/opengfx-${OPENGFX_VERSION}-all.zip -O opengfx.zip\r\n\r\nunzip opengfx.zip \r\n\r\ntar --strip-components=1 -C baseset\/ -xvf opengfx*.tar\r\n\r\nrm open*zip open*tar open*gz debian-binary open*deb\r\n\r\n[ -f \/home\/container\/openttd.cfg ] || curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/tycoon_games\/openttd\/openttd.cfg > openttd.cfg",
"container": "alpine:3.10", "container": "alpine:3.10",
"entrypoint": "ash" "entrypoint": "ash"
} }
@ -43,18 +43,18 @@
}, },
{ {
"name": "OpenTTD Version", "name": "OpenTTD Version",
"description": "The version of OpenTTD i.e. 1.9.1", "description": "The version of OpenTTD i.e. 1.10.1",
"env_variable": "OPENTTD_VERSION", "env_variable": "OPENTTD_VERSION",
"default_value": "1.9.1", "default_value": "1.10.1",
"user_viewable": 1, "user_viewable": 1,
"user_editable": 0, "user_editable": 0,
"rules": "required|string|max:20" "rules": "required|string|max:20"
}, },
{ {
"name": "OpenGFX Version", "name": "OpenGFX Version",
"description": "The OpenGFX Version i.e. 0.5.5", "description": "The OpenGFX Version i.e. 0.6.0",
"env_variable": "OPENGFX_VERSION", "env_variable": "OPENGFX_VERSION",
"default_value": "0.5.5", "default_value": "0.6.0",
"user_viewable": 1, "user_viewable": 1,
"user_editable": 0, "user_editable": 0,
"rules": "required|string|max:20" "rules": "required|string|max:20"