Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2021-02-03 19:17:14 -05:00
2 changed files with 6 additions and 0 deletions
+2
View File
@@ -1399,6 +1399,7 @@ public class Blocks implements ContentList{
size = 3;
itemCapacity = 1000;
flags = EnumSet.of(BlockFlag.storage);
group = BlockGroup.transportation;
}};
container = new StorageBlock("container"){{
@@ -1406,6 +1407,7 @@ public class Blocks implements ContentList{
size = 2;
itemCapacity = 300;
flags = EnumSet.of(BlockFlag.storage);
group = BlockGroup.transportation;
}};
unloader = new Unloader("unloader"){{
+4
View File
@@ -70,5 +70,9 @@
{
"name": "Omega",
"address": ["185.86.230.102:25906"]
},
{
"name": "md.obvilionnetwork.ru",
"address": ["obvilionnetwork.ru:7001", "obvilionnetwork.ru:7002"]
}
]