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

Added german language

Browse Source
This commit is contained in:
Anuken
2018-02-23 14:49:33 -05:00
parent 07aab732b7
commit a6737c5a54
5 changed files with 483 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/Vars.java
View File

@@ -93,7 +93,7 @@ public class Vars{
public static final int tilesize = 8;
public static final Locale[] locales = {new Locale("en"), new Locale("fr", "FR"), new Locale("ru"), new Locale("pl", "PL"),
new Locale("es", "LA"), new Locale("pt", "BR"), new Locale("ko"), new Locale("in", "ID")};
new Locale("de"), new Locale("es", "LA"), new Locale("pt", "BR"), new Locale("ko"), new Locale("in", "ID")};
public static final Color[] playerColors = {
Color.valueOf("82759a"),

9
core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
View File

@@ -55,8 +55,6 @@ public class DebugFragment implements Fragment {
row();
new button("paths", "toggle", () -> showPaths = !showPaths);
row();
new button("infammo", "toggle", () -> infiniteAmmo = !infiniteAmmo);
row();
new button("wave", () -> state.wavetime = 0f);
row();
new button("time 0", () -> Timers.resetTime(0f));
@@ -75,13 +73,6 @@ public class DebugFragment implements Fragment {
}
});
row();
new button("time", () -> {
Timers.resetTime(1080000 - 60*10);
});
row();
new button("time2", () -> {
Timers.resetTime(0);
});
}}.end();
row();

2
core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
View File

@@ -109,7 +109,7 @@ public class TunnelConveyor extends Block{
Item item = Item.getByID(Bits.getRightInt(l));
Tile dest = getDestTunnel(tile, item);
arr.add(" buffer.item");
arr.add(time + " | " + item.name + " | " + dest.block() + ":" + dest.floor());
arr.add(time + " | " + item.name + " | " + ( dest == null ? "no dest" : dest.block() + ":" + dest.floor()));
}
return arr;