From 63d1b446206f8b8c98e460f6495381305a571e9e Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Tue, 28 Jul 2020 23:46:52 +0200 Subject: [PATCH 01/12] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 71ef384..707cb00 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -## Mobs and Dimensions 2 +## Mobs and Dimensions 2 MZTE fork --- -this is the repo for the next anvilcraft minecraft modpack +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) \ No newline at end of file From fa12897be0dbcf087af9a0f3b549d590fe3c30bb Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Tue, 28 Jul 2020 23:52:03 +0200 Subject: [PATCH 02/12] update modpack.json --- src/modpack.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modpack.json b/src/modpack.json index 38dff81..96933bc 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -1,5 +1,5 @@ { - "id": "mobs&dimensions2", + "id": "mobs&dimensions2mzte", "type": "modpack", "versions": [ { @@ -2350,6 +2350,12 @@ "meta": { "name": "Mobs&Dimensions2", "contributors": [ + { + "name": "LordMZTE", + "roles": [ + "owner" + ] + }, { "name": "tilera", "roles": [ From 15e7ebdee0bb6c696ff3be9c5c886fec4d0faea3 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Wed, 29 Jul 2020 00:27:46 +0200 Subject: [PATCH 03/12] update gitignore add faithful texture packs add options.txt --- .gitignore | 3 ++- src/modpack.json | 28 ++++++++++++++++++++++++++++ src/overrides/options.txt | 8 ++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/overrides/options.txt 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/src/modpack.json b/src/modpack.json index 96933bc..9ae81a1 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -2336,6 +2336,34 @@ "required", "included" ] + }, + { + "id": "f32", + "file": { + "installer": "internal.dir:resourcepacks", + "link": "http://www.f32.me/F32-1.12.2.zip" + }, + "type": "mod", + "options": [ + "required", + "client", + "server", + "included" + ] + }, + { + "id": "faithful", + "file": { + "installer": "internal.dir:resourcepacks", + "link": "https://github.com/FaithfulTeam/Faithful/archive/1.12.zip" + }, + "type": "mod", + "options": [ + "required", + "client", + "server", + "included" + ] } ] } diff --git a/src/overrides/options.txt b/src/overrides/options.txt new file mode 100644 index 0000000..e832ac4 --- /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"] +showSubtitles:true +autoJump:false +soundCategory_master:0.4 +soundCategory_music:0.0 +soundCategory_block:0.3 From aaf24aef71ac032c9e4def8546fffccbdd02c57d Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Wed, 29 Jul 2020 00:30:39 +0200 Subject: [PATCH 04/12] remove server options for resource packs --- src/modpack.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modpack.json b/src/modpack.json index 9ae81a1..9fc1085 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -2347,7 +2347,6 @@ "options": [ "required", "client", - "server", "included" ] }, @@ -2361,7 +2360,6 @@ "options": [ "required", "client", - "server", "included" ] } From 041f844408b1134ee745a31b080b3ec81b5e0a64 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Wed, 29 Jul 2020 17:48:11 +0200 Subject: [PATCH 05/12] remove mpt script --- mpt | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 mpt diff --git a/mpt b/mpt deleted file mode 100644 index c2f6ee6..0000000 --- a/mpt +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -cd "$(dirname "$0")" -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 - ;; -*) - if ! [ -d ".mpt" ]; - then mkdir .mpt - fi - if [ -f "$HOME/.mpt/mpt.jar" ]; - then jar=$HOME/.mpt/mpt.jar - elif [ -f ".mpt/mpt.jar" ]; - then jar=.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 From 2c62649172a0c2ca9e0c8d16ef9479ea41724baa Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Wed, 29 Jul 2020 20:48:10 +0200 Subject: [PATCH 06/12] update modpack.json --- src/modpack.json | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/modpack.json b/src/modpack.json index 69b88da..9982a58 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -2338,41 +2338,16 @@ ] }, { -<<<<<<< HEAD - "id": "f32", - "file": { - "installer": "internal.dir:resourcepacks", - "link": "http://www.f32.me/F32-1.12.2.zip" - }, - "type": "mod", -======= "id": "spackenmobs", "file": { "installer": "internal.dir:resourcepacks", "link": "https://data.tilera.xyz/file/spackenmobs/spackenmobs-1.0.zip" }, "type": "resourcepack", ->>>>>>> original/master "options": [ "required", "client", "included" -<<<<<<< HEAD - ] - }, - { - "id": "faithful", - "file": { - "installer": "internal.dir:resourcepacks", - "link": "https://github.com/FaithfulTeam/Faithful/archive/1.12.zip" - }, - "type": "mod", - "options": [ - "required", - "client", - "included" - ] -======= ], "meta": { "name": "Spackenmobs", @@ -2384,8 +2359,33 @@ ] } ] - } ->>>>>>> original/master + } + }, + { + "id": "f32", + "file": { + "installer": "internal.dir:resourcepacks", + "link": "http://www.f32.me/F32-1.12.2.zip" + }, + "type": "resourcepack", + "options": [ + "required", + "client", + "included" + ] + }, + { + "id": "faithful", + "file": { + "installer": "internal.dir:resourcepacks", + "link": "https://github.com/FaithfulTeam/Faithful/archive/1.12.zip" + }, + "type": "resourcepack", + "options": [ + "required", + "client", + "included" + ] } ] } From 4d5ba4d1a211079e163250069d445b82ef8e6ecd Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Wed, 29 Jul 2020 21:27:38 +0200 Subject: [PATCH 07/12] added meta info to texture packs. --- src/modpack.json | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/src/modpack.json b/src/modpack.json index 9982a58..428ce1b 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -2372,7 +2372,37 @@ "required", "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", @@ -2385,7 +2415,19 @@ "required", "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"]} + ] + } } ] } From 7e25d15de121ce3361a02583966029e6eff84503 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Thu, 30 Jul 2020 12:02:29 +0200 Subject: [PATCH 08/12] remove build script notice from readme --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index afa9e8f..d0404d2 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,4 @@ --- just my fork of MnD2 which is probably vastly superior to the main version :P -run './mpt buildtwitch' on Linux or in the git-bash to build the pack for the Twitch Launcher - this was made using [modpacktools](https://github.com/Anvilcraft/modpacktools) From 0ec3b4ea1828a1edfcc39ddb45d34450b7f05658 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sun, 2 Aug 2020 19:51:22 +0200 Subject: [PATCH 09/12] merge and small fix --- src/modpack.json | 6 ------ src/overrides/options.txt | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/modpack.json b/src/modpack.json index cf285de..c3c59b3 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -2519,12 +2519,6 @@ "roles": [ "author" ] - }, - { - "name": "LordMZTE", - "roles": [ - "author" - ] } ] }, diff --git a/src/overrides/options.txt b/src/overrides/options.txt index e832ac4..b107c72 100644 --- a/src/overrides/options.txt +++ b/src/overrides/options.txt @@ -1,6 +1,6 @@ gamma:1.0 guiScale:2 -resourcePacks:["1.12.zip", "F32-1.12.2.zip"] +resourcePacks:["1.12.zip", "F32-1.12.2.zip", "spackenmobs-1.0.zip"] showSubtitles:true autoJump:false soundCategory_master:0.4 From 4855de284136584983be26fde3ae969b44763696 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sat, 15 Aug 2020 16:26:22 +0200 Subject: [PATCH 10/12] more mpt download threads --- modpacktoolsconfig.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f50dcdbb34c194f9c9fdd90ec23510b5bea8eff7 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sun, 16 Aug 2020 19:58:53 +0200 Subject: [PATCH 11/12] add description --- src/modpack.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modpack.json b/src/modpack.json index ec36af0..f9a4acd 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -2556,7 +2556,8 @@ "author" ] } - ] + ], + "description": ["MZTE fork of the Mobs and Dimensions 2 pack"] }, "asversion": 1 } From c377febc882a95260aa21c3844b6e4a4214b7e2c Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Tue, 18 Aug 2020 21:54:30 +0200 Subject: [PATCH 12/12] fix forge version --- src/modpack.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modpack.json b/src/modpack.json index a0d4235..8416b74 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -2358,7 +2358,7 @@ }, { "id": "forge", - "versions": "[14.23.5.2854]", + "versions": "[1.12.2-14.23.5.2854]", "type": "modloader", "options": [ "required",