Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2020-11-09 19:15:51 -05:00
commit ebdced5c6c
2 changed files with 4 additions and 0 deletions

View File

@ -668,6 +668,7 @@ ability.repairfield = Repair Field
ability.statusfield = Status Field ability.statusfield = Status Field
ability.unitspawn = {0} Factory ability.unitspawn = {0} Factory
ability.shieldregenfield = Shield Regen Field ability.shieldregenfield = Shield Regen Field
ability.movelightning = Movement Lightning
bar.drilltierreq = Better Drill Required bar.drilltierreq = Better Drill Required
bar.noresources = Missing Resources bar.noresources = Missing Resources

View File

@ -25,5 +25,8 @@
}, },
{ {
"address": "Chaotic-Neutral.ddns.net:5555" "address": "Chaotic-Neutral.ddns.net:5555"
},
{
"address": "cheginde.ddns.net"
} }
] ]