Merge branch 'develop'

Makefile

@@ -1,7 +1,7 @@
 # Makefile for Erbosoft Vista modpack
 # EJB 11/5/2015
 
-VERSION=0.01
+VERSION=0.02
 FORGEMOD=forge-1.7.10-10.13.4.1448-1.7.10-universal.jar
 
 client-modpack: verify-mods

config-source/Oceancraft.cfg

@@ -0,0 +1,121 @@
+# Configuration file
+
+##########################################################################################################
+# armor health
+#--------------------------------------------------------------------------------------------------------#
+# the number of half shirts for armor.
+##########################################################################################################
+
+"armor health" {
+    I:Coralbody=6
+    I:Coralboots=1
+    I:Coralhelmet=2
+    I:Coralpants=4
+}
+
+
+"mob anglerfish" {
+    I:Id=180
+    I:MaximumPerChunk=7
+    I:MinimumPerChunk=3
+    I:SpawnChange=20
+}
+
+
+"mob beachvillager" {
+    I:Id=170
+    I:MaximumPerChunk=0
+    I:MinimumPerChunk=0
+    I:SpawnChange=100
+}
+
+
+"mob crab" {
+    I:Id=172
+    I:MaximumPerChunk=6
+    I:MinimumPerChunk=4
+    I:SpawnChange=100
+}
+
+
+"mob fishy" {
+    I:Id=174
+    I:MaximumPerChunk=6
+    I:MinimumPerChunk=4
+    I:SpawnChange=100
+}
+
+
+"mob kingcrab" {
+    I:Id=173
+    I:MaximumPerChunk=5
+    I:MinimumPerChunk=2
+    I:SpawnChange=100
+}
+
+
+"mob mantaray" {
+    I:Id=179
+    I:MaximumPerChunk=7
+    I:MinimumPerChunk=3
+    I:SpawnChange=20
+}
+
+
+"mob orca" {
+    I:Id=176
+    I:MaximumPerChunk=2
+    I:MinimumPerChunk=1
+    I:SpawnChange=4
+}
+
+
+"mob seagull" {
+    I:Id=171
+    I:MaximumPerChunk=6
+    I:MinimumPerChunk=4
+    I:SpawnChange=100
+}
+
+
+"mob seaturtle" {
+    I:Id=178
+    I:MaximumPerChunk=7
+    I:MinimumPerChunk=5
+    I:SpawnChange=16
+}
+
+
+"mob shark" {
+    I:Id=177
+    I:MaximumPerChunk=4
+    I:MinimumPerChunk=3
+    I:SpawnChange=8
+}
+
+
+"mob whale" {
+    I:Id=175
+    I:MaximumPerChunk=2
+    I:MinimumPerChunk=1
+    I:SpawnChange=4
+}
+
+
+##########################################################################################################
+# world generation
+#--------------------------------------------------------------------------------------------------------#
+# set to 0 for no world generation.
+##########################################################################################################
+
+"world generation" {
+    I:Coral=1
+    I:Oyster=1
+    I:Pillarhut=1
+    I:Quicksand=0
+    I:Seaweed=10
+    I:Shells=8
+    I:Sponge=1
+}
+
+

mods-source/server/modlist.txt

@@ -5,12 +5,14 @@ adv-repulsion-systems-59.0.3.jar|http://immibis.com/mcmoddl/
 appliedenergistics2-rv2-stable-10.jar|http://ae-mod.info/Downloads/
 AsieLib-1.7.10-0.4.4.jar|http://wiki.vex.tty.sh/wiki:asielib
 backpack-2.0.1-1.7.x.jar|http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1286124-1-6-x-1-7-x-backpacks-v-2-0-1
+bdlib-1.9.3.107-mc1.7.10.jar|http://bdew.net/gendustry/
 BedrockLayer_1.7.2-v1.0.9.jar|http://forum.minecraftuser.jp/viewtopic.php?t=13399
 BiblioCraft[v1.11.4][MC1.7.10].jar|http://www.bibliocraftmod.com/downloads/
 buildcraft-7.1.12.jar|http://www.mod-buildcraft.com/
 buildcraft-compat-7.1.2.jar|http://www.mod-buildcraft.com/pages/download.html
 Carpenter's Blocks v3.3.7 - MC 1.7.10.jar|http://www.carpentersblocks.com/downloads.html
 CodeChickenCore-1.7.10-1.0.6.44-universal.jar|http://chickenbones.net/Pages/links.html
