Skip to content

Commit

Permalink
1.5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
WaffleIBOT committed Dec 11, 2023
1 parent d894b7c commit 7285796
Show file tree
Hide file tree
Showing 69 changed files with 274 additions and 119 deletions.
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a bug report to help us improve the modpack
title: Short description of issue here
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is. Be sure that you are running the latest version of the modpack available for your Minecraft version.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Device info (please complete the following information):**
- OS: [e.g. Windows 11, Fedora Linux, etc]
- Minecraft version: [e.g. 1.20.1, 1.19.2, etc]
- Optionally provide some hardware information [e.g. GPU, CPU] if you think it's related

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/config-request.md
@@ -0,0 +1,20 @@
---
name: Config request
about: Suggest an addition, removal, or change in the modpack config
title: Short description of issue here
labels: enhancement
assignees: ''

---

**Is your request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Discord server
url: https://discord.gg/36Tv44cYte
about: Feel free to join our Discord server for short questions/help and chatting with others
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/mod-request.md
@@ -0,0 +1,20 @@
---
name: Mod request
about: Suggest a mod to add, remove, or change in the modpack
title: Short description of issue here
labels: enhancement
assignees: ''

---

**Is your request related to a problem? Please describe if so.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the mod you'd like to add, remove, or change**
A clear and concise description of what you want to happen.

**List alternative mods or solutions you've considered**
A list of any alternative mods or solutions you've considered.

**Additional context**
Add any other context or screenshots about the request here.
45 changes: 45 additions & 0 deletions justfile
@@ -0,0 +1,45 @@
alias e := export
alias r := refresh
alias u := update

set windows-shell := ["powershell.exe", "-NoLogo", "-Command"]

default:
@just --list

[private]
[windows]
_batchcmd cmd loader:
Get-ChildItem -Path versions\{{ loader }} -Directory | % { \
Set-Location $_.FullName; \
Write-Host "running {{ cmd }} in $_"; \
Invoke-Expression "{{ cmd }}"; \
Pop-Location; \
}

[linux]
[macos]
[private]
_batchcmd cmd loader:
for d in versions/{{ loader }}/*/; do \
cd "$d"; \
echo "running {{ cmd }} in $d..."; \
{{ cmd }}; \
cd {{ invocation_directory() }}; \
done

# all versions of <loader> will be exported as a modrinth modpack
[linux]
[macos]
export loader: && (_batchcmd "packwiz modrinth export; mv *.mrpack ../../../.done/" loader)
-mkdir -p .done/{{ loader }}

# all versions of <loader> will be exported as a modrinth modpack
[windows]
export loader: && (_batchcmd "packwiz modrinth export; Move-Item -Path *.mrpack -Destination ../../../.done" loader)

# all versions of <loader> will have pack.toml refreshed
refresh loader: && (_batchcmd "packwiz refresh" loader)

# all versions of <loader> will be updated
update loader: && (_batchcmd "packwiz update --all" loader)
9 changes: 5 additions & 4 deletions makefile
@@ -1,11 +1,12 @@
update-packwiz:
go install github.com/packwiz/packwiz@latest
go install github.com/Merith-TK/packwiz-wrapper/cmd/pw@main
clear
@echo "Packwiz has been Updated"
export:
cd versions\forge && pw batch mr export
@for /r .\versions %%A in (*.mrpack) do move "%%A" ..\hammer\.done
cd versions/forge && pw batch mr export
-mv versions/forge/*/*.mrpack .done/forge
update:
cd versions\forge && pw batch update --all
cd versions/forge && pw batch update --all
refresh:
cd versions\forge && pw batch refresh
cd versions/forge && pw batch refresh
13 changes: 0 additions & 13 deletions old-versions/forge/1.18.2/mods/embeddium.pw.toml

This file was deleted.

13 changes: 0 additions & 13 deletions old-versions/forge/1.18.2/mods/modernfix.pw.toml

This file was deleted.

13 changes: 0 additions & 13 deletions old-versions/forge/1.18.2/mods/saturn.pw.toml

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
name = "Hammer"
author = "intergrav and WaffleIBOT"
version = "1.5.4+1.19.4.forge"
version = "1.5.5+1.19.4.forge"
pack-format = "packwiz:1.1.0"

