mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-10 04:40:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2021-07-27 17:43:19 -04:00
commit 497a68e792
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/world/Block.java
View File

@ -794,6 +794,11 @@ public class Block extends UnlockableContent{
clipSize = Math.max(clipSize, size * tilesize);
//only kept to ensure compatibility with v6 mods.
if(expanded){
clipSize += tilesize * 10f;
}
if(emitLight){
clipSize = Math.max(clipSize, lightRadius * 2f);
}

6
servers_v7.json
View File

@ -5,16 +5,12 @@
},
{
"name": "C.A.M.S.",
"address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua"]
"address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua", "mindustry.me:7000"]
},
{
"name": "hexpvp.ml",
"address": "hexpvp.ml"
},
{
"name": "[accent]Mindustry [red]Reborn",
"address": "mindustry.me:7000"
},
{
"name": "Omega",
"address": ["185.86.230.61:25571", "185.86.230.61:25570", "185.86.230.62:25572"]