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

Browse Source
This commit is contained in:
Anuken
2023-06-08 10:01:48 -04:00
parent 8da8783331 603efd7653
commit 87348feab7
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle_de.properties
+4 -4
View File
@@ -1045,7 +1045,7 @@ category.crafting = Erzeugung
category.function = Funktion category.function = Funktion
category.optional = Optionale Zusätze category.optional = Optionale Zusätze
setting.skipcoreanimation.name = Kern Start- und Lande-Animation überspringen setting.skipcoreanimation.name = Kern Start- und Lande-Animation überspringen
setting.landscape.name = Landschaft sperren setting.landscape.name = Querformat sperren
setting.shadows.name = Schatten setting.shadows.name = Schatten
setting.blockreplace.name = Automatische Blockvorschläge setting.blockreplace.name = Automatische Blockvorschläge
setting.linear.name = Lineare Filterung setting.linear.name = Lineare Filterung
@@ -1056,7 +1056,7 @@ setting.buildautopause.name = Bauen automatisch pausieren
setting.doubletapmine.name = Doppeltippen zum Abbauen setting.doubletapmine.name = Doppeltippen zum Abbauen
setting.commandmodehold.name = Halten für Steuerungsmodus setting.commandmodehold.name = Halten für Steuerungsmodus
setting.modcrashdisable.name = Mods bei Absturz deaktivieren setting.modcrashdisable.name = Mods bei Absturz deaktivieren
setting.animatedwater.name = Animiertes Wasser setting.animatedwater.name = Animierte Oberflächen
setting.animatedshields.name = Animierte Schilde setting.animatedshields.name = Animierte Schilde
setting.playerindicators.name = Spieler-Indikatoren setting.playerindicators.name = Spieler-Indikatoren
setting.indicators.name = Verbündeten-Indikatoren setting.indicators.name = Verbündeten-Indikatoren
@@ -1470,8 +1470,8 @@ block.plastanium-wall.name = Plastaniummauer
block.plastanium-wall-large.name = Große Plastaniummauer block.plastanium-wall-large.name = Große Plastaniummauer
block.phase-wall.name = Phasenmauer block.phase-wall.name = Phasenmauer
block.phase-wall-large.name = Große Phasenmauer block.phase-wall-large.name = Große Phasenmauer
block.thorium-wall.name = Thorium-Mauer block.thorium-wall.name = Thoriummauer
block.thorium-wall-large.name = Große Thorium-Mauer block.thorium-wall-large.name = Große Thoriummauer
block.door.name = Tor block.door.name = Tor
block.door-large.name = Großes Tor block.door-large.name = Großes Tor
block.duo.name = Doppelgeschütz block.duo.name = Doppelgeschütz
core/src/mindustry/core/UI.java
+1
View File
@@ -276,6 +276,7 @@ public class UI implements ApplicationListener, Loadable{
this.numeric = numbers; this.numeric = numbers;
this.maxLength = textLength; this.maxLength = textLength;
this.accepted = confirmed; this.accepted = confirmed;
this.canceled = closed;
this.allowEmpty = false; this.allowEmpty = false;
}}); }});
}else{ }else{
core/src/mindustry/graphics/LoadRenderer.java
+1 -1
View File
@@ -456,7 +456,7 @@ public class LoadRenderer implements Disposable{
float skew = bsize/2f; float skew = bsize/2f;
float v = w / 2 + cx * dir - width / 2f; float v = w / 2 + cx * dir - width / 2f;
Fill.rects(v + dir*skew, h/2f - bsize/2f + bsize/2f, width, bsize/2f, -dir*skew); Fill.rects(v + dir*skew, h/2f, width, bsize/2f, -dir*skew);
Fill.rects(v, h/2f - bsize/2f, width, bsize/2f, dir*skew); Fill.rects(v, h/2f - bsize/2f, width, bsize/2f, dir*skew);
} }