Skip to content

Commit

Permalink
White Lines Cleared
Browse files Browse the repository at this point in the history
  • Loading branch information
misterfixit committed May 9, 2016
1 parent cc0c7c6 commit e9f6121
Show file tree
Hide file tree
Showing 49 changed files with 1,089 additions and 1,089 deletions.
2,012 changes: 1,006 additions & 1,006 deletions ResonantRise3DEV.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/AppliedEnergistics2/recipes/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,4 @@ <h4 id="import">Import</h4>
</div>
</div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/Ampitheter.json
Original file line number Diff line number Diff line change
Expand Up @@ -4399,4 +4399,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/LavaLight.json
Original file line number Diff line number Diff line change
Expand Up @@ -531,4 +531,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/MedFarm1.json
Original file line number Diff line number Diff line change
Expand Up @@ -1780,4 +1780,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/MedForge1.json
Original file line number Diff line number Diff line change
Expand Up @@ -1601,4 +1601,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/MedHouse1.json
Original file line number Diff line number Diff line change
Expand Up @@ -905,4 +905,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/MedMossyForge.json
Original file line number Diff line number Diff line change
Expand Up @@ -1086,4 +1086,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/MossyCellar1.json
Original file line number Diff line number Diff line change
Expand Up @@ -973,4 +973,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/MossyGourdHouse1.json
Original file line number Diff line number Diff line change
Expand Up @@ -1172,4 +1172,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/MossyTheatre.json
Original file line number Diff line number Diff line change
Expand Up @@ -2202,4 +2202,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/QuickDemonStructure1.json
Original file line number Diff line number Diff line change
Expand Up @@ -629,4 +629,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/SmallHouse1.json
Original file line number Diff line number Diff line change
Expand Up @@ -595,4 +595,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/SmallHouse2.json
Original file line number Diff line number Diff line change
Expand Up @@ -630,4 +630,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/SmallMossyTower1.json
Original file line number Diff line number Diff line change
Expand Up @@ -1130,4 +1130,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/BloodMagic/schematics/SmallTower1.json
Original file line number Diff line number Diff line change
Expand Up @@ -1082,4 +1082,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion config/GanysMods/Recipes/EnderFurnace.xml
Original file line number Diff line number Diff line change
Expand Up @@ -327,4 +327,4 @@ The syntax for ore dictionary values is the value between double-quotes. (e.g. "
<input1>"oreDiamond"</input1>
</recipe>

</ENDERFURNACE>
</ENDERFURNACE>
2 changes: 1 addition & 1 deletion config/GanysMods/Recipes/EnderFurnaceFuels.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ The syntax for ore dictionary values is the value between double-quotes. (e.g. "
<burnTime>1600</burnTime>
</entry>

</ENDERFURNACEFUELS>
</ENDERFURNACEFUELS>
2 changes: 1 addition & 1 deletion config/GanysMods/Recipes/MagmaticCentrifuge.xml
Original file line number Diff line number Diff line change
Expand Up @@ -246,4 +246,4 @@ The syntax for ore dictionary values is the value between double-quotes. (e.g. "
<output1>minecraft:sponge 1 0</output1>
</recipe>

</MAGMATICCENTRIFUGE>
</MAGMATICCENTRIFUGE>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (FML.isModLoaded("appliedenergistics2") && AE2_enabled){
NEI.override_item(AE2.getFacadeItem(), [java.random(AE2.getNumberOfTypes())]);
}
}
2 changes: 1 addition & 1 deletion config/INpureProjects/custom_nei_filters/Bibliocraft.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (FML.isModLoaded("BiblioCraft") && Bibliocraft_enabled){
NEI.override("BiblioCraft:*", [0]);
}
}
2 changes: 1 addition & 1 deletion config/INpureProjects/custom_nei_filters/Bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ var BuildCraft_enabled = true;
var Bibliocraft_enabled = true;
var AE2_enabled = true;
var Tcon_enabled = true;
var MFR_enabled = true;
var MFR_enabled = true;
2 changes: 1 addition & 1 deletion config/INpureProjects/custom_nei_filters/BuildCraft.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ if (FML.isModLoaded("BuildCraft|Transport")){

// Special handler that cleanly removes facades.
BC.obliterate_facades(java.random(BC.getFacadesSize()));
}
}
2 changes: 1 addition & 1 deletion config/INpureProjects/custom_nei_filters/ExtraUtilities.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ if (FML.isModLoaded("ExtraUtilities") && ExtraUtilities_enabled){
// Special handler for cleanly removing them.
ExtraUtilities.obliterate_microblocks([1, 2, 3], ForgeMicroblock.getRandomMaterial());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ if (FML.isModLoaded("ForgeMicroblock") && ForgeMicroblock_enabled){

// Special handler for cleanly removing them.
ForgeMicroblock.obliterate_microblocks([1, 2, 4, 257, 258, 260, 513, 514, 516, 769, 770, 772], ForgeMicroblock.getRandomMaterial());
}
}
2 changes: 1 addition & 1 deletion config/INpureProjects/custom_nei_filters/MFR.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ if (FML.isModLoaded("MineFactoryReloaded") && MFR_enabled){
NEI.hide("MineFactoryReloaded:fluid.mfr.liquid.milk.still", [0]);
NEI.override("MineFactoryReloaded:tile.mfr.stainedglass.pane", [0]);
NEI.override("MineFactoryReloaded:tile.mfr.conveyor", [0]);
}
}
2 changes: 1 addition & 1 deletion config/INpureProjects/custom_nei_filters/Mekanism.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ if (FML.isModLoaded("Mekanism")){
NEI.override("Mekanism:*PlasticBlock", [0]);
NEI.override("Mekanism:Balloon", [0]);
NEI.override("Mekanism:GlowPanel", [0]);
}
}
2 changes: 1 addition & 1 deletion config/INpureProjects/custom_nei_filters/Tcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ if (FML.isModLoaded("TConstruct") && Tcon_enabled){
NEI.override("TConstruct:tool*", [0]);
NEI.override("TConstruct:binding", [0]);
NEI.override("TConstruct:scytheBlade", [0]);
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (FML.isModLoaded("ThermalExpansion") && ThermalExpansion_enabled){
NEI.override("ThermalExpansion:florb", [0, 1]);
}
}
2 changes: 1 addition & 1 deletion config/INpureProjects/custom_nei_filters/vanilla.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ if (vanilla_enabled){
}
NEI.override("minecraft:potion", [0]);
NEI.override("minecraft:spawn_egg", [0]);
}
}
2 changes: 1 addition & 1 deletion config/Natura-Dynamic.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
"enabled": true
}
}
}
}
2 changes: 1 addition & 1 deletion config/OpenEye.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
"value": true
}
}
}
}
2 changes: 1 addition & 1 deletion config/OpenModsLibCore.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
"When disabled: no stencil buffer available unless unlocked with Forge flag. Mods may not use some graphic features"
]
}
}
}
2 changes: 1 addition & 1 deletion config/cofh/world/Modded-Ores.JSON
Original file line number Diff line number Diff line change
Expand Up @@ -397,4 +397,4 @@
1
]
}
}
}
2 changes: 1 addition & 1 deletion config/cofh/world/Nether-Ores.JSON
Original file line number Diff line number Diff line change
Expand Up @@ -298,4 +298,4 @@
-1
]
}
}
}
2 changes: 1 addition & 1 deletion config/cofh/world/ThermalFoundation-Ores.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@
1
]
}
}
}
2 changes: 1 addition & 1 deletion config/cofh/world/Vanilla.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@
"dimensionRestriction": "none",
"dimensions": []
}
}
}
2 changes: 1 addition & 1 deletion config/eirairc/commands.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"override": "who",
"description": "Default alias players for the who command."
}
]
]
2 changes: 1 addition & 1 deletion config/eirairc/servers.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
}
]
}
]
]
2 changes: 1 addition & 1 deletion config/eirairc/trusted_servers.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
2 changes: 1 addition & 1 deletion config/enchiridion/books/enchiridion_introbook.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
"language": "en_US",
"displayName": "Introduction Book",
"displayInCreative": true
}
}
2 changes: 1 addition & 1 deletion config/enchiridion/library_books.json
Original file line number Diff line number Diff line change
Expand Up @@ -386,4 +386,4 @@
"overwrite": ""
}
]
}
}
2 changes: 1 addition & 1 deletion config/endercore/cropConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"meta":3
}
]
}
}
2 changes: 1 addition & 1 deletion config/enderio/PoweredSpawnerConfig_Core.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
"VillagerGolem",
"Villager"
]
}
}
2 changes: 1 addition & 1 deletion config/enderio/PoweredSpawnerConfig_User.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

