From 97254a66720a227906b3c6ab7ecbad386634a8ca Mon Sep 17 00:00:00 2001 From: Volas171 <60143910+Volas171@users.noreply.github.com> Date: Mon, 23 Nov 2020 22:27:08 -0500 Subject: [PATCH 1/3] Update contributors --- core/assets/contributors | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index 39c29ff93a..d38692de8c 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -1,3 +1,4 @@ +VolasYouKnow Prosta4okua Felix Corvus Vanguard @@ -100,4 +101,4 @@ MEEP of Faith jalastram (freesound.org) newlocknew (freesound.org) dsmolenaers (freesound.org) -Headphaze (freesound.org) \ No newline at end of file +Headphaze (freesound.org) From e65971db47a32243f9a941d685e98fefb9fe74b0 Mon Sep 17 00:00:00 2001 From: Volas171 <60143910+Volas171@users.noreply.github.com> Date: Tue, 24 Nov 2020 18:30:59 -0500 Subject: [PATCH 2/3] h --- core/assets/contributors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index d38692de8c..cb64660dae 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -1,4 +1,3 @@ -VolasYouKnow Prosta4okua Felix Corvus Vanguard @@ -102,3 +101,4 @@ jalastram (freesound.org) newlocknew (freesound.org) dsmolenaers (freesound.org) Headphaze (freesound.org) +VolasYouKnow From 40bf0741f0cc7f4d5b6df4b92599948400918e84 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Wed, 25 Nov 2020 09:36:12 +0100 Subject: [PATCH 3/3] Remove unused import --- core/src/mindustry/world/blocks/distribution/Conveyor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index a76542f92b..b3218ea7be 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -10,7 +10,6 @@ import arc.util.io.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.entities.units.*; -import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*;