Merge branch 'marbled' of gitpot.org:ExploreCraft/modpack into marbled

.gitignore

@@ -0,0 +1 @@
+.DS_Store

config/numismatic-overhaul.json5

@@ -0,0 +1,27 @@
+{
+	// Whether villagers should use Numismatic currency for trading
+	"enableVillagerTrading": false,
+	// Whether taxes from Minecraft Comes Alive: Reborn should be delivered as Numismatic currency
+	"enableMcaCompatibility": false,
+	// Whether Numismatic currency should be injected into the loot tables of loot chests
+	"generateCurrencyInChests": true,
+	// Where the purse in your inventory should be placed on the X axis
+	"pursePositionX": 129,
+	// Where the purse in your inventory should be placed on the Y axis
+	"pursePositionY": 20,
+	"lootOptions": {
+		// Affects money gained from Dungeon and Mineshaft chests
+		"desertMinLoot": 300,
+		// Affects money gained from Dungeon and Mineshaft chests
+		"desertMaxLoot": 1200,
+		// Affects money gained from Dungeon and Mineshaft chests
+		"dungeonMinLoot": 500,
+		// Affects money gained from Dungeon and Mineshaft chests
+		"dungeonMaxLoot": 2000,
+		// Affects money gained from Bastion, Stronghold, Outpost and Buried Treasure chests
+		"structureMinLoot": 1500,
+		"structureMaxLoot": 4000,
+		"strongholdLibraryMinLoot": 2000,
+		"strongholdLibraryMaxLoot": 6000
+	}
+}

config/world-host.json5

@@ -0,0 +1,10 @@
+{
+	serverIp: "world-host.jemnetworks.com",
+	onlineStatusLocation: "left",
+	enableFriends: true,
+	enableReconnectionToasts: false,
+	noUPnP: false,
+	useShortIp: false,
+	showOutdatedWorldHost: false,
+	friends: []
+}

index.toml

@@ -76,6 +76,10 @@ hash = "172fbcaebcaa40c0d5e5afc11253fd40b67c2987ed65a1f678c44be4260a68d3"
 file = "config/nomobfarm.properties"
 hash = "a18e19970d598fc8009b49f02e4fc24aaca445e96f5f7bdd1b4084918e2c1350"
 
+[[files]]
+file = "config/numismatic-overhaul.json5"
+hash = "e9ce5736818ff9c7f0d755bb83524a2ad72e990c2cf29a8e5543de1ec962016f"
+
 [[files]]
 file = "config/puzzle.json"
 hash = "7dddd9b8df252ed38ad83a27d0d49145c1697abdf1d7ddb1a24ae6cf7683f6df"
@@ -88,6 +92,10 @@ hash = "3b01094400618f74596b9a3d0a5b60082e67bbb75174b592cd1393905584a8a7"
 file = "config/tokenablefurnaces.json"
 hash = "a33d04b053faccfc7029ac16e14a3ee1e07ee2da18b7fc678e44a9b06c615f12"
 
+[[files]]
+file = "config/world-host.json5"
+hash = "93882c7ed6b92fd4dd0a3dbcf15751cc5c76e7eb19ab343c8d2554e1e5b191a5"
+
 [[files]]
 file = "mods/3dskinlayers.pw.toml"
 hash = "be1ff1b29f0935a35259b5b7fc3ec104149c83b2f5f783c9751f5759d0dc75fa"
@@ -120,7 +128,7 @@ metafile = true
 
 [[files]]
 file = "mods/adventurez.pw.toml"
-hash = "69ff69fc11e380ea960d04b809f724275866e96f4fe7600a64e420357632a725"
+hash = "b46cc4edb8a3ca20de88d63da115110ee278a39b7077a2a51e426972128ec768"
 metafile = true
 
 [[files]]
@@ -228,6 +236,11 @@ file = "mods/boat-item-view.pw.toml"
 hash = "aa5edd2c0991a3e43e61bc8c20afc354c9101a328c319af6f2a7682f14764b4c"
 metafile = true
 
+[[files]]
+file = "mods/bosses-of-mass-destruction.pw.toml"
+hash = "c5fe06b7d389fa87dadca4f4974660eff26b336a908ee506fd616f717e1be581"
+metafile = true
+
 [[files]]
 file = "mods/botarium.pw.toml"
 hash = "ed2e23b38b2e862d187b8303903724995bc3c61ce54a72733f3c3792932c2b86"
@@ -358,6 +371,11 @@ file = "mods/draggable-resource-packs.pw.toml"
 hash = "518c173ae0ecaffecb502e852637a3c90719db82c552acce29c193b3a1a80658"
 metafile = true
 
