cubicxp/RegalitySMP
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed unnecessary files from git merging manually

Browse Source
This commit is contained in:
JordanPlayz158
2024-08-30 21:23:08 -04:00
parent 113474e973
commit f55bd74245
3 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mods/crafttweaker.pw.toml.orig
View File

@@ -1,27 +0,0 @@
name = "CraftTweaker"
<<<<<<< HEAD
filename = "CraftTweaker-fabric-1.20.1-14.0.40.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/Xg35A4rS/versions/WG2ODwLU/CraftTweaker-fabric-1.20.1-14.0.40.jar"
hash-format = "sha1"
hash = "ebd455b9251a142ddddd18288e75c2aa0ce4e20b"
=======
filename = "CraftTweaker-fabric-1.20.1-14.0.43.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/Xg35A4rS/versions/gdH7ia6f/CraftTweaker-fabric-1.20.1-14.0.43.jar"
hash-format = "sha1"
hash = "cacbbf22e3e43a022ad42102a34f81e92819e5ef"
>>>>>>> develop
[update]
[update.modrinth]
mod-id = "Xg35A4rS"
<<<<<<< HEAD
version = "WG2ODwLU"
=======
version = "gdH7ia6f"
>>>>>>> develop