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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/ui/dialogs/JoinDialog.java
This commit is contained in:
Anuken
2022-04-20 14:16:20 -04:00
parent f1c6b6f949 2dae8fdef4
commit b40957e28b
18 changed files with 487 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/scripts/global.js
+1
View File
@@ -52,6 +52,7 @@ function extend(/*Base, ..., def*/){
importPackage(Packages.arc)
importPackage(Packages.arc.audio)
importPackage(Packages.arc.func)
importPackage(Packages.arc.flabel)
importPackage(Packages.arc.graphics)
importPackage(Packages.arc.graphics.g2d)
importPackage(Packages.arc.graphics.gl)