Merge remote-tracking branch 'origin/1.20.x' into 1.20.x

terrarium-earth · Mar 29, 2024 · c86ab94 · c86ab94
2 parents db19d9f + 8a28a2b
commit c86ab94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1 +1,5 @@
-- Fixed stats task performance in situations where there were many players online (ThatGravyBoat)
+- Fixed stats task performance in situations where there were many players online (ThatGravyBoat)
+- Make icon title overrides optional as to not pollute jsons (ThatGravyBoat)
+- Add support for REI, JEI, and EMI in task lists (ThatGravyBoat)
+- Require new quest ids to be ascii only (ThatGravyBoat)
+- Fix selectable reward not have title and icon overridable (ThatGravyBoat)
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2G
 
 enabledPlatforms=fabric,forge
 
-version=1.1.11
+version=1.1.12
 group=earth.terrarium.heracles
 
 minecraftVersion=1.20.1