Merge branch 'release-0.6'

Makefile

@@ -1,7 +1,7 @@
 # Makefile for Erbosoft Vista modpack
 # EJB 11/17/2015
 
-VERSION=0.6.1
+VERSION=0.6
 FORGEMOD=forge-1.7.10-10.13.4.1558-1.7.10-universal.jar
 FORGEINSTALLER=forge-1.7.10-10.13.4.1558-1.7.10-installer.jar
 

mods-source/server/modlist.txt

@@ -61,5 +61,5 @@ ThermalDynamics-[1.7.10]1.1.0-161.jar|http://www.curse.com/mc-mods/minecraft/227
 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
+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

scripts/verify-mod-downloads

@@ -11,7 +11,6 @@ open MODLIST, "<$dir/modlist.txt" or die "$0: unable to open $dir/modlist.txt";
 my $missing = 0;
 while (<MODLIST>) {
     chomp;
-    next if /^\s*#/;
     ($modjar, $url) = split(/\|/);
     unless (-f "$dir/$modjar") {
 	print "$modjar is missing - download from $url\n";

technicpack-resources/overview.markup.txt

@@ -0,0 +1,74 @@
+[b]Erbosoft Vista Modpack[/b]
+
+The original Erbosoft modpack was designed for Erbo's personal server, running on a 1.6 version of Minecraft.  This server supported play with our godsons.  We updated to version 1.7.2 with the Erbosoft Plus! pack.  This new pack is a rebuild of that pack for 1.7.10, with a few additional mods added and some that were available in the original pack but not in Erbosoft Plus! making a reappearance.  Users of this modpack include Erbo and Phoenix, their godchildren, their godchildren's mother, and members of Phoenix's gaming clan (Iron Rain Elite Squad, or IRES).
+
+[u][b]List of mods in this pack:[/b][/u]
+Forge Universal 10.13.4.1558
+Advanced Machines 59.0.2
+Advanced Repulsion Systems 59.0.3
+Applied Energistics rv2-stable-10
+AsieLib 0.4.4
+Backpacks 2.0.1
+Balkon's WeaponMod 1.14.3
+BedrockLayer 1.0.9
+BiblioCraft 1.11.4
+bspkrsCore 6.16
+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
+ExtraCells 2.2.73b129
+Factorization 0.8.99b
+Food Plus 3.2rS
+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
+PowerConverters 3.2.1
+ProjectRed Base 4.7.0pre9.92
+ProjectRed Compat 4.7.0pre9.92
+ProjectRed Fabrication 4.7.0pre9.92
+ProjectRed Integration 4.7.0pre9.92
+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
+Simply Jetpacks 1.5.2
+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/overview.md

@@ -1,78 +0,0 @@
-**Erbosoft Vista Modpack**
-
-The original Erbosoft modpack was designed for Erbo's personal server, running on a 1.6 version of Minecraft. This
-server supported play with our godsons. We updated to version 1.7.2 with the Erbosoft Plus! pack. This new pack is a
-rebuild of that pack for 1.7.10, with a few additional mods added and some that were available in the original pack
-but not in Erbosoft Plus! making a reappearance. Users of this modpack include Erbo and Phoenix, their godchildren,
-their godchildren's mother, and members of Phoenix's gaming clan (Iron Rain Elite Squad, or IRES).
-
-**List of mods in this pack:**
-
-* Forge Universal 10.13.4.1558
-* Advanced Machines 59.0.2
-* Advanced Repulsion Systems 59.0.3
-* Applied Energistics rv2-stable-10
-* AsieLib 0.4.4
-* Backpacks 2.0.1
-* Balkon's WeaponMod 1.14.3
-* BedrockLayer 1.0.9
-* BiblioCraft 1.11.4
-* bspkrsCore 6.16
-* 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
-* ExtraCells 2.2.73b129
-* Factorization 0.8.99b
-* Food Plus 3.2rS
-* 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
-* PowerConverters 3.2.1
-* ProjectRed Base 4.7.0pre9.92
-* ProjectRed Compat 4.7.0pre9.92
-* ProjectRed Fabrication 4.7.0pre9.92
-* ProjectRed Integration 4.7.0pre9.92
-* 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
-* Simply Jetpacks 1.5.2
-* 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
-* VoxelMap 1.5.17
-* Waila 1.5.10

technicpack-resources/permissions-licensing.markup.txt

@@ -1,199 +1,202 @@
-**Forge Universal**
+[u][b]Forge Universal[/b][/u]
 By the Minecraft Forge team (AbrarSyed, Cpw, LexManos, OvermindDL1, others) - http://www.minecraftforge.net
 
-**Advanced Machines**
+[u][b]Advanced Machines[/b][/u]
 by Immibis - http://forum.industrial-craft.net/index.php?page=Thread&threadID=9335&pageNo=1
 
-**Advanced Repulsion Systems**
+[u][b]Advanced Repulsion Systems[/b][/u]
 by Immibis - http://forum.industrial-craft.net/index.php?page=Thread&postID=65261
 
-**Applied Energistics**
+[u][b]Applied Energistics[/b][/u]
 by AlgorithmX2 - http://ae-mod.info/
 
-**AsieLib**
+[u][b]AsieLib[/b][/u]
 by asie and vexatos - http://wiki.vex.tty.sh/wiki:asielib
 Released under the MIT License
 
-**Backpacks**
+[u][b]Backpacks[/b][/u]
 By Eydamos - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1286124-1-6-x-1-7-x-backpacks-v-2-0-1
 
-**Balkon's WeaponMod**
+[u][b]Balkon's WeaponMod[/b][/u]
 By Balkondeur - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1272627-balkons-weaponmod-v1-14
 
-**bdlib**
+[u][b]bdlib[/b][/u]
 By BDew - http://bdew.net/gendustry/
 
-**BedrockLayer**
+[u][b]BedrockLayer[/b][/u]
 By Kegare - http://forum.minecraftuser.jp/viewtopic.php?t=13399
 
-**BiblioCraft**
+[u][b]BiblioCraft[/b][/u]
 By Joseph D. Sinclair - http://www.bibliocraftmod.com/
 
-**bspkrsCore**
+[u][b]bspkrsCore[/b][/u]
 By bspkrs - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1281180-daftpvfs-mods-treecapitator-crystalwing
 
-**BuildCraft**
+[u][b]BuildCraft[/b][/u]
 by the BuildCraft Team - http://www.mod-buildcraft.com
 
-**BuildCraftCompat**
+[u][b]BuildCraftCompat[/b][/u]
 by the BuildCraft Team - http://www.mod-buildcraft.com
 
-**Carpenter's Blocks**
+[u][b]Carpenter's Blocks[/b][/u]
 by Mineshopper - http://www.carpentersblocks.com/
 Released under the LGPL
 
-**CodeChickenCore**
+[u][b]CodeChickenCore[/b][/u]
 by ChickenBones - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1279956-chickenbones-mods
 
-**CoFH Core**
+[u][b]CoFH Core[/b][/u]
 By Team CoFH - http://teamcofh.com/
 
-**Compact Solars**
+[u][b]Compact Solars[/b][/u]
 By progwml6 - http://www.curse.com/mc-mods/minecraft/228759-compact-solars
 
-**Computronics**
+[u][b]Computronics[/b][/u]
 by asie and vexatos - http://wiki.vex.tty.sh/wiki:computronics
 Released under the terms of the MIT License
 
-**Dimensional Anchors**
+[u][b]Dimensional Anchors[/b][/u]
 By Immibis - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1281065-immibiss-mods-now-with-85-7-less-version-numbers
 
-**ExtraCells**
+[u][b]ExtraCells[/b][/u]
 By DrummerMC - http://www.curse.com/mc-mods/minecraft/229218-extracells2
 
-**Factorization**
+[u][b]Factorization[/b][/u]
 By neptunepink - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1284592-factorization-0-8-99b
 Distributed under the "Post Something Interesting License"
 (((TBD)))
 
-**Food Plus**
+[u][b]Food Plus[/b][/u]
 By JoseTheCrafter - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1288375-food-plus-mod-more-food-than-you-can-imagine-v3
 
-**Forestry**
+[u][b]Forestry[/b][/u]
 By CovertJaguar, MysteriousAges, mezz - http://forestry.sengir.net/
 
-**Forge Multipart**
+[u][b]Forge Multipart[/b][/u]
 By ChickenBones - http://files.minecraftforge.net/ForgeMultipart/
 Licensed under LGPL
 
-**Forge Relocation**
+[u][b]Forge Relocation[/b][/u]
 by Mr_TJP - http://projectredwiki.com/
 
-**Forge Relocation FMP Plugin**
+[u][b]Forge Relocation FMP Plugin[/b][/u]
 by Mr_TJP - http://projectredwiki.com/
 
-**Gendustry**
+[u][b]Gendustry[/b][/u]
 By BDew - http://bdew.net/gendustry/
 
-**Greg's Lighting**
+[u][b]Greg's Lighting[/b][/u]
 by Greg Ewing - http://www.cosc.canterbury.ac.nz/greg.ewing/minecraft/mods/GregsLighting/
 
-**IC2 Nuclear Control**
+[u][b]IC2 Nuclear Control[/b][/u]
 by xbony2 - http://forum.industrial-craft.net/index.php?page=Thread&threadID=10649
 
-**Immibis Core**
+[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
 
-**IndustrialCraft 2**
+[u][b]IndustrialCraft 2[/b][/u]
 By the IC2 Dev Team - http://www.industrial-craft.net/
 
-**In-Game Wiki**
+[u][b]In-Game Wiki[/b][/u]
 By MineMaarten - http://www.minemaarten.com/
 
-**Inventory Tweaks**
+[u][b]Inventory Tweaks[/b][/u]
 By Kobata - https://inventory-tweaks.readthedocs.org/
 Available under the terms of the MIT license
 
-**Iridium Mod**
+[u][b]Iridium Mod[/b][/u]
 by DevilDead - http://forum.industrial-craft.net/index.php?page=Thread&threadID=10700
 
-**Iron Chests**
+[u][b]Iron Chests[/b][/u]
 by progwml6 - http://www.curse.com/mc-mods/minecraft/228756-iron-chests
 
-**Lamps And Traffic Lights**
+[u][b]Lamps And Traffic Lights[/b][/u]
 By WThieves - http://www.planetminecraft.com/mod/splamps-and-traffic-lights-latlforge/
 
-**LiteLoader**
+[u][b]LiteLoader[/b][/u]
 By mumfrey - http://www.liteloader.com/
 
-**Mantle**
+[u][b]Mantle[/b][/u]
 By the Slime Knights - http://www.curse.com/mc-mods/minecraft/mantle
 
-**Metallurgy**
+[u][b]Metallurgy[/b][/u]
 By the Metallurgy Team - http://www.curse.com/mc-mods/minecraft/metallurgy
 
-**MetallurgyCore**
+[u][b]MetallurgyCore[/b][/u]
 By the Metallurgy Team - http://www.curse.com/mc-mods/minecraft/metallurgy-core
 
-**Mo' Villages**
+[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
 
-**MrCrayfish's Furniture Mod**
+[u][b]MrCrayfish's Furniture Mod[/b][/u]
 by MrCrayfish - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1282349-mrcrayfishs-furniture-mod-v3-4-8-the-kitchen
 
-**MrTJPCore**
+[u][b]MrTJPCore[/b][/u]
 by Mr_TJP - http://projectredwiki.com/
 
-**NEI Integration**
+[u][b]NEI Integration[/b][/u]
 by tonius - http://www.curse.com/mc-mods/minecraft/225251-nei-integration
 
-**NotEnoughItems**
+[u][b]NotEnoughItems[/b][/u]
 by ChickenBones - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1279956-chickenbones-mods
 
-**OceanCraft**
+[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
 
-**OpenComputers**
+[u][b]OpenComputers[/b][/u]
 By Kethtar - http://ocdoc.cil.li/
 Licensed under the MIT License
 
-**PowerConverters**
+[u][b]PowerConverters[/b][/u]
 By Portablejim (orig. by Powercrystals and Samrg472) - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1293983-powerconverters-originally-by-powercrystals
 Licensed under the MMPL license
 
-**ProjectRed (all modules)**
+[u][b]ProjectRed (all modules)[/b][/u]
 by Mr_TJP - http://projectredwiki.com/
 
-**RailCraft**
+[u][b]RailCraft[/b][/u]
 by CovertJaguar - http://railcraft.info/, http://railcraft.info/wiki
 License: http://railcraft.info/wiki/info:license
 
-**RoadWorks**
+[u][b]RoadWorks[/b][/u]
 By WThieves - http://www.planetminecraft.com/mod/roadworksforge/
 
-**Simply Jetpacks**
+[u][b]Simply Jetpacks[/b][/u]
 By Tonius - https://github.com/Tonius/SimplyJetpacks
 
-**Steve's Carts**
+[u][b]Steve's Carts[/b][/u]
 by Vswe/Sir_Advew - http://stevescarts.wikia.com/
 
-**TF2 Dispenser**
+[u][b]TF2 Dispenser[/b][/u]
 by pitman87 - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1273889-team-fortress-2-teleporter-sentry-dispenser
 
-**TF2 Teleporter**
+[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
 
-**Thermal Dynamics**
+[u][b]Thermal Dynamics[/b][/u]
 By Team CoFH - http://teamcofh.com/
 
-**Thermal Expansion**
+[u][b]Thermal Expansion[/b][/u]
 By Team CoFH - http://teamcofh.com/
 
-**Thermal Foundation**
+[u][b]Thermal Foundation[/b][/u]
 By Team CoFH - http://teamcofh.com/
 
-**Tinkers' Construct**
+[u][b]Tinkers' Construct[/b][/u]
 By boni - http://www.curse.com/mc-mods/minecraft/tinkers-construct
 
-**TreeCapitator**
+[u][b]TreeCapitator[/b][/u]
 By bspkrs - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1281180-daftpvfs-mods-treecapitator-crystalwing
 
-**TubeStuff**
+[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
 
-**VoxelMap**
+[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
 
-**Waila**
+[u][b]Waila[/b][/u]
 by ProfMobius - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1289765-waila-1-5-7-for-1-7-10-1-6-0-for-1-8-1
 Licensed under the Apache 2.0 license