Mirrors/docker-minecraft-server
2
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server synced 2024-12-15 14:52:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
794 commits 24 branches 496 tags 20 MiB
Commit graph

34 commits

Author SHA1 Message Date
Geoff Bourne
c07f899870 Auto-merging via docker-versions-create 
# Conflicts:
#	start-deployFTB
 2020-07-10 17:13:05 -05:00
Geoff Bourne
9a7a532f7b Changed order of /plugins rsync to be before processing env vars 
For #577
 2020-07-06 17:16:51 -05:00
Geoff Bourne
e527fd9551 Auto-merging via docker-versions-create 2020-07-04 14:58:40 -05:00
Kamaroth92
c4654e44d8
Move server-icon.png to FTB_DIR if exists (#573) 
Co-authored-by: Tane Barriball <tanebarriball@gmail.com>
 2020-07-04 09:08:37 -05:00
Geoff Bourne
8493252645 Auto-merging via docker-versions-create 
# Conflicts:
#	Dockerfile
#	README.md
#	start
#	start-configuration
#	start-deployFTB
 2020-06-19 15:01:28 -05:00
Geoff Bourne
f5dde77efe Enabled iterative development with SCRIPTS var 2020-06-19 11:05:32 -05:00
Geoff Bourne
aa42633ab2 Added support for FTB application modpacks via modpacks.ch 
For #524
 2020-05-31 18:18:54 -05:00
Mitchell Skaggs
ede58d9159
Update flags as of 5/2/2020 (#534) 2020-05-18 19:55:32 -05:00
Geoff Bourne
c68997936a Added units description for DEBUG_MEMORY option 2020-04-27 08:04:11 -05:00
Geoff Bourne
40547439b2 Added DEBUG_MEMORY option 2020-04-27 07:55:38 -05:00
Geoff Bourne
e9b1332119 Added support for Magma servers 
For #497
 2020-04-21 18:30:48 -05:00
Geoff Bourne
1cf478f5b3 Removed pre-creating /mods /config /plugins 2020-04-17 21:16:04 -05:00
Matthieu Berthomé
220f2fbd79
add some /data prefixes in missing places (#493) 
Co-authored-by: rienafairefr <rienafairefr@gmail.com>
 2020-04-15 08:20:11 -05:00
Geoff Bourne
8dbbdd8cd2 Added logic to skip --noconsole on newer versions 
Fixes #452
 2020-04-13 18:29:44 -05:00
Geoff Bourne
1c2a0c506c Added support for TYPE=CURSE_INSTANCE 2020-04-12 14:31:19 -05:00
Geoff Bourne
cd70cbcbea Enhanced Aikar's flag logic to adjust for >12GB memory 
For #483
 2020-04-11 10:41:20 -05:00
Geoff Bourne
7910005086 Added option to use Aikar's flags 2020-04-11 08:43:17 -05:00
Geoff Bourne
56c2f0b466 Disabled log4j config when TYPE=SPIGOT 
Helps #482
 2020-04-05 17:32:26 -05:00
Geoff Bourne
4bbc7d142f Fixed /plugins support for Paper servers 2020-04-04 10:13:51 -05:00
Geoff Bourne
d62c2ffb42 Added ENABLE_JMX option 2020-04-03 12:32:46 -05:00
Geoff Bourne
98f0b36cfc Changed FTB exec to always use shell 
For #469
 2020-04-01 18:50:07 -05:00
Geoff Bourne
4ad447ba6c Used shell when FTB server script missing shebang line 
For #467
 2020-03-29 11:43:26 -05:00
Timo Meijer
fc6129261b
Add customized log file with 7 day retention (#455) 2020-03-20 16:29:52 -05:00
Malcolm Nihlén
1e334ca7d5
Added log prefixes (#444) 2020-03-06 09:52:17 -06:00
Geoff Bourne
9d67dceff3 Removed the remaining use of python 2020-01-30 21:39:35 -06:00
jmyoung
15990071d4 Fixed JVM_XX_OPTS for FTB servers (#400) 2019-10-14 11:24:26 -05:00
Geoff Bourne
2900062df5 Always update whitelist from env since it is processed additive anyway 
For #283
 2019-09-22 16:48:59 -05:00
Geoff Bourne
621962ad9c Always populate ops.txt to allow for additive config 
For #283
 2019-09-08 17:22:20 -05:00
Geoff Bourne
e6bfa01db5 Revert "Switch to OpenJ9 base image (#360)" 
This reverts commit 93197ffb
 2019-08-10 17:47:46 -05:00
Geoff Bourne
93197ffb77 Switch to OpenJ9 base image (#360) 2019-08-10 17:04:38 -05:00
Tyler Page
53800e460f fix settings.cfg and preserve semicolons if present (#369) 2019-08-02 11:29:22 -05:00
Geoff Bourne
e61942f33e Revert "Update start-minecraftFinalSetup (#365)" 
This reverts commit f8b97bf9
 2019-08-01 18:03:11 -05:00
Tyler Page
f8b97bf909 Update start-minecraftFinalSetup (#365) 2019-07-31 18:58:13 -05:00
Geoff Bourne
c60156d245 Moved Minecraft server files to top-level 2019-07-20 15:51:40 -05:00
Renamed from minecraft-server/start-minecraftFinalSetup (Browse further)