mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-15 10:17:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0

Browse Source 
# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
This commit is contained in:
Anuken
2020-03-17 20:03:12 -04:00
parent 12d4aab48a 71f20f928a
commit 436c76fd2f
8 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/build.gradle
View File

@ -104,7 +104,7 @@ PackrConfig.Platform.values().each{ platform ->
classpath = ["desktop/build/packr/desktop.jar"]
removePlatformLibs = ["desktop/build/packr/desktop.jar"]
vmArgs = ["Djava.net.preferIPv4Stack=true"]
vmArgs = []
minimizeJre = "desktop/packr_minimize.json"
jdk = JDK_DIR + "jdk-${platform.toString().toLowerCase()}.zip"