// Adding a blackList section will completely replace the one in the core file.

}
}
28 changes: 14 additions & 14 deletions config/enderzoo/SpawnConfig_Core.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<!--
Specifies the spawning behavior of Ender Zoo mobs.
Specifies the spawning behavior of Ender Zoo mobs.
These settings can be modified, and changes can be made to non Ender Zoo mobs in the SpawnConfig_User.xml file.
This file will be replaced each time Ender Zoo is loaded and is only placed in the config dir as a guide to creating
entries in the user file.
Note that all entries are applied in order. This allows, for example, for existing slime spawns in swamps to be removed in one
entry, and then in the following (using a different ID) they can be added back with different rates / group sizes.
entry, and then in the following (using a different ID) they can be added back with different rates / group sizes.
The basic format for the file is as follows:
<SpawnConfig>
Expand All @@ -25,15 +25,15 @@ entry attributes:
- entry.id:
Used to uniquely identify the entry. If an entry with this id exists in the user file that entry will replace the one in
the core file.
- entry.mobName: The name used to register the mob with Minecraft.
- entry.mobName: The name used to register the mob with Minecraft.
- entry.creatureType: (Optional, default monster) The type of mob. Values must match the names in EnumCreatureType. Valid entries:
monster, creature, ambient, waterCreature
- entry.rate: The rate at which the entities are spawned, for example 10=Enderman spawn rate, 100=Zombie spawn rate
- entry.minGroupSize: (Optional, default 1) the minimum number of mobs to be spawned per group
- entry.minGroupSize: (Optional, default 1) the minimum number of mobs to be spawned per group
- entry.maxGroupSize: (Optional, default 3) the maximum number of mobs to be spawned per group
Expand All @@ -46,7 +46,7 @@ same id and no biome filters.
biomeFilter attributes:
- type: The type of filter
'any': if a biome matches any of biome entries, and does not match any of the excluded entries, the mob will be able to spawn in that biome
'any': if a biome matches any of biome entries, and does not match any of the excluded entries, the mob will be able to spawn in that biome
'all': if a biome matches all of biome entries, and does not match any of the excluded entries, the mob will be able to spawn in that biome
Expand All @@ -56,16 +56,16 @@ Each filter must contain one or more biome entries
- type: The name of the biome type. There can be many biomes registered for a specific type based on the mods installed
Any number of biome types can be listed for a filter
All valid biome types that are listed in BiomeDictionary.Type. The base types are:
MESA, FOREST, PLAINS, MOUNTAIN, HILLS, SWAMP, SANDY, SNOWY, WASTELAND, BEACH, MUSHROOM, OCEAN, RIVER, NETHER, END
MESA, FOREST, PLAINS, MOUNTAIN, HILLS, SWAMP, SANDY, SNOWY, WASTELAND, BEACH, MUSHROOM, OCEAN, RIVER, NETHER, END
The special name BASE_LAND_TYPES includes:
MESA, FOREST, PLAINS, MOUNTAIN, HILLS, SWAMP, SANDY, SNOWY, WASTELAND, BEACH
- name: The name of the biome. Must be exactly as registered.
- exclude: (Optional, default false) when set to false any biomes matching this type will be excluded. For example, if
FOREST is specified as a biome type, and CONIFEROUS is specified with the exclude set to true, then the mob will not
spawn in a forest with coniferous trees (e.g. spruce) will be excluded
spawn in a forest with coniferous trees (e.g. spruce) will be excluded
-->
<SpawnConfig>

Expand Down Expand Up @@ -108,11 +108,11 @@ Each filter must contain one or more biome entries
<biome type="END" exclude="true" />
</biomeFilter>
</entry>

<entry id="DireWolf" mobName="enderzoo.DireWolf" rate="30" minGroupSize="2" maxGroupSize="6">
<biomeFilter type="all">
<biome type="SNOWY" />
<biome type="CONIFEROUS" />
<biome type="CONIFEROUS" />
<biome type="NETHER" exclude="true" />
<biome type="END" exclude="true" />
</biomeFilter>
Expand Down
2 changes: 1 addition & 1 deletion config/enderzoo/SpawnConfig_User.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<biome type="BASE_LAND_TYPES" />
</biomeFilter>
</entry>
-->
-->

<!-- Enabling this section will remove the default wither witch spawn config and replace it with
a new config with a higher spawn rate
Expand Down
Loading

0 comments on commit e9f6121

Please sign in to comment.