Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/blocks/power/ImpactReactor.java
#	gradle.properties

core/src/mindustry/mod/Scripts.java

@@ -122,7 +122,7 @@ public class Scripts implements Disposable{
             if(matched.find()){
                 LoadedMod required = Vars.mods.locateMod(matched.group(1));
                 String script = matched.group(2);
-                if(required == null || root.equals(required.root.child("scripts"))){ // Mod not found, or already using a mod
+                if(required == null){ // Mod not found, treat it as a folder
                     Fi dir = root.child(matched.group(1));
                     if(!dir.exists()) return null; // Mod and folder not found
                     return loadSource(script, dir, validator);