v146 with some master fix

way-zer · way-zer · commit 0ee2b1ba1471 · 2023-09-04T13:27:38.000+08:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "Mindustry"]
 	path = work
 	url = https://github.com/Anuken/Mindustry
+    ignore = all
diff --git a/patches/0008-S-add-Config.locale-for-localizedName.patch b/patches/0008-S-add-Config.locale-for-localizedName.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] S: add `Config.locale` for localizedName
  1 file changed, 1 insertion(+)
 
 diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java
-index 443bc08e..fb23b9b0 100644
+index d544531f..1fb21851 100644
 --- a/core/src/mindustry/net/Administration.java
 +++ b/core/src/mindustry/net/Administration.java
 @@ -488,6 +488,7 @@ public class Administration{
diff --git a/work b/work
@@ -1 +1 @@
-Subproject commit 26b66f9bdbd3a77b32f10f3cb350a9a737d5f012
+Subproject commit 700dd38a3690bacb8949d35d70723026d8205ae3
