Merge remote-tracking branch 'origin/master'

2020-07-09 13:14:05 -04:00
parent 2584197a02 2a81370c66
commit 938ae6e80a
1 changed files with 1 additions and 1 deletions
--- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java
+++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
@@ -350,7 +350,7 @@ public class SchematicsDialog extends BaseDialog{
                }
            });
            cont.row();
-            float cons = schem.powerConsumption(), prod = schem.powerProduction();
+            float cons = schem.powerConsumption() * 60, prod = schem.powerProduction() * 60;
            if(!Mathf.zero(cons) || !Mathf.zero(prod)){
                cont.table(t -> {