Merge remote-tracking branch 'origin/1.15' into 1.16

# Conflicts: # gradle.properties
tterrag1098 · May 3, 2021 · b77a7fb · b77a7fb
2 parents 17bbc3f + 826f1cf
commit b77a7fb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-mod_version=1.0.0-beta.x
+mod_version=1.0.x
 minecraft_version=1.16.5
 forge_version=36.1.0