Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2021-07-16 12:37:36 -04:00
3 changed files with 3 additions and 2 deletions

View File

@@ -64,6 +64,7 @@ public class Reconstructor extends UnitBlock{
@Override @Override
public void setStats(){ public void setStats(){
stats.timePeriod = constructTime;
super.setStats(); super.setStats();
stats.add(Stat.productionTime, constructTime / 60f, StatUnit.seconds); stats.add(Stat.productionTime, constructTime / 60f, StatUnit.seconds);

View File

@@ -57,7 +57,7 @@
}, },
{ {
"name": "Omega", "name": "Omega",
"address": ["178.170.47.34:20204", "157.90.213.2:30308", "157.90.180.53:25738"] "address": ["178.170.47.34:20204", "157.90.213.2:30308", "157.90.180.53:25738", "185.86.230.61:25578"]
}, },
{ {
"name": "md.obvilionnetwork.ru", "name": "md.obvilionnetwork.ru",

View File

@@ -20,7 +20,7 @@
}, },
{ {
"name": "Omega", "name": "Omega",
"address": ["157.90.180.53:25777", "redstonneur1256.ml", "185.86.230.61:25571"] "address": ["185.86.230.61:25571", "185.86.230.61:25570", "185.86.230.62:25572"]
}, },
{ {
"name": "MeowLand", "name": "MeowLand",