Commit Graph

447 Commits

Author SHA1 Message Date
Dirk Gustke
230b575983 fix_properly_set_ftb_properties - use a unified setter, set the correct file 2018-01-28 13:16:45 +01:00
Dirk Gustke
2f3e93c619 fix_properly_set_ftb_properties - revert disfunctional change 2018-01-28 13:15:41 +01:00
Geoff Bourne
59753d8310
Merge pull request #190 from scones/patch-1
making use of all the server properties magic in ftb packages ..
2018-01-27 12:38:23 -06:00
Dirk Gustke
4fb881a583
Update start-deployFTB 2018-01-27 15:33:50 +01:00
Dirk Gustke
e42e9ac489
making use of all the server properties magic in ftb packages .. 2018-01-27 15:06:09 +01:00
Geoff Bourne
f5f20f3563 [mc] For FTB add legacy java fixer option 2018-01-07 17:19:10 -06:00
Geoff Bourne
931c27a5ec
Clarify discontinued images in top level README 2017-12-25 11:33:46 -06:00
Geoff Bourne
bc100163c2 [mc] Use image rather than build in example proxied compose file 2017-12-08 10:03:45 -06:00
Geoff Bourne
3a64e32184 [mc] Add PROXY env var option
For #177
2017-12-08 09:48:55 -06:00
Geoff Bourne
b9787182e6
Merge pull request #184 from BinaryShock/spongeIntegration
Sponge integration
2017-11-07 21:13:33 -06:00
Aitor Ramos Sasselli
7797bf23fb
Added optional parameters on SpongeVanilla server 2017-11-06 09:52:26 +01:00
Aitor Ramos Sasselli
f347f30353 Added initial SpongeForge information to Readme 2017-11-05 22:41:11 +01:00
Aitor Ramos Sasselli
eb239bfdb7 Changes in master updated to this branch 2017-11-02 04:10:39 +01:00
Geoff Bourne
7047e565fc
Merge pull request #183 from BinaryShock/minecraft-refactor
Code refactorization
2017-11-01 21:26:17 -05:00
Aitor Ramos Sasselli
f178c6c0a1 SpongeVanilla integration and JSON check fix 2017-11-01 22:06:05 +01:00
Aitor Ramos Sasselli
ee5a95baa8 Repaired some bugs from refactor 2017-11-01 06:42:44 +01:00
Aitor Ramos Sasselli
0c1c6d198c Repaired some bugs from refactor 2017-11-01 06:41:55 +01:00
Aitor Ramos Sasselli
a0e605814f Code refactorization 2017-10-28 10:04:52 +02:00
Geoff Bourne
518986d28e [mc] Added support for LEVEL_TYPE = RTG 2017-10-02 20:06:41 -05:00
Geoff Bourne
2357914b4c [es] Upgrade to 5.5.2 2017-09-24 19:17:38 -05:00
Geoff Bourne
e5a4428515 [mc] Install iputils and wget for FTB compat 2017-09-24 11:46:47 -05:00
Geoff Bourne
6b9033318b [mc] For FTB pass-thru custom mod URLs
for #155
2017-09-03 20:20:25 -05:00
Geoff Bourne
9ee907783d [mc] Added issues link 2017-09-02 12:29:50 -05:00
Geoff Bourne
463cc62b75 [mc] Check writability of /data
Document JVM_OPTS
For #176 and #177
2017-09-02 12:24:09 -05:00
Geoff Bourne
5afd98edd8 [es] Upgrade to 5.5.1 2017-08-12 13:58:39 -05:00
Geoff Bourne
8b9051d72e Merge pull request #174 from Rob5Underscores/master
Add support for a zip file of mod configs to be supplied!
2017-07-17 06:56:44 -05:00
Rob Weddell
d6392f3aa9 Add support for a zip file of mod configs to be supplied!
This was added such that Sponge servers are supported.
(For Sponge: TYPE=FORGE, MODPACK=[zip including sponge plugins and jar], MODCONFIG=[sponge configuration])
2017-07-17 11:48:23 +01:00
Geoff Bourne
fe808be91b Merge pull request #173 from opHASnoNAME/master
Set UID for ES_DEFAULT_USER to 1100, avoid conflicts with debian host…
2017-07-16 14:16:24 -05:00
Arne Riemann
2cab10e906 Forgot -u for UID 2017-07-16 16:09:28 +02:00
Geoff Bourne
7f39d1f22e [mc] Properly check empty json files to fix
For #162
2017-07-15 20:02:40 -05:00
Arne Riemann
a9184368c1 Set UID for ES_DEFAULT_USER to 1100, avoid conflicts with debian host systems 2017-07-15 06:38:36 +02:00
Geoff Bourne
caf2fc2ab6 [es] Correcting old-ADD tar file path 2017-07-13 09:09:10 -05:00
Geoff Bourne
5dd8141e5e Merge pull request #169 from manojsb/patch-1
Upgrade to ES 5.5.0
2017-07-13 08:53:42 -05:00
Geoff Bourne
2ff28675d4 [es] Adapt to new Dockerfile ADD behavior 2017-07-13 08:52:02 -05:00
Manoj Kumar
519bd986b5 Update Dockerfile
Updated to v5.5.0
2017-07-12 11:41:13 +05:30
Geoff Bourne
e41efba176 [es] Using NON_DATA in 3x1GB stack
For #165
2017-07-04 18:08:10 -05:00
Geoff Bourne
0502813496 [es] Add NON_DATA type
For #165
2017-07-04 18:06:08 -05:00
Geoff Bourne
932a6828f9 [mc] Auto fix pre 1.12 empty json
For #162
2017-07-03 14:20:12 -05:00
Geoff Bourne
d176ef3f6a Merge pull request #167 from lukascernydis/master
Added option REMOVE_OLD_MODS
2017-07-01 20:09:12 -05:00
Lukáš Černý
deb98268f6 Added option REMOVE_OLD_MODS 2017-07-02 01:32:24 +02:00
Geoff Bourne
e1531c3237 [mc] Switch to openjdk alpine base image 2017-06-29 19:45:51 -05:00
Geoff Bourne
47af45a430 Merge pull request #166 from macman31/patch-1
Fix typos in config file generation
2017-06-29 19:19:11 -05:00
ATMD
0195b42eea Fix regex to change gamemode value
The sed command `sed -i "/gamemode\s*=/ c gamemode=$MODE" $SERVER_PROPERTIES` matches all lines containing `gamemode=`.
This includes the line `force-gamemode` that is set it with `setServerProp "force-gamemode" "$FORCE_GAMEMODE"`
So basically the `force-gamemode` line is erased and the `gamemode=value` line is duplicated, and then the server cleans it up at start and deduplicates the `gamemode` line and create a new `force-gamemode` line with a default value.
This fix ensures that only the `gamemode=` line is modified when changing the gamemode value.
2017-06-29 21:53:26 +02:00
ATMD
f875af5cdb Delete repetition of spawn-npcs 2017-06-29 20:25:24 +02:00
ATMD
32a918b902 Fix typo SPAWN_ANIMIALS 2017-06-29 19:56:14 +02:00
Geoff Bourne
d09a56075f [es] Add an example minimal composition 2017-06-28 23:17:39 -05:00
Geoff Bourne
e261fae348 [es] Upgrade to 5.4.2 2017-06-21 19:06:13 -05:00
Geoff Bourne
5b8668d73f [mc] Add dinnerbone's mcstatus and use it for HEALTHCHECK
Part of #159
2017-06-11 11:03:00 -05:00
Geoff Bourne
123292b56b Merge pull request #156 from dirkcjelli/mc_fixes
minecraft-server: Fixed FORGEVERSION case, add support for BIOMESOP
Fixes #139
2017-06-07 21:00:39 -05:00
Sascha Askani
0e0828f47f Revert "Fix FORGEVERSION -> FORGE_VERSION, remove unneeded statement in default"
This reverts commit cb6643a345.
2017-06-07 20:55:39 -05:00