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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2025-05-25 12:32:54 -04:00
parent c15d8d15cb 0900ff8270
commit 64305aa8b1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ public enum LogicOp{
abs("abs", a -> Math.abs(a)), //not a method reference because it fails to compile for some reason abs("abs", a -> Math.abs(a)), //not a method reference because it fails to compile for some reason
sign("sign", Math::signum), sign("sign", Math::signum),
log("log", Math::log), log("log", Math::log),
logn("logn", (x, y) -> Math.log(x) / Math.log(y)),
log10("log10", Math::log10), log10("log10", Math::log10),
floor("floor", Math::floor), floor("floor", Math::floor),
ceil("ceil", Math::ceil), ceil("ceil", Math::ceil),

4
servers_v7.json
View File

@@ -260,9 +260,9 @@
] ]
}, },
{ {
"name": "CroCraft Network", "name": "Kalpe Games",
"address": [ "address": [
"193.122.53.98:6567" "mindustry.kalpe.games"
] ]
}, },
{ {