mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-15 15:20:57 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2025-05-15 18:30:48 -04:00
commit 4abbd1a0f8
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/src/mindustry/logic/LogicOp.java
View file

@ -41,6 +41,7 @@ public enum LogicOp{
log10("log10", Math::log10),
floor("floor", Math::floor),
ceil("ceil", Math::ceil),
round("round", Math::round),
sqrt("sqrt", Math::sqrt),
rand("rand", d -> GlobalVars.rand.nextDouble() * d),

4
desktop/src/mindustry/desktop/DesktopLauncher.java
View file

@ -30,6 +30,8 @@ import static mindustry.Vars.*;
public class DesktopLauncher extends ClientLauncher{
public final static long discordID = 610508934456934412L;
public final String[] args;
boolean useDiscord = !OS.hasProp("nodiscord"), loadError = false;
Throwable steamError;
@ -72,6 +74,8 @@ public class DesktopLauncher extends ClientLauncher{
}
public DesktopLauncher(String[] args){
this.args = args;
Version.init();
boolean useSteam = Version.modifier.contains("steam");
testMobile = Seq.with(args).contains("-testMobile");