[index]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions versions/forge/1.18.2/config/entityculling.json
@@ -0,0 +1,4 @@
{
"sleepDelay": 75,
"hitboxLimit": 65
}
@@ -1,8 +1,12 @@
hash-format = "sha256"

[[files]]
file = "config/embeddium-options.json"
hash = "7fa2fdbeb82f6838cdfd4e3c686f31aafba333e505509d75b98883fe8a17f450"

[[files]]
file = "config/entityculling.json"
hash = "d8eec905de29447db4b7a8c82c317033104f812190e59a6df1bc80b1bbac94cb"
hash = "2dcaab476ba54a00113e47f5c3b6d4805d475c6d4076227ae75dc94087f87df8"

[[files]]
file = "config/ferritecore.mixin.properties"
Expand All @@ -12,10 +16,6 @@ hash = "2fee62477522b340fb814284e126749bd7858d2f7c17a2400d09644e5c4d725d"
file = "config/modernfix-mixins.properties"
hash = "5bd17b610deb9d6d3e20325f8728ba01a5fee575718749d31a4eb52c1761022b"

[[files]]
file = "config/rubidium-options.json"
hash = "7fa2fdbeb82f6838cdfd4e3c686f31aafba333e505509d75b98883fe8a17f450"

[[files]]
file = "config/smoothboot.json"
hash = "c37edec3875da8e561eb60bb7a18dcdce128cc41cfe26261c65a8e942f65d58f"
Expand All @@ -27,7 +27,7 @@ metafile = true

[[files]]
file = "mods/embeddium.pw.toml"
hash = "b426f426af27d4578d378c582b6fa9abb6471654ee224ae258401622addb7e87"
hash = "e14facf054e5139fab9ce0b851eae430f30ad1756f6b0dc8e9937bcd682938f7"
metafile = true

[[files]]
Expand All @@ -42,7 +42,7 @@ metafile = true

[[files]]
file = "mods/modernfix.pw.toml"
hash = "bc09779adb18a3da2bc9da0cc25f846fa1fa370e6368c8f303473ca6eac71fd5"
hash = "219023e1cfcbeaf0a05e615217f80115845954e3e232636fef213f841389b282"
metafile = true

[[files]]
Expand All @@ -52,7 +52,7 @@ metafile = true

[[files]]
file = "mods/saturn.pw.toml"
hash = "3a6cd9b5dd610bb86f7278e1109ec47ccd5c97989ced663d068a1b4f176046c8"
hash = "ee439f52a7b0ebe024c54f05c461250dbb8e17991981c6636921ed659e96485d"
metafile = true

[[files]]
Expand Down
File renamed without changes.
13 changes: 13 additions & 0 deletions versions/forge/1.18.2/mods/embeddium.pw.toml
@@ -0,0 +1,13 @@
name = "Embeddium"
filename = "embeddium-0.2.12+mc1.18.2.jar"
side = "client"

[download]
url = "https://cdn.modrinth.com/data/sk9rgfiA/versions/NLrbB3o9/embeddium-0.2.12%2Bmc1.18.2.jar"
hash-format = "sha1"
hash = "eaab0fd30e695a8e44e2e9c198eb58a2a210e134"

[update]
[update.modrinth]
mod-id = "sk9rgfiA"
version = "NLrbB3o9"
13 changes: 13 additions & 0 deletions versions/forge/1.18.2/mods/modernfix.pw.toml
@@ -0,0 +1,13 @@
name = "ModernFix"
filename = "modernfix-forge-5.10.0+mc1.18.2.jar"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/nmDcB62a/versions/IScTO5kT/modernfix-forge-5.10.0%2Bmc1.18.2.jar"
hash-format = "sha1"
hash = "8c231e568f8d973b6dba90c5129ca3f2f1fb79b9"

[update]
[update.modrinth]
mod-id = "nmDcB62a"
version = "IScTO5kT"
File renamed without changes.
13 changes: 13 additions & 0 deletions versions/forge/1.18.2/mods/saturn.pw.toml
@@ -0,0 +1,13 @@
name = "Saturn"
filename = "saturn-mc1.18.2-0.1.0.jar"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/2eT495vq/versions/fkmmC5hv/saturn-mc1.18.2-0.1.0.jar"
hash-format = "sha1"
hash = "1f6889ff3da031053fec919b5ed8a9e9841a0180"

