amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-02-20 00:06:24 +00:00
Code Issues Projects Releases Wiki Activity
1,289 Commits 35 Branches 526 Tags
2021.20.0-java8-multiarch
Commit Graph

69 Commits

Author SHA1 Message Date
Geoff Bourne
5e9806736c Auto-merging via docker-versions-create 2021-08-30 21:36:43 -05:00
Geoff Bourne
ecd253dd3e Added support for TYPE=LIMBO (#994) 2021-08-15 12:44:31 -05:00
Geoff Bourne
b3b3cdde08 Don't warn about Forge on Java 8 for 1.17+ 2021-07-25 09:50:40 -05:00
Geoff Bourne
d8786d4785 Auto-merging via docker-versions-create 2021-05-19 20:31:17 -05:00
Geoff Bourne
49d89d3e73 Auto-merging via docker-versions-create 2021-05-19 20:25:00 -05:00
Stealthii
f473cfc6f2 Add support for Canyon server for b1.7.3 (#879) 2021-05-19 20:16:57 -05:00
Geoff Bourne
4fb791b490 Merge branch 'multiarch' into java8-multiarch 
# Conflicts:
#	Dockerfile
#	start-configuration
 2021-05-14 17:59:49 -05:00
Geoff Bourne
9fe1cb4a0d ci: Switched multiarch-java8 to be based on adoptopenjdk:8-jre-hotspot 2021-04-21 20:13:22 -05:00
Geoff Bourne
10a3037ab3 Merged latest from master 2021-04-08 19:32:07 -05:00
Geoff Bourne
9ccfca5061 Merged latest from master 2021-04-08 19:24:14 -05:00
Geoff Bourne
812c6365ec Merged latest from master 2021-04-08 19:14:45 -05:00
Jawa_Juice
52cbf1fb64 Add support for Airplane servers (#826) 2021-04-08 18:50:06 -05:00
Geoff Bourne
6fab527eed Auto-merging via docker-versions-create 2021-04-01 16:40:48 -05:00
Geoff Bourne
9690832247 Auto-merging via docker-versions-create 2021-04-01 16:39:46 -05:00
Geoff Bourne
2bdaa4dc4e Updated java8 warning message for ClassCastException 
#775
 2021-03-12 17:22:54 -06:00
Geoff Bourne
44769b6001 Shifted PATH-fix earlier in startup 2021-03-06 16:06:43 -06:00
Geoff Bourne
ebabfeb669 Shifted PATH-fix earlier in startup 2021-03-06 16:05:01 -06:00
Geoff Bourne
6266a7e3cc Shifted PATH-fix earlier in startup 2021-03-06 16:04:31 -06:00
Geoff Bourne
5c1f176848 Shifted PATH-fix earlier in startup 2021-03-06 16:03:37 -06:00
Geoff Bourne
4186cfd91c Auto-merging via docker-versions-create 2021-02-27 20:56:01 -06:00
Geoff Bourne
457e9b53c7 Auto-merging via docker-versions-create 2021-02-27 20:55:30 -06:00
Geoff Bourne
871ecd4d9d Merge branch 'master' into java8-multiarch 
# Conflicts:
#	start-minecraftFinalSetup
 2021-02-27 20:52:36 -06:00
Geoff Bourne
fa53abdfb7 Add missing server.properties when needed 
#776
 2021-02-21 14:32:41 -06:00
Geoff Bourne
60809fe5ad Merge from master 
CONFLICT (content): Merge conflict in start-configuration
 2021-02-10 14:08:21 -06:00
Geoff Bourne
51c5902db0 Merge from master 
CONFLICT (content): Merge conflict in start-configuration
 2021-02-10 14:06:10 -06:00
Geoff Bourne
eccfa444a9 Auto-merging via docker-versions-create 2021-02-10 14:02:05 -06:00
Geoff Bourne
c48f6c31ce Missing EULA failed without proper log message 
#749
 2021-02-10 13:57:14 -06:00
Geoff Bourne
e831d25706 Merged latest from master 2021-02-08 21:18:28 -06:00
Geoff Bourne
31f25cfd1b Added java8 recommendation to CURSEFORGE / FTB 2021-02-08 21:15:28 -06:00
Geoff Bourne
7d4e4c167e Added support for Yatopia 
#704
 2021-02-08 20:42:54 -06:00
Geoff Bourne
4a8e416fe1 Auto-merging via docker-versions-create 
CONFLICT (content): Merge conflict in Dockerfile
 2021-02-07 18:22:16 -06:00
Geoff Bourne
090e624ebc Auto-merging via docker-versions-create 
CONFLICT (content): Merge conflict in Dockerfile
 2021-02-07 18:20:35 -06:00
Geoff Bourne
12e931332b Auto-merging via docker-versions-create 
CONFLICT (content): Merge conflict in Dockerfile
 2021-02-07 18:06:06 -06:00
LichLord91
eb12030975 Update Invalid Server Type Logging Message (#758) 
Includes Tuinity and Purpur

Co-authored-by: lichlord91 <lichlord91@users.noreply.github.com>
 2021-02-07 18:00:53 -06:00
Geoff Bourne
e46af9d54c Fixed vanilla version lookup to fail early 
#756
 2021-02-07 17:58:50 -06:00
Geoff Bourne
8312233a93 Added support for Purpur servers 
#746
 2021-02-07 11:22:08 -06:00
Geoff Bourne
57390b02ca Merge branch 'master' into java15 2021-02-06 14:53:02 -06:00
Geoff Bourne
f06e9f5ede Merge branch 'master' into multiarch 2021-02-06 14:52:35 -06:00
Geoff Bourne
5700f36a6f Renamed forge branch to java8 2021-01-30 18:49:46 -06:00
Geoff Bourne
8101c8b51c Merge branch 'master' into multiarch 
Renamed to start-deployFTBA

# Conflicts:
#	start-configuration
#	start-deployCF
 2020-07-26 13:47:17 -05:00
Geoff Bourne
aebe35c9d4 misc: Refactor writeEula 2020-07-26 13:19:45 -05:00
Geoff Bourne
a26361c79f misc: Renamed start-deployCF to align with multiarch branch 2020-07-26 13:07:30 -05:00
Geoff Bourne
eba1ef6ab9 Auto-merging via docker-versions-create 
# Conflicts:
#	start-deployFTB
#	start-minecraftFinalSetup
 2020-07-26 08:35:13 -05:00
Geoff Bourne
21ee5e2401 Changed handling of unrecognized VERSION and detect absent server in meta json 
For #590
 2020-07-19 12:22:15 -05:00
Geoff Bourne
8b5552bb62 Auto-merging via docker-versions-create 2020-07-18 18:41:10 -05:00
Geoff Bourne
6fe13e8654 Clarified "invalid type" message for FTBA on multiarch 2020-07-18 13:09:58 -05:00
Code Monad
796f2fe14a Add support for rcon password from file (#585) 2020-07-13 21:00:46 -05:00
Geoff Bourne
e527fd9551 Auto-merging via docker-versions-create 2020-07-04 14:58:40 -05:00
Geoff Bourne
f2c9d2f905 Updated TYPE feedback when invalid choice given 
For #561
 2020-06-23 17:27:21 -05:00
Geoff Bourne
047a477f7b Auto-merging via docker-versions-create 2020-06-20 15:45:29 -05:00