Merge branch 'dev'

This commit is contained in:
Allanis 2014-04-14 20:52:39 +01:00
commit 804a8a03f5

View File

@ -11,6 +11,14 @@
<fleet name="Empire Pacifier" chance="70">add</fleet> <fleet name="Empire Pacifier" chance="70">add</fleet>
<fleet name="Empire Pacifier" chance="70">add</fleet> <fleet name="Empire Pacifier" chance="70">add</fleet>
</system> </system>
<system name="C-14">
<planet name="S49281">remove</planet>
<fleet name="Collective Sml Swarm" chance="80">remove</fleet>
<fleet name="Collective Sml Swarm" chance="80">remove</fleet>
<fleet name="Collective Drone" chance="80">remove</fleet>
<fleet name="Empire Pacifier" chance="50">add</fleet>
<fleet name="Empire Pacifier" chance="30">add</fleet>
</system>
<system name="C-28"> <system name="C-28">
<planet name="S38729">remove</planet> <planet name="S38729">remove</planet>
<fleet name="Collective Sml Swarm" chance="60">remove</fleet> <fleet name="Collective Sml Swarm" chance="60">remove</fleet>