Skip to content

Commit

Permalink
Merge branch '1.20.1' into 1.19.4
Browse files Browse the repository at this point in the history
# Conflicts:
#	settings.gradle.kts
  • Loading branch information
rfresh2 committed Feb 12, 2025
2 parents 1c042f7 + 84262a0 commit 70bc34c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
<img src="https://img.shields.io/badge/MC-1.20.4-brightgreen.svg" alt="Minecraft"/>
<img src="https://img.shields.io/badge/MC-1.20.6-brightgreen.svg" alt="Minecraft"/>
<img src="https://img.shields.io/badge/MC-1.21-brightgreen.svg" alt="Minecraft"/>
<img src="https://img.shields.io/badge/MC-1.21.3-brightgreen.svg" alt="Minecraft"/>
<img src="https://img.shields.io/badge/MC-1.21.4-brightgreen.svg" alt="Minecraft"/>
<img src="https://img.shields.io/github/languages/code-size/rfresh2/XaeroPlus.svg" alt="Code size"/>
<img src="https://img.shields.io/github/repo-size/rfresh2/XaeroPlus.svg" alt="GitHub repo size"/>
<img src="https://tokei.rs/b1/github/rfresh2/XaeroPlus?category=code&style=flat" alt="Lines of Code"/>
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ pluginManagement {
}
}
gradle.extra.apply {
set("mod_version", "2.26.1")
set("mod_version", "2.26.2")
set("minecraft_version", "1.19.4")
set("parchment_version", "2023.06.26")
set("worldmap_version_fabric", "1.39.2")
set("minimap_version_fabric", "25.0.0")
set("minimap_version_fabric", "25.1.0")
set("worldmap_version_forge", "1.39.2")
set("minimap_version_forge", "25.0.0")
set("minimap_version_forge", "25.1.0")
}

dependencyResolutionManagement {
Expand Down

0 comments on commit 70bc34c

Please sign in to comment.