diff --git a/.gitignore b/.gitignore index e767daf..f01e0e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .mpt -build \ No newline at end of file +build +.vscode \ No newline at end of file diff --git a/README.md b/README.md index 6eb37dc..d0404d2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ -## Mobs and Dimensions 2 +## Mobs and Dimensions 2 MZTE fork --- -this is the repo for the next anvilcraft minecraft modpack - -run './mpt buildtwitch' on Linux or in the git-bash to build the pack for the Twitch Launcher +just my fork of MnD2 which is probably vastly superior to the main version :P this was made using [modpacktools](https://github.com/Anvilcraft/modpacktools) diff --git a/modpacktoolsconfig.toml b/modpacktoolsconfig.toml index f611897..60d899f 100644 --- a/modpacktoolsconfig.toml +++ b/modpacktoolsconfig.toml @@ -9,6 +9,6 @@ selectedVersion = -1 [Downloads] #The maximum number of threads that will be used for downloads - maxThreads = 2 + maxThreads = 10 #The timeout of http requests in ms httpTimeout = 2147483647 diff --git a/mpt b/mpt deleted file mode 100644 index 4e9fc93..0000000 --- a/mpt +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -cd "$(dirname "$0")" || exit -case $1 in -install) - if ! [ -d "$HOME/.mpt" ]; - then mkdir $HOME/.mpt - fi - if ! [ -f "$HOME/.mpt/mpt.jar" ]; - then - dl=$(curl https://data.tilera.xyz/file/mpt/mpt-latest) - echo Downloading $dl ... - curl $dl --output $HOME/.mpt/mpt.jar - fi - ;; -update) - dl=$(curl https://data.tilera.xyz/file/mpt/mpt-latest) - echo Downloading $dl ... - if [ -f ".mpt/mpt.jar" ] - then - curl $dl --output .mpt/mpt.jar - else - curl $dl --output $HOME/.mpt/mpt.jar - fi - echo Updating Script - curl https://data.tilera.xyz/file/mpt/mpt > mpt - ;; -*) - if ! [ -d ".mpt" ]; - then mkdir .mpt - fi - if [ -f ".mpt/mpt.jar" ]; - then jar=.mpt/mpt.jar - elif [ -f "$HOME.mpt/mpt.jar" ]; - then jar=$HOME.mpt/mpt.jar - else - dl=$(curl https://data.tilera.xyz/file/mpt/mpt-latest) - echo Downloading $dl ... - curl $dl --output .mpt/mpt.jar - jar=.mpt/mpt.jar - fi - java -jar $jar $* - ;; -esac \ No newline at end of file diff --git a/src/modpack.json b/src/modpack.json index fe3e672..8cad85b 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -1,5 +1,5 @@ { - "id": "mobs&dimensions2", + "id": "mobs&dimensions2mzte", "type": "modpack", "versions": [ { @@ -2403,7 +2403,7 @@ }, { "id": "forge", - "versions": "[14.23.5.2854]", + "versions": "[1.12.2-14.23.5.2854]", "type": "modloader", "options": [ "required", @@ -2434,6 +2434,74 @@ ] } ] + } + }, + { + "id": "f32", + "file": { + "installer": "internal.dir:resourcepacks", + "link": "http://www.f32.me/F32-1.12.2.zip" + }, + "type": "resourcepack", + "options": [ + "optional", + "client", + "included" + ], + "meta": { + "name": "F32", + "description": ["Faithful texture pack for mods"], + "website": "http://f32.me", + "icon": "https://avatars3.githubusercontent.com/u/8607259?s=200&v=4", + "contributors": [ + {"name": "anders0nmat36", "roles": ["contributor"]}, + {"name": "StefanTT", "roles": ["contributor"]}, + {"name": "MassiMD", "roles": ["contributor"]}, + {"name": "Ormsher", "roles": ["contributor"]}, + {"name": "Intipablo", "roles": ["contributor"]}, + {"name": "Ethryan", "roles": ["contributor"]}, + {"name": "thewawpro", "roles": ["contributor"]}, + {"name": "peterhaneve", "roles": ["contributor"]}, + {"name": "agarian-2", "roles": ["contributor"]}, + {"name": "jmongeon", "roles": ["contributor"]}, + {"name": "aws404", "roles": ["contributor"]}, + {"name": "smenes", "roles": ["contributor"]}, + {"name": "cpw", "roles": ["contributor"]}, + {"name": "brad18", "roles": ["contributor"]}, + {"name": "blumn2", "roles": ["contributor"]}, + {"name": "VT-14", "roles": ["contributor"]}, + {"name": "Trinsdar", "roles": ["contributor"]}, + {"name": "SuperMario20", "roles": ["contributor"]}, + {"name": "Riernar", "roles": ["contributor"]}, + {"name": "Luke100000", "roles": ["contributor"]}, + {"name": "KarlosWGeek", "roles": ["contributor"]}, + {"name": "Bernasss12", "roles": ["contributor"]} + ] + } + }, + { + "id": "faithful", + "file": { + "installer": "internal.dir:resourcepacks", + "link": "https://github.com/FaithfulTeam/Faithful/archive/1.12.zip" + }, + "type": "resourcepack", + "options": [ + "optional", + "client", + "included" + ], + "meta": { + "name": "Faithful", + "description": ["Pretty good looking texture pack i guess"], + "website": "https://faithful.team", + "icon": "https://faithful.team/content/images/2020/04/faithful_logo_3_final-2.png", + "contributors": [ + {"name": "xMrVizzy", "roles": ["contributor"]}, + {"name": "seirin-blu", "roles": ["contributor"]}, + {"name": "katdotsh", "roles": ["contributor"]}, + {"name": "Juknum", "roles": ["contributor"]} + ] } } ] @@ -2455,25 +2523,26 @@ "name": "Mobs&Dimensions2", "contributors": [ { - "name": "tilera", + "name": "LordMZTE", "roles": [ "owner" ] }, { - "name": "ACGaming", + "name": "tilera", "roles": [ "author", "artist" ] }, { - "name": "LordMZTE", + "name": "ACGaming", "roles": [ "author" ] } - ] + ], + "description": ["MZTE fork of the Mobs and Dimensions 2 pack"] }, "asversion": 1 } diff --git a/src/overrides/options.txt b/src/overrides/options.txt new file mode 100644 index 0000000..b107c72 --- /dev/null +++ b/src/overrides/options.txt @@ -0,0 +1,8 @@ +gamma:1.0 +guiScale:2 +resourcePacks:["1.12.zip", "F32-1.12.2.zip", "spackenmobs-1.0.zip"] +showSubtitles:true +autoJump:false +soundCategory_master:0.4 +soundCategory_music:0.0 +soundCategory_block:0.3