Merge branch 'master' into dev

# Conflicts:
#	gradle.properties

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/MetaType.java

@@ -63,6 +63,14 @@ public interface MetaType {
             return type;
         }
 
+        @Override
+        public String toString() {
+            return "MetaType{" +
+                    "typeId=" + typeId +
+                    ", type=" + type +
+                    '}';
+        }
+
         @Override
         public boolean equals(final Object o) {
             if (this == o) return true;

bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java

@@ -55,7 +55,7 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player> {
-    private static final boolean FOLIA = PaperViaInjector.hasClass("io.papermc.paper.threadedregions.RegionisedServer");
+    private static final boolean FOLIA = PaperViaInjector.hasClass("io.papermc.paper.threadedregions.RegionizedServer");
     private static ViaVersionPlugin instance;
     private final BukkitCommandHandler commandHandler;
     private final BukkitViaConfig conf;
@@ -109,11 +109,11 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player>
         }
 
         if (FOLIA) {
-            // Use Folia's RegionisedServerInitEvent to run code after the server has loaded
+            // Use Folia's RegionizedServerInitEvent to run code after the server has loaded
             final Class<? extends Event> serverInitEventClass;
             try {
                 //noinspection unchecked
-                serverInitEventClass = (Class<? extends Event>) Class.forName("io.papermc.paper.threadedregions.RegionisedServerInitEvent");
+                serverInitEventClass = (Class<? extends Event>) Class.forName("io.papermc.paper.threadedregions.RegionizedServerInitEvent");
             } catch (final ReflectiveOperationException e) {
                 throw new RuntimeException(e);
             }