Merge remote-tracking branch 'origin/master'

core/src/mindustry/input/Binding.java

@@ -60,6 +60,7 @@ public enum Binding implements KeyBind{
     minimap(KeyCode.m),
     research(KeyCode.b),
     planet_map(KeyCode.n),
+    block_info(KeyCode.f1),
     toggle_menus(KeyCode.c),
     screenshot(KeyCode.p),
     toggle_power_lines(KeyCode.f5),

core/src/mindustry/ui/fragments/PlacementFragment.java

@@ -189,6 +189,14 @@ public class PlacementFragment extends Fragment{
             return true;
         }
 
+        if(Core.input.keyTap(Binding.block_info)){
+            Block displayBlock = menuHoverBlock != null ? menuHoverBlock : input.block;
+            if(displayBlock != null){
+                ui.content.show(displayBlock);
+                Events.fire(new BlockInfoEvent());
+            }
+        }
+
         return false;
     }
 

core/src/mindustry/world/meta/values/AmmoListValue.java

@@ -45,7 +45,7 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
 
                 if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){
                     if(type.continuousDamage() > 0){
-                        bt.add(Core.bundle.format("bullet.damage", type.damage) + " " + StatUnit.perSecond.localized());
+                        bt.add(Core.bundle.format("bullet.damage", type.continuousDamage()) + " " + StatUnit.perSecond.localized());
                     }else{
                         bt.add(Core.bundle.format("bullet.damage", type.damage));
                     }