Revert "Merge branch 'master' into hardcore"
This reverts commit960ad382dd
, reversing changes made tocc4af040a1
.
This commit is contained in:
parent
960ad382dd
commit
adf0f9ed2a
6 changed files with 55 additions and 88 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,3 +1,2 @@
|
||||||
.mpt
|
.mpt
|
||||||
build
|
build
|
||||||
.vscode
|
|
|
@ -1,5 +1,7 @@
|
||||||
## Mobs and Dimensions 2 MZTE fork
|
## Mobs and Dimensions 2
|
||||||
---
|
---
|
||||||
just my fork of MnD2 which is probably vastly superior to the main version :P
|
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
|
||||||
|
|
||||||
this was made using [modpacktools](https://github.com/Anvilcraft/modpacktools)
|
this was made using [modpacktools](https://github.com/Anvilcraft/modpacktools)
|
||||||
|
|
|
@ -9,6 +9,6 @@
|
||||||
selectedVersion = -1
|
selectedVersion = -1
|
||||||
[Downloads]
|
[Downloads]
|
||||||
#The maximum number of threads that will be used for downloads
|
#The maximum number of threads that will be used for downloads
|
||||||
maxThreads = 10
|
maxThreads = 2
|
||||||
#The timeout of http requests in ms
|
#The timeout of http requests in ms
|
||||||
httpTimeout = 2147483647
|
httpTimeout = 2147483647
|
||||||
|
|
43
mpt
Normal file
43
mpt
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
#!/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
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"id": "mobs&dimensions2mzte",
|
"id": "mobs&dimensions2",
|
||||||
"type": "modpack",
|
"type": "modpack",
|
||||||
"versions": [
|
"versions": [
|
||||||
{
|
{
|
||||||
|
@ -2403,7 +2403,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "forge",
|
"id": "forge",
|
||||||
"versions": "[1.12.2-14.23.5.2854]",
|
"versions": "[14.23.5.2854]",
|
||||||
"type": "modloader",
|
"type": "modloader",
|
||||||
"options": [
|
"options": [
|
||||||
"required",
|
"required",
|
||||||
|
@ -2435,74 +2435,6 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
|
||||||
{
|
|
||||||
"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"]}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -2523,26 +2455,25 @@
|
||||||
"name": "Mobs&Dimensions2",
|
"name": "Mobs&Dimensions2",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
{
|
{
|
||||||
"name": "LordMZTE",
|
"name": "tilera",
|
||||||
"roles": [
|
"roles": [
|
||||||
"owner"
|
"owner"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "tilera",
|
"name": "ACGaming",
|
||||||
"roles": [
|
"roles": [
|
||||||
"author",
|
"author",
|
||||||
"artist"
|
"artist"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ACGaming",
|
"name": "LordMZTE",
|
||||||
"roles": [
|
"roles": [
|
||||||
"author"
|
"author"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
]
|
||||||
"description": ["MZTE fork of the Mobs and Dimensions 2 pack"]
|
|
||||||
},
|
},
|
||||||
"asversion": 1
|
"asversion": 1
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
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
|
|
Loading…
Reference in a new issue