+[[files]]
+file = "mods/dramatic-doors.pw.toml"
+hash = "1525fda3c15d2ccd5bff8bb01a7cd5dbfab6d4c0b3269295951792a20b93ef56"
+metafile = true
+
 [[files]]
 file = "mods/dynamic-fps.pw.toml"
 hash = "10782ced6da226b65256508a77feaf45f3d0a04d07ad0d5adaa6d03a172c37c1"
@@ -368,6 +386,11 @@ file = "mods/eating-animation.pw.toml"
 hash = "f52293cc81b07666eeee3bfcf5f34039e2d2bc64cd22416b5cbdb554eec17a0e"
 metafile = true
 
+[[files]]
+file = "mods/edf-remastered.pw.toml"
+hash = "772e44b75405916c14affc33c9e8ff3955d131750ecaaa3016a0b55fa6786154"
+metafile = true
+
 [[files]]
 file = "mods/editsign.pw.toml"
 hash = "77c7376b7c419934749cb7d7cc4821020cdbfbe96dba003505bd71ad18d76578"
@@ -413,11 +436,6 @@ file = "mods/extrasounds.pw.toml"
 hash = "2e871ee3068cfb44e799d244f4e586e6f32e5708b16a6832939c3c4f01d91170"
 metafile = true
 
-[[files]]
-file = "mods/fabric-language-kotlin.pw.toml"
-hash = "c985bc9064cc29094fdfd59a037baa1523778cc2a9e5665c3f1b6ca0efe6a543"
-metafile = true
-
 [[files]]
 file = "mods/factory-blocks.pw.toml"
 hash = "4f882685d39af0a569e54bcef9ffddafc233665861044ee76d1ad2b881de1878"
@@ -503,6 +521,11 @@ file = "mods/iris.pw.toml"
 hash = "330adfffb6a749f24c9c84494ab8df27db52eb473ac49e5c92314bcc61521ba5"
 metafile = true
 
+[[files]]
+file = "mods/item-filters.pw.toml"
+hash = "3c45ef4cf714017201df7154d49dee92b221014b956eb07ba1588d5fb957ae78"
+metafile = true
+
 [[files]]
 file = "mods/jade-addons-fabric.pw.toml"
 hash = "6f6c3d6646f445f0614c57d9b3c4d56d5b5057d6370f18ed8ac255dc8b65dbbd"
@@ -653,6 +676,11 @@ file = "mods/modmenu.pw.toml"
 hash = "09eb7db3ca7778d91ad66845e41b6b4814655fe375a05d4a69528c74b4f1c8af"
 metafile = true
 
+[[files]]
+file = "mods/more-slabs-stairs-and-walls.pw.toml"
+hash = "39f2492b61eee3e25188ee34ab3c65eb78f50127b789bfca7ff86e44dc9cef00"
+metafile = true
+
 [[files]]
 file = "mods/morechathistory.pw.toml"
 hash = "d1558ff187abe468110fef11eee834aa3c03df732e706ac16e221425b538da4d"
@@ -725,12 +753,12 @@ metafile = true
 
 [[files]]
 file = "mods/opac-fabric-create-support.pw.toml"
-hash = "50bd803afaf12d3406ad7bf1781e2f75bb38bbccb5d7720c32cf6f833a97eb15"
+hash = "5f9113ba8565bb1bbfc6534dbb3e0dcc767b721d534dd1a0f210f9ae16fb5d40"
 metafile = true
 
 [[files]]
 file = "mods/open-parties-and-claims.pw.toml"
-hash = "ce638706dae5cff9163262d4c5db8b1af749339b5e6921e1fd3a642ad9c7079b"
+hash = "36a0f51be98cd65d4a07bbd1ddce0059ed635409549a3f961433c460099b02db"
 metafile = true
 
 [[files]]
@@ -778,6 +806,11 @@ file = "mods/puzzles-lib.pw.toml"
 hash = "0568443a68c429253e10bee7655f0baf669f1fd8dd06b39cb83423f6c522cadc"
 metafile = true
 
+[[files]]
+file = "mods/qkl.pw.toml"
+hash = "78fe291bc3d50234209d5b80735b469044f4d858dc8d3ba5bc38d1e098cb786f"
+metafile = true
+
 [[files]]
 file = "mods/qsl.pw.toml"
 hash = "7f16d61f278eb23f2778ebc55467391d06fd76a8710d5b857efb7762734fb281"