[update]
[update.modrinth]
mod-id = "2eT495vq"
version = "fkmmC5hv"
File renamed without changes.
@@ -1,13 +1,13 @@
name = "Hammer"
author = "intergrav and WaffleIBOT"
version = "1.5.1+1.18.2.forge"
version = "1.5.5+1.18.2.forge"
pack-format = "packwiz:1.1.0"

[index]
file = "index.toml"
hash-format = "sha256"
hash = "c138e0bfeeb2ed12422c1041b5fd07fc5564b387b479a4336cfbd028da4b0cef"
hash = "f296e1d1e2d7763d24a7c05e73802d46ebcf9d3ed920293f7a9fbb17294870b0"

[versions]
forge = "40.2.10"
forge = "40.2.14"
minecraft = "1.18.2"
4 changes: 2 additions & 2 deletions versions/forge/1.19.2/config/entityculling.json
@@ -1,4 +1,4 @@
{
"sleepDelay": 125,
"hitboxLimit": 80
"sleepDelay": 75,
"hitboxLimit": 65
}
3 changes: 3 additions & 0 deletions versions/forge/1.19.2/config/immediatelyfast.json
@@ -0,0 +1,3 @@
{
"experimental_screen_batching": true
}
20 changes: 12 additions & 8 deletions versions/forge/1.19.2/index.toml
@@ -1,8 +1,12 @@
hash-format = "sha256"

[[files]]
file = "config/embeddium-options.json"
hash = "7fa2fdbeb82f6838cdfd4e3c686f31aafba333e505509d75b98883fe8a17f450"

[[files]]
file = "config/entityculling.json"
hash = "d8eec905de29447db4b7a8c82c317033104f812190e59a6df1bc80b1bbac94cb"
hash = "2dcaab476ba54a00113e47f5c3b6d4805d475c6d4076227ae75dc94087f87df8"

[[files]]
file = "config/ferritecore-mixin.toml"
Expand All @@ -13,12 +17,12 @@ file = "config/ferritecore.mixin.properties"
hash = "2fee62477522b340fb814284e126749bd7858d2f7c17a2400d09644e5c4d725d"

[[files]]
file = "config/modernfix-mixins.properties"
hash = "86955a95f69824f44f00aa95829992fd1e17ac2de231f44049a5af1eb09d74c7"
file = "config/immediatelyfast.json"
hash = "55e693cdf40a6cb56a41eba09141c49ade93995642807ef4ac39e8d1233507f2"

[[files]]
file = "config/rubidium-options.json"
hash = "7fa2fdbeb82f6838cdfd4e3c686f31aafba333e505509d75b98883fe8a17f450"
file = "config/modernfix-mixins.properties"
hash = "86955a95f69824f44f00aa95829992fd1e17ac2de231f44049a5af1eb09d74c7"

[[files]]
file = "config/smoothboot.json"
Expand All @@ -31,7 +35,7 @@ metafile = true

[[files]]
file = "mods/embeddium.pw.toml"
hash = "3286e3fd475b8e0802fbee95f8a849345ab55057fba08121c969df14b51f1e41"
hash = "8ed5d3f0995487b1d33f1d852eff7b106faec863500b4e5de840923adefb94ba"
metafile = true

[[files]]
Expand All @@ -51,7 +55,7 @@ metafile = true

[[files]]
file = "mods/modernfix.pw.toml"
hash = "78cb607447d2ee1e0f485e72851a6d91ca047911cb9836c5972a08a55c25f1f8"
hash = "6dfeb04cf68d40ad8b6b1f665d1d5d6e12ad66252415a9fe89ffed508f1465e2"
metafile = true

[[files]]
Expand All @@ -61,7 +65,7 @@ metafile = true

[[files]]
file = "mods/saturn.pw.toml"
hash = "609e1ff1ef8b8468201eb0f016e02ce9976eb3ca21451a31bc65d1b2e018f197"
hash = "355fd7be858748ad6da4ecabd54d899ed93ec4a35d8067d694e26539b9ced012"
metafile = true

[[files]]
Expand Down

0 comments on commit 7285796

Please sign in to comment.