Merge branch 'master' of https://github.com/Anuken/Mindustry

core/assets/bundles/bundle_de.properties

@@ -1045,7 +1045,7 @@ category.crafting = Erzeugung
 category.function = Funktion
 category.optional = Optionale Zusätze
 setting.skipcoreanimation.name = Kern Start- und Lande-Animation überspringen
-setting.landscape.name = Landschaft sperren
+setting.landscape.name = Querformat sperren
 setting.shadows.name = Schatten
 setting.blockreplace.name = Automatische Blockvorschläge
 setting.linear.name = Lineare Filterung
@@ -1056,7 +1056,7 @@ setting.buildautopause.name = Bauen automatisch pausieren
 setting.doubletapmine.name = Doppeltippen zum Abbauen
 setting.commandmodehold.name = Halten für Steuerungsmodus
 setting.modcrashdisable.name = Mods bei Absturz deaktivieren
-setting.animatedwater.name = Animiertes Wasser
+setting.animatedwater.name = Animierte Oberflächen
 setting.animatedshields.name = Animierte Schilde
 setting.playerindicators.name = Spieler-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.phase-wall.name = Phasenmauer
 block.phase-wall-large.name = Große Phasenmauer
-block.thorium-wall.name = Thorium-Mauer
-block.thorium-wall-large.name = Große Thorium-Mauer
+block.thorium-wall.name = Thoriummauer
+block.thorium-wall-large.name = Große Thoriummauer
 block.door.name = Tor
 block.door-large.name = Großes Tor
 block.duo.name = Doppelgeschütz

core/src/mindustry/core/UI.java

@@ -276,6 +276,7 @@ public class UI implements ApplicationListener, Loadable{
                 this.numeric = numbers;
                 this.maxLength = textLength;
                 this.accepted = confirmed;
+                this.canceled = closed;
                 this.allowEmpty = false;
             }});
         }else{

core/src/mindustry/graphics/LoadRenderer.java

@@ -456,7 +456,7 @@ public class LoadRenderer implements Disposable{
                 float skew = bsize/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);
             }