@@ -958,6 +991,16 @@ file = "mods/voice-chat-interaction.pw.toml"
 hash = "4a63451ef8d020713651dd9d364772595b0124138511a1a39c9b8c8e72e3c0c0"
 metafile = true
 
+[[files]]
+file = "mods/voidz.pw.toml"
+hash = "b23c8861a561faf127755485d626b5464e86beff310d46c634873ddd1cff4bf8"
+metafile = true
+
+[[files]]
+file = "mods/world-host.pw.toml"
+hash = "2e7316dfcdbe292d78cf55189162961c900327bb62d18a58045d46b32137ec67"
+metafile = true
+
 [[files]]
 file = "mods/xaeros-minimap.pw.toml"
 hash = "d20aae5fd2bcc4abc1ce6e45e3ef63fbfd09f57844fc23f68d5869779bb7b54d"

mods/adventurez.pw.toml

@@ -1,13 +1,13 @@
 name = "AdventureZ"
-filename = "adventurez-1.4.17.jar"
+filename = "adventurez-1.4.18.jar"
 side = "both"
 
 [download]
+url = "https://cdn.modrinth.com/data/defK2XM3/versions/V4ZECTUP/adventurez-1.4.18.jar"
 hash-format = "sha1"
-hash = "95c50b4dcee1c7f4e0ff3d1db0c11e624b43c92f"
+hash = "e7f7513638c632e07717b73a835cd8db67096fa3"
-mode = "metadata:curseforge"
 
 [update]
-[update.curseforge]
+[update.modrinth]
-file-id = 4061649
+mod-id = "defK2XM3"
-project-id = 390991
+version = "V4ZECTUP"

mods/bosses-of-mass-destruction.pw.toml

@@ -0,0 +1,13 @@
+name = "Bosses of Mass Destruction"
+filename = "BOMD-1.4.6-1.19.2.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/du3UfiLL/versions/wCkpCd2l/BOMD-1.4.6-1.19.2.jar"
+hash-format = "sha1"
+hash = "c4d0c1d4cd89b71dc162913233a4b08927d41ae8"
+
+[update]
+[update.modrinth]
+mod-id = "du3UfiLL"
+version = "wCkpCd2l"

mods/dramatic-doors.pw.toml

@@ -0,0 +1,13 @@
+name = "Dramatic Doors"
+filename = "DramaticDoors-Fabric-1.19.2-2.0.0.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/aQ7h7gal/versions/eKdHPMuc/DramaticDoors-Fabric-1.19.2-2.0.0.jar"
+hash-format = "sha1"
+hash = "dae5c7a83e7a5e5c6667df6a6e1786881eb402f4"
+
+[update]
+[update.modrinth]
+mod-id = "aQ7h7gal"
+version = "eKdHPMuc"

mods/edf-remastered.pw.toml

@@ -0,0 +1,13 @@
+name = "Ender Dragon Fight Remastered"
+filename = "edf-remastered-4.2.0.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/HQsBdHGd/versions/8ZUTaqxW/edf-remastered-4.2.0.jar"
+hash-format = "sha1"
+hash = "e31fe05d5280d6c7e528106e8b4ae8895eacf067"
+
+[update]
+[update.modrinth]
+mod-id = "HQsBdHGd"
+version = "8ZUTaqxW"

mods/fabric-language-kotlin.pw.toml

@@ -1,13 +0,0 @@
-name = "Fabric Language Kotlin"
-filename = "fabric-language-kotlin-1.9.0+kotlin.1.8.0.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/esSFbyFg/fabric-language-kotlin-1.9.0%2Bkotlin.1.8.0.jar"
-hash-format = "sha1"
-hash = "da5adc0695672002bf5d95d1da29bbd9e2c5dfb7"
-
-[update]
-[update.modrinth]
-mod-id = "Ha28R6CL"
-version = "esSFbyFg"

mods/factory-blocks.pw.toml

@@ -1,13 +0,0 @@
-name = "Factory Blocks"
-filename = "factory-blocks-mod-1.0.1+1.19.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "3c1ca2aeaa05ca6ecf2dde41fd090d1ce5878fec"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 4322268
-project-id = 640001

mods/item-filters.pw.toml

@@ -0,0 +1,13 @@
+name = "Item Filters"
+filename = "item-filters-fabric-1902.2.9-build.51.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "25b4e0fbbeb7673216db09b3ec68e55af4208cf4"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4553325
+project-id = 309674

mods/more-slabs-stairs-and-walls.pw.toml

