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
2026-01-15 23:42:37 -05:00
parent b2cd1adf46 2a6cd86bad
commit d6495dda32
4 changed files with 122 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -740,10 +740,10 @@ public class JoinDialog extends BaseDialog{
return Core.bundle.get("server.outdated");
}else if(host.version < Version.build && Version.build != -1){
return Core.bundle.get("server.outdated") + "\n" +
Core.bundle.format("server.version", host.version, "");
Core.bundle.format("server.version", host.version, host.versionType);
}else if(host.version > Version.build && Version.build != -1){
return Core.bundle.get("server.outdated.client") + "\n" +
Core.bundle.format("server.version", host.version, "");
Core.bundle.format("server.version", host.version, host.versionType);
}else if(host.version == Version.build && Version.type.equals(host.versionType)){
//not important
return "";

2
core/src/mindustry/world/blocks/logic/LogicBlock.java
View File

@@ -529,11 +529,11 @@ public class LogicBlock extends Block{
while(accumulator >= 1f){
executor.runOnce();
accumulator --;
if(executor.yield){
executor.yield = false;
break;
}
accumulator --;
}
}
}