+CoFHCore-[1.7.10]3.0.3-303.jar|http://www.curse.com/mc-mods/minecraft/cofhcore
 CompactSolars-1.7.10-4.4.39.315-universal.jar|http://www.curse.com/mc-mods/minecraft/228759-compact-solars
 Computronics-1.7.10-1.5.9.jar|http://wiki.vex.tty.sh/wiki:computronics
 dimensional-anchor-59.0.3.jar|http://immibis.com/mcmoddl/
@@ -21,16 +23,24 @@ forestry_1.7.10-4.1.1.46.jar|http://forestry.sengir.net/
 ForgeMultipart-1.7.10-1.2.0.345-universal.jar|http://files.minecraftforge.net/ForgeMultipart/
 ForgeRelocation-0.0.1.4-universal.jar|http://www.curse.com/mc-mods/minecraft/232075-forge-relocation
 ForgeRelocationFMP-0.0.1.2-universal.jar|http://www.curse.com/mc-mods/minecraft/232076-forge-relocation-fmp-plugin
+gendustry-1.6.2.127-mc1.7.10.jar|http://bdew.net/gendustry/
 GregsLighting-1.11.2-mc1.7.10.jar|http://www.cosc.canterbury.ac.nz/greg.ewing/minecraft/mods/GregsLighting/
+IC2NuclearControl-2.3.1a-Butt.jar|http://minecraft.curseforge.com/projects/nuclear-control-2/files/2261995
 IGW-Mod-1.7.10-1.1.11-32-universal.jar|http://minecraft.curseforge.com/projects/in-game-wiki-mod
 immibis-core-59.1.2.jar|http://immibis.com/mcmoddl/
 industrialcraft-2-2.2.791-experimental.jar|http://www.industrial-craft.net/
 iridiummod-1.7-0.8.jar|http://forum.industrial-craft.net/index.php?page=Thread&threadID=10700
 ironchest-1.7.10-6.0.60.741-universal.jar|http://www.curse.com/mc-mods/minecraft/228756-iron-chests
+LampsAndTrafficlights-1.2-Minecraft_1.7.10.jar|http://wtmods.createaforum.com/general-10/latl-main-download/msg11/
+Mantle-1.7.10-0.3.2b.jar|http://www.curse.com/mc-mods/minecraft/mantle
+Metallurgy-1.7.10-4.0.6.80.jar|http://www.curse.com/mc-mods/minecraft/metallurgy
+MetallurgyCore-1.7.10-4.0.4.18.jar|http://www.curse.com/mc-mods/minecraft/metallurgy-core
 MoVillages-1.3.1.jar|http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1294582-mo-villages-more-biomes-more-buildings-adjustable
 MrCrayfishFurnitureModv3.4.8(1.7.10).jar|http://www.mrcrayfish.com/mods.php?id=cfm
 MrTJPCore-1.1.0.31-universal.jar|http://www.curse.com/mc-mods/minecraft/229002-mrtjpcore
+NEIIntegration-MC1.7.10-1.0.13.jar|http://www.curse.com/mc-mods/minecraft/225251-nei-integration
 NotEnoughItems-1.7.10-1.0.4.107-universal.jar|http://chickenbones.net/Pages/links.html
+Oceancraft-1.4.1.jar|http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1292144-oceancraft-mod-with-whales-sharks-crabs-and-more-1
 OpenComputers-MC1.7.10-1.5.19.37-universal.jar|http://www.curse.com/mc-mods/minecraft/223008-opencomputers
 ProjectRed-1.7.10-4.7.0pre9.92-Base.jar|http://www.curse.com/mc-mods/minecraft/228702-project-red-base
 ProjectRed-1.7.10-4.7.0pre9.92-Compat.jar|http://www.curse.com/mc-mods/minecraft/229050-project-red-compat
@@ -40,8 +50,14 @@ ProjectRed-1.7.10-4.7.0pre9.92-Lighting.jar|http://www.curse.com/mc-mods/minecra
 ProjectRed-1.7.10-4.7.0pre9.92-Mechanical.jar|http://www.curse.com/mc-mods/minecraft/229048-project-red-mechanical
 ProjectRed-1.7.10-4.7.0pre9.92-World.jar|http://www.curse.com/mc-mods/minecraft/229049-project-red-world
 Railcraft_1.7.10-9.8.0.0.jar|http://www.railcraft.info/releases/
+RoadWorks-2.02-Minecraft_1.7.10.jar|http://wtmods.createaforum.com/general-6/roadworks-main-download/msg10/
 StevesCarts2.0.0.b18.jar|http://minecraft.curseforge.com/projects/steves-carts-2/files
