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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-02-03 19:17:14 -05:00
parent f41725b8dc 115df3aedd
commit 3ae48b8753
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Blocks.java
+2
View File
@@ -1399,6 +1399,7 @@ public class Blocks implements ContentList{
size = 3; size = 3;
itemCapacity = 1000; itemCapacity = 1000;
flags = EnumSet.of(BlockFlag.storage); flags = EnumSet.of(BlockFlag.storage);
group = BlockGroup.transportation;
}}; }};
container = new StorageBlock("container"){{ container = new StorageBlock("container"){{
@@ -1406,6 +1407,7 @@ public class Blocks implements ContentList{
size = 2; size = 2;
itemCapacity = 300; itemCapacity = 300;
flags = EnumSet.of(BlockFlag.storage); flags = EnumSet.of(BlockFlag.storage);
group = BlockGroup.transportation;
}}; }};
unloader = new Unloader("unloader"){{ unloader = new Unloader("unloader"){{
servers_v6.json
+4
View File
@@ -70,5 +70,9 @@
{ {
"name": "Omega", "name": "Omega",
"address": ["185.86.230.102:25906"] "address": ["185.86.230.102:25906"]
},
{
"name": "md.obvilionnetwork.ru",
"address": ["obvilionnetwork.ru:7001", "obvilionnetwork.ru:7002"]
} }
] ]