mirror of
https://github.com/kaboomserver/server.git
synced 2024-12-22 15:45:07 +00:00
Merge branch 'master' of https://git.heroku.com/kaboomserver
Former-commit-id: 6c8895228546464a75b28512f5feb10fe600df29
This commit is contained in:
commit
7a1a4445c1
21 changed files with 36 additions and 2 deletions
BIN
.java/bin/java
Executable file
BIN
.java/bin/java
Executable file
Binary file not shown.
BIN
.java/lib/jli/libjli.so
Normal file
BIN
.java/lib/jli/libjli.so
Normal file
Binary file not shown.
34
.java/lib/jvm.cfg
Normal file
34
.java/lib/jvm.cfg
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
|
#
|
||||||
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
|
# under the terms of the GNU General Public License version 2 only, as
|
||||||
|
# published by the Free Software Foundation. Oracle designates this
|
||||||
|
# particular file as subject to the "Classpath" exception as provided
|
||||||
|
# by Oracle in the LICENSE file that accompanied this code.
|
||||||
|
#
|
||||||
|
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
# version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
# accompanied this code).
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License version
|
||||||
|
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
#
|
||||||
|
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
# or visit www.oracle.com if you need additional information or have any
|
||||||
|
# questions.
|
||||||
|
#
|
||||||
|
# List of JVMs that can be used as an option to java, javac, etc.
|
||||||
|
# Order is important -- first in this list is the default JVM.
|
||||||
|
# NOTE that both this file and its format are UNSUPPORTED and
|
||||||
|
# WILL GO AWAY in a future release.
|
||||||
|
#
|
||||||
|
# You may also select a JVM in an arbitrary location with the
|
||||||
|
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
||||||
|
# and may not be available in a future release.
|
||||||
|
#
|
||||||
|
-server KNOWN
|
||||||
|
-client IGNORE
|
BIN
.java/lib/libawt.so
Normal file
BIN
.java/lib/libawt.so
Normal file
Binary file not shown.
BIN
.java/lib/libawt_headless.so
Normal file
BIN
.java/lib/libawt_headless.so
Normal file
Binary file not shown.
BIN
.java/lib/libextnet.so
Normal file
BIN
.java/lib/libextnet.so
Normal file
Binary file not shown.
BIN
.java/lib/libjava.so
Normal file
BIN
.java/lib/libjava.so
Normal file
Binary file not shown.
BIN
.java/lib/libjimage.so
Normal file
BIN
.java/lib/libjimage.so
Normal file
Binary file not shown.
BIN
.java/lib/libmanagement.so
Normal file
BIN
.java/lib/libmanagement.so
Normal file
Binary file not shown.
BIN
.java/lib/libmanagement_agent.so
Normal file
BIN
.java/lib/libmanagement_agent.so
Normal file
Binary file not shown.
BIN
.java/lib/libmanagement_ext.so
Normal file
BIN
.java/lib/libmanagement_ext.so
Normal file
Binary file not shown.
BIN
.java/lib/libnet.so
Normal file
BIN
.java/lib/libnet.so
Normal file
Binary file not shown.
BIN
.java/lib/libnio.so
Normal file
BIN
.java/lib/libnio.so
Normal file
Binary file not shown.
BIN
.java/lib/libverify.so
Normal file
BIN
.java/lib/libverify.so
Normal file
Binary file not shown.
BIN
.java/lib/libzip.so
Normal file
BIN
.java/lib/libzip.so
Normal file
Binary file not shown.
1
.java/lib/modules.REMOVED.git-id
Normal file
1
.java/lib/modules.REMOVED.git-id
Normal file
|
@ -0,0 +1 @@
|
||||||
|
ac2e8e2f21c042b889fc47fe6a91c8e3d0d4be0f
|
BIN
.java/lib/server/libjvm.so
Normal file
BIN
.java/lib/server/libjvm.so
Normal file
Binary file not shown.
BIN
.java/lib/tzdb.dat
Normal file
BIN
.java/lib/tzdb.dat
Normal file
Binary file not shown.
Binary file not shown.
|
@ -54,7 +54,7 @@ messages:
|
||||||
outdated-server: The server is outdated. Please join with Minecraft version {0}!
|
outdated-server: The server is outdated. Please join with Minecraft version {0}!
|
||||||
restart: The server is restarting. Please wait...
|
restart: The server is restarting. Please wait...
|
||||||
advancements:
|
advancements:
|
||||||
disable-saving: false
|
disable-saving: true
|
||||||
disabled:
|
disabled:
|
||||||
- minecraft:adventure/adventuring_time
|
- minecraft:adventure/adventuring_time
|
||||||
- minecraft:adventure/kill_a_mob
|
- minecraft:adventure/kill_a_mob
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
java.runtime.version=10
|
|
Loading…
Reference in a new issue