Merge remote-tracking branch 'origin/master'

# Conflicts:
#	paydayHealth.cs
This commit is contained in:
Fierelier 2018-05-15 10:04:36 +02:00
commit f5227096a6

View File

@ -12,7 +12,7 @@ namespace pdHealth
this.Tick += new EventHandler(this.doHealthTick); this.Tick += new EventHandler(this.doHealthTick);
} }
//Settings: //Settings:a
int tickTime = 100; //Tick-Rate in ms. int tickTime = 100; //Tick-Rate in ms.
//Regeneration //Regeneration