mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-03-04 22:50:29 +07:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
0c7a7e00eb
@ -7,6 +7,7 @@ public enum LogicOp{
|
||||
sub("-", (a, b) -> a - b),
|
||||
mul("*", (a, b) -> a * b),
|
||||
div("/", (a, b) -> a / b),
|
||||
idiv("//", (a, b) -> Math.floor(a / b)),
|
||||
mod("%", (a, b) -> a % b),
|
||||
equal("==", (a, b) -> Math.abs(a - b) < 0.000001 ? 1 : 0, (a, b) -> a == b ? 1 : 0),
|
||||
notEqual("not", (a, b) -> Math.abs(a - b) < 0.000001 ? 0 : 1, (a, b) -> a != b ? 1 : 0),
|
||||
|
@ -4,5 +4,8 @@
|
||||
},
|
||||
{
|
||||
"address": "nydustry.nydus.app:6060"
|
||||
},
|
||||
{
|
||||
"address": "md.surrealment.com"
|
||||
}
|
||||
]
|
||||
|
Loading…
Reference in New Issue
Block a user