Merged with master

2020-02-09 12:27:44 -05:00
parent d2ab316072 baab36bfc5
commit a2706a80b1
84 changed files with 488 additions and 413 deletions
--- a/core/src/mindustry/net/ArcNetProvider.java
+++ b/core/src/mindustry/net/ArcNetProvider.java
@@ -418,4 +418,4 @@ public class ArcNetProvider implements NetProvider{
        }
    }

-}
+}
--- a/core/src/mindustry/net/Interpolator.java
+++ b/core/src/mindustry/net/Interpolator.java
@@ -65,4 +65,4 @@ public class Interpolator{
        }

    }
-}
+}