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
2024-01-12 22:26:14 -05:00
parent 797ef6400c ce1ac8e934
commit f0a2bb87fc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -106,12 +106,12 @@ allprojects{
generateLocales = { generateLocales = {
def output = 'en\n' def output = 'en\n'
def bundles = new File(project(':core').projectDir, 'assets/bundles/') def bundles = new File(project(':core').projectDir, 'assets/bundles/')
bundles.listFiles().each{ other -> bundles.list().sort().each{ name ->
if(other.name == "bundle.properties") return if(name == "bundle.properties") return
output += other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + "\n" output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n"
} }
new File(project(':core').projectDir, 'assets/locales').text = output new File(project(':core').projectDir, 'assets/locales').text = output
new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().join("\n") new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().join("\n")
} }
writeVersion = { writeVersion = {

2
servers_v7.json
View File

@@ -29,7 +29,7 @@
}, },
{ {
"name": "Tamazia", "name": "Tamazia",
"address": ["5.250.178.221:6567","node1.adky.net:3215"] "address": ["5.250.178.221:6567","5.250.178.221:6677"]
}, },
{ {
"name": "Crux's Federation", "name": "Crux's Federation",