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
2023-11-08 09:02:27 -05:00
parent 7f805f1712 afc97ebeda
commit bc6434bb64
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -413,7 +413,7 @@ project(":annotations"){
dependencies{ dependencies{
implementation 'com.squareup:javapoet:1.12.1' implementation 'com.squareup:javapoet:1.12.1'
implementation "com.github.Anuken.Arc:arc-core:$arcHash" implementation arcModule("arc-core")
} }
} }

6
core/src/mindustry/content/ErekirTechTree.java
View File

@@ -447,11 +447,11 @@ public class ErekirTechTree{
//nodeProduce(Liquids.gallium, () -> {}); //nodeProduce(Liquids.gallium, () -> {});
}); });
});
nodeProduce(Items.surgeAlloy, () -> { nodeProduce(Items.surgeAlloy, () -> {
nodeProduce(Items.phaseFabric, () -> { nodeProduce(Items.phaseFabric, () -> {
});
}); });
}); });
}); });

8
servers_v7.json
View File

@@ -3,6 +3,10 @@
"name": "meiqiuMDT", "name": "meiqiuMDT",
"address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240","play.simpfun.cn:14523"] "address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240","play.simpfun.cn:14523"]
}, },
{
"name": "Crux's Revelations"
"Address": ["fsn1.bbn.one:52397","fsn1.bbn.one:58375","de-free-01.hosts.optikservers.com:32212","fsn1.bbn.one:49840","de-free-01.hosts.optikservers.com:30449"]
}
{ {
"name": "CMS", "name": "CMS",
"address": ["195.2.84.144"] "address": ["195.2.84.144"]
@@ -69,7 +73,7 @@
}, },
{ {
"name": "KMWStudios", "name": "KMWStudios",
"address": ["46.151.26.232:1024", "46.151.26.232:2000", "46.151.26.232:3000", "46.151.26.232:4000", "46.151.26.232:6000", "46.151.26.232:7000", "46.151.26.232:8000"] "address": ["x.kmwstuios.xyz:9000", "x.kmwstuios.xyz:9002", "x.kmwstuios.xyz:9003", "x.kmwstuios.xyz:9004", "x.kmwstuios.xyz:9005", "x.kmwstuios.xyz:9006", "x.kmwstuios.xyz:9007"]
}, },
{ {
"name": "XCore", "name": "XCore",
@@ -218,7 +222,7 @@
}, },
{ {
"name": "MeowIsland", "name": "MeowIsland",
"address": ["n1.mindustry.me:6590", "n1.mindustry.me:6592", "n1.mindustry.me:6595"] "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651"]
}, },
{ {
"name": "3MIDustry", "name": "3MIDustry",