Merge branch 'master' into 1.15

src/main/java/carpet/mixins/MinecraftClientMixin.java

@@ -1,10 +1,8 @@
 package carpet.mixins;
 
 import carpet.CarpetServer;
-import carpet.CarpetSettings;
 import net.minecraft.client.MinecraftClient;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -20,13 +18,4 @@ public class MinecraftClientMixin
         //CM start game hook
         CarpetServer.onGameStarted();
     }
-
-    /**
-     * @author gnembon
-     */
-    @Overwrite
-    public String getVersionType()
-    {
-        return "carpet "+ CarpetSettings.carpetVersion;
-    }
 }