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
2020-11-13 11:33:45 -05:00
parent 0908176079 b435c83fb6
commit 75df515234
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/content/Bullets.java
View File

@@ -371,6 +371,7 @@ public class Bullets implements ContentList{
makeFire = true; makeFire = true;
pierceCap = 2; pierceCap = 2;
pierceBuilding = true; pierceBuilding = true;
knockback = 0.7f;
}}; }};
healBullet = new LaserBoltBulletType(5.2f, 13){{ healBullet = new LaserBoltBulletType(5.2f, 13){{

6
servers_v6.json
View File

@@ -4,10 +4,8 @@
"address": ["mindustry.pl:6000", "mindustry.pl:6666"] "address": ["mindustry.pl:6000", "mindustry.pl:6666"]
}, },
{ {
"address": "routerchain.ddns.net" "name": "C.A.M.S.",
}, "address": ["routerchain.ddns.net", "pandorum.su:8000"]
{
"address": "pandorum.su:8000"
}, },
{ {
"name": "ECAN", "name": "ECAN",