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

Added polish lang, fixed conveyor stacking bug

Browse Source
This commit is contained in:
Anuken
2018-01-31 10:20:52 -05:00
parent fe458d03bd
commit f396190fcf
6 changed files with 496 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java
View File

@@ -13,7 +13,7 @@ import java.util.Locale;
import static io.anuke.mindustry.Vars.ui;
public class LanguageDialog extends FloatingDialog{
private Locale[] locales = {Locale.ENGLISH, new Locale("fr", "FR"), new Locale("ru"),
private Locale[] locales = {Locale.ENGLISH, 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")};
public LanguageDialog(){

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

@@ -105,7 +105,7 @@ public class Conveyor extends Block{
}
boolean canmove = i == entity.convey.size - 1 ||
!(pos2.set(entity.convey.get(i + 1)).y - pos.y < itemSpace);
!(pos2.set(entity.convey.get(i + 1)).y - pos.y < itemSpace * Math.max(Timers.delta(), 1f));
float minmove = 1f / (Short.MAX_VALUE - 2);