mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-10 07:47:25 +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/graphics/Bloom.java
#	gradle.properties
This commit is contained in:
Anuken
2020-01-10 15:19:07 -05:00
parent cf5e8c6463 677aa0d0bf
commit e45df98f26
80 changed files with 14184 additions and 12242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/src/mindustry/desktop/DesktopLauncher.java
View File

@ -279,7 +279,7 @@ public class DesktopLauncher extends ClientLauncher{
if(steam){
try{
byte[] result = new byte[8];
new RandomXS128(SVars.user.user.getSteamID().getAccountID()).nextBytes(result);
new Rand(SVars.user.user.getSteamID().getAccountID()).nextBytes(result);
return new String(Base64Coder.encode(result));
}catch(Exception e){
e.printStackTrace();