Merge remote-tracking branch 'original/master'
|
@ -62,10 +62,10 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "ftbguides",
|
"id": "guidebook",
|
||||||
"file": {
|
"file": {
|
||||||
"installer": "internal.dir:mods",
|
"installer": "internal.dir:mods",
|
||||||
"artifact": "curse.maven:317586:2827161",
|
"artifact": "curse.maven:253874:2989594",
|
||||||
"repository": "curse"
|
"repository": "curse"
|
||||||
},
|
},
|
||||||
"type": "mod",
|
"type": "mod",
|
||||||
|
@ -1246,21 +1246,6 @@
|
||||||
"included"
|
"included"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "294335",
|
|
||||||
"file": {
|
|
||||||
"installer": "internal.dir:mods",
|
|
||||||
"artifact": "curse.maven:294335:2624990",
|
|
||||||
"repository": "curse"
|
|
||||||
},
|
|
||||||
"type": "mod",
|
|
||||||
"options": [
|
|
||||||
"required",
|
|
||||||
"client",
|
|
||||||
"server",
|
|
||||||
"included"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "245211",
|
"id": "245211",
|
||||||
"file": {
|
"file": {
|
||||||
|
@ -2207,10 +2192,10 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "246760",
|
"id": "akashictome",
|
||||||
"file": {
|
"file": {
|
||||||
"installer": "internal.dir:mods",
|
"installer": "internal.dir:mods",
|
||||||
"artifact": "curse.maven:246760:2965308",
|
"artifact": "curse.maven:250577:2648656",
|
||||||
"repository": "curse"
|
"repository": "curse"
|
||||||
},
|
},
|
||||||
"type": "mod",
|
"type": "mod",
|
||||||
|
@ -2390,7 +2375,7 @@
|
||||||
"id": "spackenmobs",
|
"id": "spackenmobs",
|
||||||
"file": {
|
"file": {
|
||||||
"installer": "internal.dir:mods",
|
"installer": "internal.dir:mods",
|
||||||
"link": "https://github.com/ACGaming/Spackenmobs/releases/download/RC3/Spackenmobs-1.12.2-RC3.jar"
|
"link": "https://github.com/ACGaming/Spackenmobs/releases/download/RC4/Spackenmobs-1.12.2-RC4.jar"
|
||||||
},
|
},
|
||||||
"type": "mod",
|
"type": "mod",
|
||||||
"options": [
|
"options": [
|
||||||
|
|
14
src/overrides/config/books/dimensions.xml
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
<book title="Dimensional knowledge" cover="akashictome:tome" fontSize="1.0" home="0:0"
|
||||||
|
xmlns="http://localhost/gbook/base"
|
||||||
|
xmlns:minecraft="http://localhost/gbook/minecraft-addons">
|
||||||
|
|
||||||
|
<include ref="gbook:xml/standard.xml"/>
|
||||||
|
|
||||||
|
<chapter>
|
||||||
|
<section>
|
||||||
|
<p>
|
||||||
|
Docs upcoming!
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
</chapter>
|
||||||
|
</book>
|
BIN
src/overrides/oresources/akashictome/textures/items/tome.png
Normal file
After Width: | Height: | Size: 42 KiB |
|
@ -1 +0,0 @@
|
||||||
entity.dncreeper.name=Smava-Creeper
|
|
|
@ -1 +0,0 @@
|
||||||
entity.dncreeper.name=Smava Creeper
|
|
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
"entities.dncreeper.fuse": {
|
|
||||||
"sounds": [
|
|
||||||
{ "name": "deeznuts:fuse" }
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"entities.dncreeper.blow": {
|
|
||||||
"sounds": [
|
|
||||||
{ "name": "deeznuts:blow" }
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"entities.dncreeper.hurt": {
|
|
||||||
"sounds": [
|
|
||||||
{ "name": "deeznuts:hurt1" },
|
|
||||||
{ "name": "deeznuts:hurt2" },
|
|
||||||
{ "name": "deeznuts:hurt3" }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
Before Width: | Height: | Size: 54 KiB |
BIN
src/overrides/oresources/dimdoors/sounds/creepy.ogg
Normal file
BIN
src/overrides/oresources/dimdoors/sounds/creepy_faded.ogg
Normal file
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 908 B |
After Width: | Height: | Size: 908 B |
After Width: | Height: | Size: 1 KiB |
After Width: | Height: | Size: 980 B |
After Width: | Height: | Size: 4.4 KiB |
After Width: | Height: | Size: 3.4 KiB |
|
@ -1 +0,0 @@
|
||||||
entity.morecreeps.lawyer_from_hell.name=Jens Faymann
|
|
Before Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 33 KiB |
30
src/overrides/scripts/darkhold.zs
Normal file
|
@ -108,7 +108,7 @@ mob.addItemInput(<dimdoors:world_thread> * 5);
|
||||||
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "minecraft:creeper"}));
|
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "minecraft:creeper"}));
|
||||||
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "minecraft:blaze"}));
|
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "minecraft:blaze"}));
|
||||||
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "minecraft:enderman"}));
|
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "minecraft:enderman"}));
|
||||||
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "morecreeps:lawyer_from_hell"})); //To be replaced with "Jens Faymann"
|
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "spackenmobs:jens"})); //To be replaced with "Jens Faymann"
|
||||||
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "erebus:erebus.wasp"}));
|
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "erebus:erebus.wasp"}));
|
||||||
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "midnight:nova"}));
|
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "midnight:nova"}));
|
||||||
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "iceandfire:myrmex_royal"}));
|
mob.addItemInput(<draconicevolution:mob_soul>.withTag({EntityName: "iceandfire:myrmex_royal"}));
|
||||||
|
|
10
src/overrides/scripts/engine.zs
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
var i = 32;
|
||||||
|
while i > 0 {
|
||||||
|
var eng = mods.modularmachinery.RecipeBuilder.newBuilder("engine" + i, "engine", 1200, 33 - i);
|
||||||
|
eng.addEnergyPerTickInput(4 * i);
|
||||||
|
eng.addItemOutput(<gregtech:meta_item_2:16018> * i);
|
||||||
|
eng.addItemInput(<gregtech:meta_item_2:16018> * i);
|
||||||
|
eng.addMysticalMechanicsOutput(10 * i, 1200);
|
||||||
|
eng.build();
|
||||||
|
i -= 1;
|
||||||
|
}
|
11
src/overrides/scripts/names.zs
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
<dimdoors:oak_dimensional_door>.displayName = "Space Monolith";
|
||||||
|
<dimdoors:iron_dimensional_door>.displayName = "Pure Space Monolith";
|
||||||
|
<dimdoors:unstable_dimensional_door>.displayName = "Broken Space Monolith";
|
||||||
|
<dimdoors:gold_dimensional_door>.displayName = "Time Monolith";
|
||||||
|
<dimdoors:quartz_dimensional_door>.displayName = "Creation Monolith";
|
||||||
|
<dimdoors:quartz_door>.displayName = "Grey Limestone Monolith";
|
||||||
|
<dimdoors:gold_door>.displayName = "White Limestone Monolith";
|
||||||
|
<dimdoors:world_thread>.displayName = "World Thread";
|
||||||
|
<akashictome:tome>.displayName = "Darkhold";
|
||||||
|
<extendedcrafting:material>.displayName = "Dark Matter Ingot";
|
||||||
|
<modularmachinery:itemmodularium>.displayName = "Quantum Ingot";
|