diff --git a/.gitignore b/.gitignore index cb87b2c48..a638baf11 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,8 @@ hs_err_pid* # Ignore IDEA directory .idea/* +!.idea/copyright/* +!.idea/scopes/* # Include the project's dictionary !.idea/dictionaries/ diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 000000000..8587e6736 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/viaversion_gpl.xml b/.idea/copyright/viaversion_gpl.xml new file mode 100644 index 000000000..3103be782 --- /dev/null +++ b/.idea/copyright/viaversion_gpl.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/viaversion_mit.xml b/.idea/copyright/viaversion_mit.xml new file mode 100644 index 000000000..a8f596c05 --- /dev/null +++ b/.idea/copyright/viaversion_mit.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/scopes/ViaVersion.xml b/.idea/scopes/ViaVersion.xml new file mode 100644 index 000000000..8a50a4e2d --- /dev/null +++ b/.idea/scopes/ViaVersion.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/scopes/ViaVersion_API.xml b/.idea/scopes/ViaVersion_API.xml new file mode 100644 index 000000000..6c5493e52 --- /dev/null +++ b/.idea/scopes/ViaVersion_API.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index dc200e443..349a79a00 100644 --- a/api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -82,6 +82,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_17 = register(755, "1.17"); public static final ProtocolVersion v1_17_1 = register(756, "1.17.1"); public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1)); + public static final ProtocolVersion v1_18_2 = register(758, "1.18.2"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index db393ee7b..bfdd32217 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -79,7 +79,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_17 = register(755, "1.17"); public static final ProtocolVersion v1_17_1 = register(756, "1.17.1"); public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1)); - public static final ProtocolVersion v1_18_2 = register(758, 72, "1.18.2"); + public static final ProtocolVersion v1_18_2 = register(758, "1.18.2"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/gradle.properties b/gradle.properties index 8f06d0acf..566530450 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project properties - we put these here so they can be modified without causing a recompile of the build scripts -projectVersion=4.2.0-1.18.2-pre1-SNAPSHOT +projectVersion=4.2.0 # Gradle properties org.gradle.daemon=true