mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-22 02:07:20 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2021-03-09 15:52:29 -05:00
commit 8aba480148
3 changed files with 1043 additions and 1043 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2082
core/assets/bundles/bundle_da.properties
View File

File diff suppressed because it is too large Load Diff

2
core/assets/contributors
View File

@ -114,3 +114,5 @@ simba-fs
RedRadiation
Marko Zajc
CPX MC
nilq
AsgerHB

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@ -353,7 +353,7 @@ public class Turret extends ReloadTurret{
}
protected void updateShooting(){
if(reload >= reloadTime){
if(reload >= reloadTime && !charging){
BulletType type = peekAmmo();
shoot(type);