16 Commits

Author SHA1 Message Date
JordanPlayz158
eda2bf8941 Update 1.0.21 2024-11-13 00:07:43 -05:00
JordanPlayz158
d62a8a60a0 Resolved merge conflict 2024-11-13 00:06:05 -05:00
JordanPlayz158
5fcf7a72a9 Updated Fabric Language Kotlin to accomodate for Origins: Sun Block 2024-11-10 18:52:46 -05:00
JordanPlayz158
1896e15c1f Bumped up fabric loader version to accomodate for Origins: Sun Block 2024-11-10 18:51:18 -05:00
JordanPlayz158
50bd37fc45 Added Vanilla Tweaks DataPacks Durability Ping, Villager Workstation Highlights, and Wandering Trades 2024-11-10 18:29:01 -05:00
JordanPlayz158
a5985aff33 Added Origins: Sun Block 2024-11-06 22:55:46 -05:00
JordanPlayz158
a67fac23ef Forgot packwiz refresh before commit and push 2024-11-06 22:33:36 -05:00
JordanPlayz158
a766ed8fd1 Pushed gravestones with trinkets working to develop branch, another reminder, change the branch to main before merging 2024-11-06 22:32:29 -05:00
JordanPlayz158
97a065ab49 Added Create Crushed Raw Silver into 1 Bewitchment Silver Ingot with a 40% chance of a second Bewitchment Silver Ingot when superheating Create Crushed Raw Silver 2024-11-02 16:32:49 -04:00
JordanPlayz158
eab85c16c4 Updated Archon to 0.7.4 as >=0.7.2 fixes the Channeler on Leaves to Pixie Leaves bug where the leaves would not be converted into Pixie Leaves on right click of Channeler on the leaves block 2024-11-01 15:17:30 -04:00
JordanPlayz158
adef3c091f Updated Regality Resource Pack 2024-11-01 13:28:42 -04:00
JordanPlayz158
8c3bd92f50 Added Origins Umbrellas and Corner Portal Linking 2024-10-30 18:41:24 -04:00
47003d7904 Merge pull request 'BCLib/Axe Fix' (#4) from develop into main
Reviewed-on: #4
2024-08-31 18:56:32 -05:00
JordanPlayz158
75c18d86cf Fixed url, relative url paths are not support yet (ever?) 2024-08-31 19:55:14 -04:00
JordanPlayz158
caecbc62de Re-fixed the bclib issue after causing it again after fixing it previously and forgetting why I did what I did 2024-08-31 19:36:51 -04:00
3490d5416c Merge pull request 'Main to Develop due to hotfixes deployed live to main' (#3) from main into develop
Reviewed-on: #3
2024-08-30 21:39:13 -05:00
16 changed files with 110 additions and 31 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -52,7 +52,7 @@ metafile = true
[[files]] [[files]]
file = "mods/archon.pw.toml" file = "mods/archon.pw.toml"
hash = "cc289958627a9104e9b916d879723b6731084675c4eab60b016132ed49dd065f" hash = "b754d12606df72176854ef310c6a10d7a8c0826b5be7222d7b448f6d12b939f6"
metafile = true metafile = true
[[files]] [[files]]
@@ -87,7 +87,7 @@ metafile = true
[[files]] [[files]]
file = "mods/bclib.pw.toml" file = "mods/bclib.pw.toml"
hash = "d71225c33f2287ca8c0f61483a8d9da35c80a69cb14f252dceaf0e504435bb7f" hash = "928ea4c37b327a05de9251b625b13ddfc9bee66af3f142efa375627a040b0cdc"
metafile = true metafile = true
[[files]] [[files]]
@@ -280,6 +280,11 @@ file = "mods/connectivity.pw.toml"
hash = "308030498a282075732310b66eecf419baa2217ce88496ad87818ae21b1d2423" hash = "308030498a282075732310b66eecf419baa2217ce88496ad87818ae21b1d2423"
metafile = true metafile = true
[[files]]
file = "mods/corner-portal-linking.pw.toml"
hash = "20b35111df6944dc227dc073622969452e83e467b9d85dba561442f7db50d922"
metafile = true
[[files]] [[files]]
file = "mods/coroutil.pw.toml" file = "mods/coroutil.pw.toml"
hash = "809ab9c953bf5ca4647570fafbc76bc7f29ada644f9556831c196e26b1822ca3" hash = "809ab9c953bf5ca4647570fafbc76bc7f29ada644f9556831c196e26b1822ca3"
@@ -452,7 +457,7 @@ metafile = true
[[files]] [[files]]
file = "mods/fabric-language-kotlin.pw.toml" file = "mods/fabric-language-kotlin.pw.toml"
hash = "508af0c05e63443f8179d0b5a34731735fc215872318b23e26df4487d260a36b" hash = "07620e0acf742955b2f10e73244e1828836dd8737ea6142c7c4cd03243a78b7e"
metafile = true metafile = true
[[files]] [[files]]
@@ -537,7 +542,7 @@ metafile = true
[[files]] [[files]]
file = "mods/gravestones.pw.toml" file = "mods/gravestones.pw.toml"
hash = "ace9dbdca93d66c486a4474081fc91219640e506b62679bce01318c34af51e13" hash = "4796247d2484e92958ce0722eb485b910a0ec5321f8a8d54cd183534a4d8374f"
metafile = true metafile = true
[[files]] [[files]]
@@ -840,6 +845,16 @@ file = "mods/optigui.pw.toml"
hash = "2440a2e6d0ade6bc4ca8d3677b59312734dd22106fc6fc5cbac5c24b0ba2ff05" hash = "2440a2e6d0ade6bc4ca8d3677b59312734dd22106fc6fc5cbac5c24b0ba2ff05"
metafile = true metafile = true
[[files]]
file = "mods/origins-sun-block.pw.toml"
hash = "4bee175e1c65b254f4ce788766008a9eed089d8fc0226d27294184cdcc457ca0"
metafile = true
[[files]]
file = "mods/origins-umbrellas.pw.toml"
hash = "6475b7d81bea07d8bce00247a242dd1eff2c29d1948c221449affb2a5a4ee9ab"
metafile = true
[[files]] [[files]]
file = "mods/origins-vampire.pw.toml" file = "mods/origins-vampire.pw.toml"
hash = "074580e076ba31a5ef1465da4395dc9e3a6d34fdfbd80f109374c2aafceb4cf3" hash = "074580e076ba31a5ef1465da4395dc9e3a6d34fdfbd80f109374c2aafceb4cf3"
@@ -1167,7 +1182,7 @@ metafile = true
[[files]] [[files]]
file = "resourcepacks/RegalityResourcePack.zip" file = "resourcepacks/RegalityResourcePack.zip"
hash = "7c627985b33d5d4458a4532b53a4bfc0e78f69ebb0614e178d7cddbc7714c999" hash = "76b0c9ff09ff1eaca3b6f9089aaed6d417a578506733172a8559d43b6c653e22"
[[files]] [[files]]
file = "scripts/recipes.zs" file = "scripts/recipes.zs"
@@ -1177,6 +1192,10 @@ hash = "242dd9fbe0d5254436c9fc98f7c322222a31ed4b4faaae96630952a2be680caa"
file = "scripts/recipes_nylium_1-0-20.zs" file = "scripts/recipes_nylium_1-0-20.zs"
hash = "cf6df7c17e2a4e927e9492855d6288a6717ceffee3e85c93b5b98f4b4275a0a7" hash = "cf6df7c17e2a4e927e9492855d6288a6717ceffee3e85c93b5b98f4b4275a0a7"
[[files]]
file = "scripts/recipes_silver_1-0-21.zs"
hash = "4e92b8cf4a1f9e33a043e4edce03341c5c4de04d6dac163f9b3632af3401e644"
[[files]] [[files]]
file = "servers.dat" file = "servers.dat"
hash = "7f7d5bbb9482fb88a30c572ed01dc77ef555d7eb8375910bdc78584042dd349f" hash = "7f7d5bbb9482fb88a30c572ed01dc77ef555d7eb8375910bdc78584042dd349f"
@@ -1193,6 +1212,18 @@ hash = "1e7a19fb9152b5259081dc79d298c2154cce589c5d95209384b1783d0c276521"
file = "world/datapacks/TempadItems.zip" file = "world/datapacks/TempadItems.zip"
hash = "68a0fb977ad2ec4318ab914a2a5b8135447e4933f9250648c0bb971489ab2510" hash = "68a0fb977ad2ec4318ab914a2a5b8135447e4933f9250648c0bb971489ab2510"
[[files]]
file = "world/datapacks/durability ping v1.1.7 (MC 1.20-1.20.6).zip"
hash = "a08fd71361e857e5bea2a7462d28d633fcb811f7ec55a67e58e85085c7fdb2a7"
[[files]] [[files]]
file = "world/datapacks/soultinkerer_2.zip" file = "world/datapacks/soultinkerer_2.zip"
hash = "05fa3ce0f4e37c208e4e626934de1882389da8d00ec5e954ff06f591cd5c7f08" hash = "05fa3ce0f4e37c208e4e626934de1882389da8d00ec5e954ff06f591cd5c7f08"
[[files]]
file = "world/datapacks/villager workstation highlights v1.1.7 (MC 1.20-1.20.6).zip"
hash = "fcf9e3bb399dd5f31d113370514ec930ce6f056a1c10dabe5c9ba83b52e6d071"
[[files]]
file = "world/datapacks/wandering trades v1.7.5 (MC 1.20-1.20.6).zip"
hash = "573cca25b597ec1670af646b449361abc617b072f5a7b980a66b9505b38d28b0"

View File

@@ -1,13 +1,13 @@
name = "Archon" name = "Archon"
filename = "archon-0.7.1.jar" filename = "archon-0.7.4.jar"
side = "both" side = "both"
[download] [download]
url = "https://cdn.modrinth.com/data/td9zQQBq/versions/AvzC5akc/archon-0.7.1.jar" url = "https://cdn.modrinth.com/data/td9zQQBq/versions/hHFyWODe/archon-0.7.4.jar"
hash-format = "sha1" hash-format = "sha1"
hash = "bf83aeedf143005a0abac1d5e592c0e1e48560b7" hash = "afcf7482bc6518fb95c5683109b98f5edf56d011"
[update] [update]
[update.modrinth] [update.modrinth]
mod-id = "td9zQQBq" mod-id = "td9zQQBq"
version = "AvzC5akc" version = "hHFyWODe"

View File

@@ -3,11 +3,6 @@ filename = "bclib-3.0.14.jar"
side = "both" side = "both"
[download] [download]
url = "https://cdn.modrinth.com/data/BgNRHReB/versions/TPC86Pyz/bclib-3.0.14.jar" url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/compileFromSourceMods/bclib-3.0.14.jar"
hash-format = "sha1" hash-format = "sha256"
hash = "34be724165bfe1207542f26551b10925d099eee1" hash = "ea8b8deef5e4e9b5a9e1b7045415da8deb848e35f04c215d7f4a2cbb08d33ba2"
[update]
[update.modrinth]
mod-id = "BgNRHReB"
version = "TPC86Pyz"

View File

@@ -0,0 +1,13 @@
name = "Corner Portal Linking"
filename = "starbidous-portal-linking-fabric-1.0.0+1.20.1.jar"
side = "both"
[download]
hash-format = "sha1"
hash = "77136cebe4c3746681f8a287c7fee560200693db"
mode = "metadata:curseforge"
[update]
[update.curseforge]
file-id = 4623366
project-id = 677716

View File

@@ -1,13 +1,13 @@
name = "Fabric Language Kotlin" name = "Fabric Language Kotlin"
filename = "fabric-language-kotlin-1.12.1+kotlin.2.0.20.jar" filename = "fabric-language-kotlin-1.12.3+kotlin.2.0.21.jar"
side = "both" side = "both"
[download] [download]
url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/FayzGq0c/fabric-language-kotlin-1.12.1%2Bkotlin.2.0.20.jar" url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/B0fZidZi/fabric-language-kotlin-1.12.3%2Bkotlin.2.0.21.jar"
hash-format = "sha1" hash-format = "sha1"
hash = "5a5c0288ed6ab8c260b987c84d8cdbfe6bc928a7" hash = "54cd3900a904b81bd24c4a35b6577a2ac197b51a"
[update] [update]
[update.modrinth] [update.modrinth]
mod-id = "Ha28R6CL" mod-id = "Ha28R6CL"
version = "FayzGq0c" version = "B0fZidZi"

View File

@@ -3,11 +3,7 @@ filename = "gravestones-v1.15.jar"
side = "both" side = "both"
[download] [download]
url = "https://cdn.modrinth.com/data/ssUbhMkL/versions/Uw9uAQaY/gravestones-v1.15.jar" # CHANGE TO MAIN BRANCH BEFORE MERGE JORDAAANNNNN
hash-format = "sha1" url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/develop/compileFromSourceMods/gravestones-v1.15.jar"
hash = "94c2fd5291c0ccf9f9bce7c0f6093df69b2cc18f" hash-format = "sha256"
hash = "5763e8bb74f5e388c5025d2cc88dafd877fdc30bcc9d5267a558939669a7cb74"
[update]
[update.modrinth]
mod-id = "ssUbhMkL"
version = "Uw9uAQaY"

View File

@@ -0,0 +1,13 @@
name = "Origins: Sun Block"
filename = "originssunblock-1.0.0.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/XMJN6Ifu/versions/gO85Mmal/originssunblock-1.0.0.jar"
hash-format = "sha1"
hash = "3573a8793d457f63ecfd607d29573ccb63447353"
[update]
[update.modrinth]
mod-id = "XMJN6Ifu"
version = "gO85Mmal"

View File

@@ -0,0 +1,13 @@
name = "Origins: Umbrellas"
filename = "originsumbrellas-1.5.6.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/nKWFvKt2/versions/j6mO4YuC/originsumbrellas-1.5.6.jar"
hash-format = "sha1"
hash = "a5acae1e42c78af849fb54ac35ee6b6c65ede0a9"
[update]
[update.modrinth]
mod-id = "nKWFvKt2"
version = "j6mO4YuC"

View File

@@ -6,10 +6,10 @@ pack-format = "packwiz:1.1.0"
[index] [index]
file = "index.toml" file = "index.toml"
hash-format = "sha256" hash-format = "sha256"
hash = "b214a5e03bf5b717c152123c8c1b514262758feb240abb292913dc4a431bf362" hash = "eb9fa2fb77799b2c20b267278bd35c6882f305bf5b290ecf0d836ca4ce356975"
[versions] [versions]
fabric = "0.15.11" fabric = "0.16.9"
minecraft = "1.20.1" minecraft = "1.20.1"
[options] [options]

View File

@@ -0,0 +1,18 @@
// #Add
<recipetype:minecraft:superheating>.addJsonRecipe("create_dd_crushed_raw_silver_silver_ingot", {
type: "create_dd:superheating",
ingredients: [
<item:create:crushed_raw_silver>
],
results: [
<item:bewitchment:silver_ingot>,
{
item: "bewitchment:silver_ingot",
chance: 0.4
}
]
});
// File End