@@ -0,0 +1,13 @@
+name = "More Slabs Stairs & Walls"
+filename = "mssw-fabric-2.4.0+1.19.2.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/bdBzXqbS/versions/KFoS6drW/mssw-fabric-2.4.0%2B1.19.2.jar"
+hash-format = "sha1"
+hash = "dba8c3a488f2583d7099e9fd2b98c19309d4f6d2"
+
+[update]
+[update.modrinth]
+mod-id = "bdBzXqbS"
+version = "KFoS6drW"

mods/opac-fabric-create-support.pw.toml

@@ -1,13 +1,13 @@
 name = "Create Support for Open Parties and Claims"
-filename = "opac-fabric-create-support-1.1.0.jar"
+filename = "opac-fabric-create-support-1.3.0.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/T4Cv5iZq/versions/1.1.0/opac-fabric-create-support-1.1.0.jar"
+url = "https://cdn.modrinth.com/data/T4Cv5iZq/versions/UmKySKmr/opac-fabric-create-support-1.3.0.jar"
 hash-format = "sha1"
-hash = "fbb741c5526a0c1853d1eae489079c703fad35e4"
+hash = "52fefcbecc906e83d05e6a6788e689bab01c3da0"
 
 [update]
 [update.modrinth]
 mod-id = "T4Cv5iZq"
-version = "JnCTHLbn"
+version = "UmKySKmr"

mods/open-parties-and-claims.pw.toml

@@ -1,13 +1,13 @@
 name = "Open Parties and Claims"
-filename = "open-parties-and-claims-fabric-1.19.2-0.17.2.jar"
+filename = "open-parties-and-claims-fabric-1.19.2-0.19.0.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/gF3BGWvG/versions/EDsbDuj1/open-parties-and-claims-fabric-1.19.2-0.17.2.jar"
+url = "https://cdn.modrinth.com/data/gF3BGWvG/versions/Rfoxgtqm/open-parties-and-claims-fabric-1.19.2-0.19.0.jar"
 hash-format = "sha1"
-hash = "87b70f91571a982ec800375588134f8292ba0708"
+hash = "0bbf8f9782dceac54bedad744350307fc7d37ca2"
 
 [update]
 [update.modrinth]
 mod-id = "gF3BGWvG"
-version = "EDsbDuj1"
+version = "Rfoxgtqm"

mods/qkl.pw.toml

@@ -0,0 +1,13 @@
+name = "Quilt Kotlin Libraries (QKL)"
+filename = "quilt-kotlin-libraries-1.0.2+kt.1.8.0+flk.1.9.0.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/lwVhp9o5/versions/4Ag1YF4s/quilt-kotlin-libraries-1.0.2%2Bkt.1.8.0%2Bflk.1.9.0.jar"
+hash-format = "sha1"
+hash = "7f68f8252573b5b76e1bdb30a8fe31f8237ddf83"
+
+[update]
+[update.modrinth]
+mod-id = "lwVhp9o5"
+version = "4Ag1YF4s"

mods/voidz.pw.toml

@@ -0,0 +1,13 @@
+name = "VoidZ"
+filename = "voidz-1.0.9.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/OMiCHIwt/versions/oHvab7Fh/voidz-1.0.9.jar"
+hash-format = "sha1"
+hash = "65ba79201472f86e10cd13004f1fee702e17f4b9"
+
+[update]
+[update.modrinth]
+mod-id = "OMiCHIwt"
+version = "oHvab7Fh"

mods/world-host.pw.toml

@@ -0,0 +1,13 @@
+name = "World Host"
+filename = "World Host-0.4.3+1.19.2-fabric.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/2AIZDfYo/versions/fgfcF1O2/World%20Host-0.4.3%2B1.19.2-fabric.jar"
+hash-format = "sha1"
+hash = "0aa266b0f83d4ee2b7c75f10c76d1e65741d7937"
+
+[update]
+[update.modrinth]
+mod-id = "2AIZDfYo"
+version = "fgfcF1O2"

pack.toml

@@ -1,13 +1,13 @@
 name = "ExploreCraft: Marbled"
 author = "Sangelo"
-version = "2.0.4"
+version = "2.0.5"
 pack-format = "packwiz:1.1.0"
 
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "c8d15f0c7d96d555654ab1ffbaa507e3db8d982146795ec95164c0e6222f00e8"
+hash = "5771c61b96dcbd2fb7aab3b21a8fd99379c566039f69d56ddf9a311063796e6e"
 
 [versions]
 minecraft = "1.19.2"
-quilt = "0.18.10"
+quilt = "0.19.2"