update modpack.json
This commit is contained in:
parent
81e6ee171b
commit
2c62649172
1 changed files with 27 additions and 27 deletions
|
@ -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",
|
"id": "spackenmobs",
|
||||||
"file": {
|
"file": {
|
||||||
"installer": "internal.dir:resourcepacks",
|
"installer": "internal.dir:resourcepacks",
|
||||||
"link": "https://data.tilera.xyz/file/spackenmobs/spackenmobs-1.0.zip"
|
"link": "https://data.tilera.xyz/file/spackenmobs/spackenmobs-1.0.zip"
|
||||||
},
|
},
|
||||||
"type": "resourcepack",
|
"type": "resourcepack",
|
||||||
>>>>>>> original/master
|
|
||||||
"options": [
|
"options": [
|
||||||
"required",
|
"required",
|
||||||
"client",
|
"client",
|
||||||
"included"
|
"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": {
|
"meta": {
|
||||||
"name": "Spackenmobs",
|
"name": "Spackenmobs",
|
||||||
|
@ -2385,7 +2360,32 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
>>>>>>> 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"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue