Skip to content

Commit

Permalink
Merge pull request #39 from MeepishRealms/dev
Browse files Browse the repository at this point in the history
Merge v1.5.4 from Dev into Main
  • Loading branch information
bruglet authored Jun 17, 2024
2 parents 8f68b95 + 62446fc commit 91c5e7d
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 20 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,17 @@ Nearly all mods in this pack are uploaded on Modrinth. For a list of all mods th

The following mods/resouruce/data packs are bundled as an override, meaning that they are not distributed by Modrinth's servers, but rather included as a part of the `.mrpack` binary.

- **[B.F. End Cities](https://www.curseforge.com/minecraft/mc-mods/bf-end-cities)** by Anthxny
- The MIT License used by the mod permits redistribution.
- *Source code avaliable at https://github.com/anthxnymc/BFEndCities*
- **[Bobby Reforged](https://www.curseforge.com/minecraft/mc-mods/bobby-reforged)** by Anthxny
- The LGPL-3 used by the mod permits redistribution.
- *Source code avaliable at https://github.com/anthxnymc/BobbyReforged*
- **[Chimes](https://www.curseforge.com/minecraft/mc-mods/chimes)** by BlewberryPie
- Permission explicitly obtained from Mod Author. See [permission.png](chimes/permission.png).
- **[Collector's Reap](https://www.curseforge.com/minecraft/mc-mods/collectors-reap) by brnbrd**
- The MIT License used by the mod permits redistribution.
- *Source code avaliable at https://github.com/brnbrd/CollectorsReap*
- **[Cosmetic Armor Reworked](https://www.curseforge.com/minecraft/mc-mods/cosmetic-armor-reworked)** by LainMI
- The "Minecraft Mod Public License" used by the mod permits redistribution.
- *Source code avaliable at https://github.com/zlainsama/CosmeticArmorReworked*
Expand Down
4 changes: 2 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"manifestType": "minecraftModpack",
"manifestVersion": 1,
"name": "MeepishRealms: ME",
"version": "1.5.3",
"version": "1.5.4",
"author": "",
"files": [
{
Expand Down Expand Up @@ -411,7 +411,7 @@
},
{
"projectID": 679270,
"fileID": 5287289,
"fileID": 5437370,
"required": true
},
{
Expand Down
12 changes: 6 additions & 6 deletions modrinth.index.json
Original file line number Diff line number Diff line change
Expand Up @@ -546,15 +546,15 @@
},
{
"downloads": [
"https://cdn.modrinth.com/data/iUheEnjm/versions/hxwE6dfU/ThirstWasTaken-1.20.1-1.3.7.jar"
"https://cdn.modrinth.com/data/iUheEnjm/versions/WAqHrDql/ThirstWasTaken-1.20.1-1.3.8.jar"
],
"env": { "client": "required", "server": "required" },
"fileSize": 195202,
"fileSize": 198813,
"hashes": {
"sha1": "f44564e8bd9ce8e78676fec7a695988486504bcb",
"sha512": "6443271e6f96245731ae5810c0f187b77a48a1a6c97151b312c0c615ef4aad32d2fb27c257a03a35b2defefb7ef0e9a23f2ac79d777129adb58a68863c5abad6"
"sha1": "ab8f7731f5e4dd368ec17781b56e9f7f540f442f",
"sha512": "01e02e360c265d264bf9d2bd7246a922eed92a127f7f7977931c9d33b2477f181d1da0469a3956d4005b709ec5e1e28ba28f0347128e750db9f3287bf93570cc"
},
"path": "mods/ThirstWasTaken-1.20.1-1.3.7.jar"
"path": "mods/ThirstWasTaken-1.20.1-1.3.8.jar"
},
{
"downloads": [
Expand Down Expand Up @@ -2277,5 +2277,5 @@
"game": "minecraft",
"name": "Modded Expansion",
"summary": "MeepishRealms: Modded Expansion is a vanilla-aesthetic Forge modpack focused around long-term progression, automation, building, socialization, and collaboration.",
"versionId": "1.5.3"
"versionId": "1.5.4"
}
2 changes: 1 addition & 1 deletion overrides/config/bcc-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#The name of the modpack
modpackName = "Modded Expansion"
#The version of the modpack
modpackVersion = "1.5.3"
modpackVersion = "1.5.4"
#Use the metadata.json to determine the modpack version
#ONLY ENABLE THIS IF YOU KNOW WHAT YOU ARE DOING
useMetadata = false
Expand Down
22 changes: 11 additions & 11 deletions overrides/config/simple-rpc/simple-rpc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["mclogo"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand All @@ -48,7 +48,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["mclogo"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand All @@ -67,7 +67,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["mclogo"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand All @@ -86,7 +86,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["mclogo"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand All @@ -105,7 +105,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["mclogo"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand All @@ -124,7 +124,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["mclogo"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand All @@ -143,7 +143,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["mclogo"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand Down Expand Up @@ -179,7 +179,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["mclogo"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand Down Expand Up @@ -210,7 +210,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["overworld"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand All @@ -228,7 +228,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["nether"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

Expand All @@ -246,7 +246,7 @@
#The Asset ID of the image to display as the small image
smallImageKey = ["end"]
#The text that gets displayed when the small image is hovered
smallImageText = "MR:ME v1.5.3"
smallImageText = "MR:ME v1.5.4"
#The buttons to display on Discord
buttons = []

0 comments on commit 91c5e7d

Please sign in to comment.