+TConstruct-1.7.10-1.8.8.jar|http://www.curse.com/mc-mods/minecraft/tinkers-construct
 TF2Dispenser-1.7.10.jar|http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1273889-team-fortress-2-teleporter-sentry-dispenser
 TF2Teleporter-1.7.10.jar|http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1273889-team-fortress-2-teleporter-sentry-dispenser
+ThermalDynamics-[1.7.10]1.1.0-161.jar|http://www.curse.com/mc-mods/minecraft/227443-thermal-dynamics
+ThermalExpansion-[1.7.10]4.0.3B1-218.jar|http://www.curse.com/mc-mods/minecraft/thermalexpansion
+ThermalFoundation-[1.7.10]1.2.0-102.jar|http://www.curse.com/mc-mods/minecraft/222880-thermal-foundation
 tubestuff-59.0.4.jar|http://immibis.com/mcmoddl/
+twilightforest-1.7.10-2.3.7.jar|http://www.curse.com/mc-mods/minecraft/227639-the-twilight-forest
 weaponmod-1.14.3.jar|http://www.curse.com/mc-mods/minecraft/balkons-weaponmod

technicpack-resources/overview.markup.txt

@@ -15,6 +15,7 @@ BuildCraft 7.1.12
 BuildCraftCompat 7.1.2
 Carpenter's Blocks 3.3.7
 CodeChickenCore 1.0.6.44
+CoFH Core 3.0.3-303
 Compact Solars 4.4.39.315
 Computronics 1.5.9
 Dimensional Anchors 59.0.3
@@ -25,18 +26,26 @@ Forestry 4.1.1.46
 Forge Multipart 1.2.0.345
 Forge Relocation 0.0.1.4
 Forge Relocation FMP Plugin 0.0.1.2
+Gendustry 1.6.2.127
 Greg's Lighting 1.11.2
+IC2 Nuclear Control 2.3.1a-Butt
 Immibis Core 59.1.2
 IndustrialCraft2 2.2.791-experimental
 In-Game Wiki 1.1.11-32
 Inventory Tweaks 1.58-147
 Iridium Mod 0.8
 Iron Chests 6.0.60.741
+Lamps And Traffic Lights 1.2
 LiteLoader 1.7.10-04
+Mantle 0.3.2b
+Metallurgy 4.0.6.80
+MetallurgyCore 4.0.4.18
 Mo' Villages 1.3.1
 MrCrayfish's Furniture Mod 3.4.8
 MrTJPCore 1.1.0.31
+NEI Integration 1.0.13
 NotEnoughItems 1.0.4.107
+Oceancraft 1.4.1
 OpenComputers 1.5.19.37
 ProjectRed Base 4.7.0pre9.92
 ProjectRed Compat 4.7.0pre9.92
@@ -46,10 +55,16 @@ ProjectRed Lighting 4.7.0pre9.92
 ProjectRed Mechanical 4.7.0pre9.92
 ProjectRed World 4.7.0pre9.92
 RailCraft 9.8.0.0
+RoadWorks 2.02
 Steve's Carts 2.0.0.b18
 TF2 Dispenser 1.7.10
 TF2 Teleporter 1.7.10
+Thermal Dynamics 1.1.0-161
+Thermal Expansion 4.0.3B1-218
+Thermal Foundation 1.2.0-102
+Tinkers' Construct 1.8.8
 TreeCapitator 2.0.4
 TubeStuff 59.0.4
+Twilight Forest 2.3.7
 VoxelMap 1.5.17
 Waila 1.5.10

technicpack-resources/permissions-licensing.markup.txt

@@ -20,6 +20,9 @@ By Eydamos - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-
 [u][b]Balkon's WeaponMod[/b][/u]
 By Balkondeur - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1272627-balkons-weaponmod-v1-14
 
+[u][b]bdlib[/b][/u]
+By BDew - http://bdew.net/gendustry/
+
 [u][b]BedrockLayer[/b][/u]
 By Kegare - http://forum.minecraftuser.jp/viewtopic.php?t=13399
 
@@ -42,6 +45,9 @@ Released under the LGPL
 [u][b]CodeChickenCore[/b][/u]
 by ChickenBones - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1279956-chickenbones-mods
 
+[u][b]CoFH Core[/b][/u]
+By Team CoFH - http://teamcofh.com/
+
 [u][b]Compact Solars[/b][/u]
 By progwml6 - http://www.curse.com/mc-mods/minecraft/228759-compact-solars
 
@@ -76,9 +82,15 @@ by Mr_TJP - http://projectredwiki.com/
 [u][b]Forge Relocation FMP Plugin[/b][/u]
 by Mr_TJP - http://projectredwiki.com/
 
