Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00
parent ea75a357ca
commit 28b235ef07
531 changed files with 12356 additions and 6286 deletions
--- a/core/src/mindustry/content/Liquids.java
+++ b/core/src/mindustry/content/Liquids.java
@@ -24,7 +24,7 @@ public class Liquids implements ContentList{
        }};

        oil = new Liquid("oil", Color.valueOf("313131")){{
-            viscosity = 0.7f;
+            viscosity = 0.75f;
            flammability = 1.2f;
            explosiveness = 1.2f;
            heatCapacity = 0.7f;