Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anuken
2019-08-23 14:05:46 -04:00
parent 4e43d2a96b d1e07ec0a2
commit cf9cda4936
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.gradle
View File

@@ -8,7 +8,7 @@ buildscript{
} }
dependencies{ dependencies{
classpath 'com.android.tools.build:gradle:3.5.0' classpath 'com.android.tools.build:gradle:3.4.1'
} }
} }

2
core/src/io/anuke/mindustry/maps/Maps.java
View File

@@ -215,7 +215,7 @@ public class Maps implements Disposable{
return filters; return filters;
}else{ }else{
try{ try{
return JsonIO.read(Array.class, str); return JsonIO.read(Array.class, str.replace("mindustrz", "mindustry"));
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
return readFilters(""); return readFilters("");

1
core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java
View File

@@ -17,7 +17,6 @@ public class MirrorFilter extends GenerateFilter{
{ {
options(new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45)); options(new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45));
buffered = true;
} }
@Override @Override

2
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -106,7 +106,7 @@ public class PausedDialog extends FloatingDialog{
return; return;
} }
if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || Net.client()){ if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || wasClient){
state.set(State.menu); state.set(State.menu);
logic.reset(); logic.reset();
return; return;

5
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@@ -39,7 +39,8 @@ public class DesktopPlatform extends Platform{
if(useDiscord){ if(useDiscord){
try{ try{
DiscordEventHandlers handlers = new DiscordEventHandlers(); DiscordEventHandlers handlers = new DiscordEventHandlers();
DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, ""); DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, "1127400");
Log.info("Initialized Discord rich presence.");
Runtime.getRuntime().addShutdownHook(new Thread(DiscordRPC.INSTANCE::Discord_Shutdown)); Runtime.getRuntime().addShutdownHook(new Thread(DiscordRPC.INSTANCE::Discord_Shutdown));
}catch(Throwable t){ }catch(Throwable t){
@@ -141,8 +142,8 @@ public class DesktopPlatform extends Platform{
@Override @Override
public void updateRPC(){ public void updateRPC(){
if(!useDiscord) return; if(!useDiscord) return;
Log.info("Updating discord RPC status.");
DiscordRichPresence presence = new DiscordRichPresence(); DiscordRichPresence presence = new DiscordRichPresence();