-[u][b]Greg;s Lighting[/b][/u]
+[u][b]Gendustry[/b][/u]
+By BDew - http://bdew.net/gendustry/
+
+[u][b]Greg's Lighting[/b][/u]
 by Greg Ewing - http://www.cosc.canterbury.ac.nz/greg.ewing/minecraft/mods/GregsLighting/
 
+[u][b]IC2 Nuclear Control[/b][/u]
+by xbony2 - http://forum.industrial-craft.net/index.php?page=Thread&threadID=10649
+
 [u][b]Immibis Core[/b][/u]
 By Immibis - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1281065-immibiss-mods-now-with-85-7-less-version-numbers
 
@@ -98,9 +110,21 @@ by DevilDead - http://forum.industrial-craft.net/index.php?page=Thread&threadID=
 [u][b]Iron Chests[/b][/u]
 by progwml6 - http://www.curse.com/mc-mods/minecraft/228756-iron-chests
 
+[u][b]Lamps And Traffic Lights[/b][/u]
+By WThieves - http://www.planetminecraft.com/mod/splamps-and-traffic-lights-latlforge/
+
 [u][b]LiteLoader[/b][/u]
 By mumfrey - http://www.liteloader.com/
 
+[u][b]Mantle[/b][/u]
+By the Slime Knights - http://www.curse.com/mc-mods/minecraft/mantle
+
+[u][b]Metallurgy[/b][/u]
+By the Metallurgy Team - http://www.curse.com/mc-mods/minecraft/metallurgy
+
+[u][b]MetallurgyCore[/b][/u]
+By the Metallurgy Team - http://www.curse.com/mc-mods/minecraft/metallurgy-core
+
 [u][b]Mo' Villages[/b][/u]
 by Pigs_FTW - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1294582-mo-villages-more-biomes-more-buildings-adjustable
 
@@ -110,9 +134,15 @@ by MrCrayfish - http://www.minecraftforum.net/forums/mapping-and-modding/minecra
 [u][b]MrTJPCore[/b][/u]
 by Mr_TJP - http://projectredwiki.com/
 
+[u][b]NEI Integration[/b][/u]
+by tonius - http://www.curse.com/mc-mods/minecraft/225251-nei-integration
+
 [u][b]NotEnoughItems[/b][/u]
 by ChickenBones - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1279956-chickenbones-mods
 
+[u][b]OceanCraft[/b][/u]
+by thomassu - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1292144-oceancraft-mod-with-whales-sharks-crabs-and-more-1
+
 [u][b]OpenComputers[/b][/u]
 By Kethtar - http://ocdoc.cil.li/
 Licensed under the MIT License
@@ -124,6 +154,9 @@ by Mr_TJP - http://projectredwiki.com/
 by CovertJaguar - http://railcraft.info/, http://railcraft.info/wiki
 License: http://railcraft.info/wiki/info:license
 
+[u][b]RoadWorks[/b][/u]
+By WThieves - http://www.planetminecraft.com/mod/roadworksforge/
+
 [u][b]Steve's Carts[/b][/u]
 by Vswe/Sir_Advew - http://stevescarts.wikia.com/
 
@@ -133,12 +166,27 @@ by pitman87 - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft
 [u][b]TF2 Teleporter[/b][/u]
 by pitman87 - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1273889-team-fortress-2-teleporter-sentry-dispenser
 
+[u][b]Thermal Dynamics[/b][/u]
+By Team CoFH - http://teamcofh.com/
+
+[u][b]Thermal Expansion[/b][/u]
+By Team CoFH - http://teamcofh.com/
+
+[u][b]Thermal Foundation[/b][/u]
+By Team CoFH - http://teamcofh.com/
+
+[u][b]Tinkers' Construct[/b][/u]
+By boni - http://www.curse.com/mc-mods/minecraft/tinkers-construct
+
 [u][b]TreeCapitator[/b][/u]
 By bspkrs - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1281180-daftpvfs-mods-treecapitator-crystalwing
 
 [u][b]TubeStuff[/b][/u]
 By Immibis - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1281065-immibiss-mods-now-with-85-7-less-version-numbers
 
+[u][b]Twilight Forest[/b][/u]
+By Benimatic - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1276258-the-twilight-forest-v2-3-5-wrecking-block
+
 [u][b]VoxelMap[/b][/u]
 by MamiyaOtaru - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2261180-voxelmap-1-8-1-7-10-1-6-4-a-minimap-and-worldmap