From 590a84d3731bcb8cc4b7ea57f1a5d2b6762ce385 Mon Sep 17 00:00:00 2001
From: "Eric J. Bowersox" <erbo@erbosoft.com>
Date: Mon, 9 Nov 2015 23:27:29 -0700
Subject: [PATCH] Added 3 new mods, configuration tweaks, housekeeping

- Added the PowerConverters, Simply Jetpacks, and SmallBoats mods.
- Added configuration tweaks for Factorization, MrTJPCore, and Mr. Crayfish's
  Furniture Mod.
- Filled in the description in README.md and overview.markup.txt.
- Added CHANGELOG, LICENSE.md, and CODE-OF-CONDUCT.md.
---
 CHANGELOG                                     |  20 ++
 CODE-OF-CONDUCT.md                            |  34 +++
 LICENSE.md                                    |  30 ++
 Makefile                                      |   2 +-
 README.md                                     |  13 +
 config-source/MrTJPCore.cfg                   |  20 ++
 config-source/cfm.cfg                         | 270 ++++++++++++++++++
 config-source/factorization.cfg               |   2 +-
 mods-source/server/modlist.txt                |   3 +
 technicpack-resources/overview.markup.txt     |   7 +-
 .../permissions-licensing.markup.txt          |  10 +
 11 files changed, 408 insertions(+), 3 deletions(-)
 create mode 100644 CHANGELOG
 create mode 100644 CODE-OF-CONDUCT.md
 create mode 100644 LICENSE.md
 create mode 100644 config-source/MrTJPCore.cfg
 create mode 100644 config-source/cfm.cfg

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..e286fd0
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,20 @@
+Version 0.03
+- Factorization: Disable Colossi.
+- Added PowerConverters.
+- Added Simply Jetpacks.
+- Added SmallBoats.
+- MrTJPCore: Disable update checks.
+- Mr. Crayfish's Furniture Mod: Disable welcome message.
+- Finally wrote some better explanatory text.
+
+Version 0.02 - 6-Nov-2015
+- Added Thermal Expansion mod family.
+- Added Tinkers' Construct.
+- Added Metallurgy 4.
+- Added Oceancraft.
+- Added Twilight Forest.
+- Added RoadWorks.
+- Added Lamps and Traffic Lights.
+
+Version 0.01 - 5-Nov-2015
+- Initial build of modpack, functionality equivalent to Erbosoft Plus! 0.14.
diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md
new file mode 100644
index 0000000..5ee0548
--- /dev/null
+++ b/CODE-OF-CONDUCT.md
@@ -0,0 +1,34 @@
+# Code of Conduct for Erbosoft Projects
+
+(Adapted from [this Quora blog post](https://www.quora.com/profile/Eric-Bowersox/Semi-Coherent-Mutterings/GitHub-Madness) )
+
+The *one and only* criterion that will be used to determine whether a
+contribution to this project will be accepted is *the quality of the
+contribution and how well it solves the problem it was contributed to solve.*
+**Period.**
+
+I do not give *one milli-micro-nano-fraction of a* **fuck** what race you are,
+what gender you are or identify as, who you want to sleep with, how old you
+are, what your height or weight is, what if anything may be different about
+your body or brain, what language you speak, what country you're from, what
+God you pray to, where you work, how much money you have, et fucking cetera.
+Is your contribution any *good?* That's all that matters.
+
+There is one exception to the above rule: *If you're an asshole, you're*
+**banned** *from the project.* **Permanently.**
+
+If your contribution is not accepted, and you start *whining* about how it's
+"actually" because you're of some-or-other
+gender/race/religion/nationality/whatthefuckever, you are attempting to have
+the deck stacked in your favor because you're "special." That makes you an
+*asshole.* And you're *gone.*
+
+This project explicitly *rejects* the "Open Code of Conduct" as published by
+the TODO Group, and any similar "codes of conduct" that may be promulgated.
+Anyone complaining about this is an *asshole,* because *who the fuck are you*
+to tell *me* how *I* should run *my* goddamn project?  And you're *gone.*
+
+I reserve the right to change this as I see fit...but anyone who tries to
+*force* me to change it in ways that are *offensive to me* is an *asshole.*
+And they're *gone.*
+
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..7eb8ab9
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,30 @@
+# License for Erbosoft Vista Modpack Files
+
+Copyright (c) 2015 Eric J. Bowersox/Erbosoft
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The above license does *not* apply to any Minecraft mod JAR files, which are
+not included in this modpack source distribution.  Those JAR files may *only*
+be distributed in accordance with their respective licenses.  See the
+permissions and licensing listing file in the "technicpack-resources"
+subdirectory for more details.
diff --git a/Makefile b/Makefile
index 94b832d..eed1d07 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for Erbosoft Vista modpack
 # EJB 11/5/2015
 
-VERSION=0.02
+VERSION=0.03
 FORGEMOD=forge-1.7.10-10.13.4.1448-1.7.10-universal.jar
 
 client-modpack: verify-mods
diff --git a/README.md b/README.md
index abb4508..b818512 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,14 @@
 # Erbosoft Vista Mod Pack for Minecraft 1.7.10
+
+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).
+
+The source distribution *does not* include any of the mod JAR files themselves!
+Attempting to build the modpack will give you messages indicating where the
+mods may be downloaded and added to the appropriate mod-source subdirectory.
diff --git a/config-source/MrTJPCore.cfg b/config-source/MrTJPCore.cfg
new file mode 100644
index 0000000..a6cd88e
--- /dev/null
+++ b/config-source/MrTJPCore.cfg
@@ -0,0 +1,20 @@
+# Configuration file
+
+general {
+    # Flag to set if the update checker should consider unstable builds as a new version.
+    B:check_unstable=false
+
+    # Flag to enable or disable the update checker.
+    B:check_versions=false
+}
+
+
+"world gen" {
+    # Toggle to enable retrogeneration, a feature that would allow ores to be generated after the world has been created.
+    B:retro_gen=true
+
+    # The database ID that is used to store which chunks have been generated already. Changing this will cause generation to run again on the same chunk.
+    S:retro_gen_id=mrtjp_gen
+}
+
+
diff --git a/config-source/cfm.cfg b/config-source/cfm.cfg
new file mode 100644
index 0000000..b3f255b
--- /dev/null
+++ b/config-source/cfm.cfg
@@ -0,0 +1,270 @@
+# Configuration file
+
+##########################################################################################################
+# recipe-api
+#--------------------------------------------------------------------------------------------------------#
+# RecipeAPI Configuration. How to use: http://mrcrayfishs-furniture-mod.wikia.com/wiki/Configuration
+##########################################################################################################
+
+recipe-api {
+    # Insert custom recipes here [default: ]
+    S:custom-recipes <
+     >
+}
+
+
+##########################################################################################################
+# recipe-settings
+#--------------------------------------------------------------------------------------------------------#
+# Enabled or disable the default recipes
+##########################################################################################################
+
+recipe-settings {
+    # Fruit Crush [default: true]
+    B:blender-1=true
+
+    # Veggie Juice [default: true]
+    B:blender-2=true
+
+    # Fishy Blend [default: true]
+    B:blender-3=true
+
+    # Energy Drink [default: true]
+    B:blender-4=true
+
+    # Bread -> 6 Bread Slices [default: true]
+    B:chopping-board-1=true
+
+    # Bow [default: true]
+    B:dishwasher-1=true
+
+    # Stone Hoe [default: true]
+    B:dishwasher-10=true
+
+    # Stone Sword [default: true]
+    B:dishwasher-11=true
+
+    # Iron Pickaxe [default: true]
+    B:dishwasher-12=true
+
+    # Iron Axe [default: true]
+    B:dishwasher-13=true
+
+    # Iron Shovel [default: true]
+    B:dishwasher-14=true
+
+    # Iron Hoe [default: true]
+    B:dishwasher-15=true
+
+    # Iron Sword [default: true]
+    B:dishwasher-16=true
+
+    # Golden Pickaxe [default: true]
+    B:dishwasher-17=true
+
+    # Golden Axe [default: true]
+    B:dishwasher-18=true
+
+    # Golden Shovel [default: true]
+    B:dishwasher-19=true
+
+    # Wooden Pickaxe [default: true]
+    B:dishwasher-2=true
+
+    # Golden Hoe [default: true]
+    B:dishwasher-20=true
+
+    # Golden Sword [default: true]
+    B:dishwasher-21=true
+
+    # Diamond Pickaxe [default: true]
+    B:dishwasher-22=true
+
+    # Diamond Axe [default: true]
+    B:dishwasher-23=true
+
+    # Diamond Shovel [default: true]
+    B:dishwasher-24=true
+
+    # Diamond Hoe [default: true]
+    B:dishwasher-25=true
+
+    # Diamond Sword [default: true]
+    B:dishwasher-26=true
+
+    # Wooden Axe [default: true]
+    B:dishwasher-3=true
+
+    # Wooden Shovel [default: true]
+    B:dishwasher-4=true
+
+    # Wooden Hoe [default: true]
+    B:dishwasher-5=true
+
+    # Wooden Sword [default: true]
+    B:dishwasher-6=true
+
+    # Stone Pickaxe [default: true]
+    B:dishwasher-7=true
+
+    # Stone Axe [default: true]
+    B:dishwasher-8=true
+
+    # Stone Shovel [default: true]
+    B:dishwasher-9=true
+
+    # Water Bucket -> Ice [default: true]
+    B:freezer-1=true
+
+    # Ice -> Packet Ice [default: true]
+    B:freezer-2=true
+
+    # Lava Bucket -> Obsidian [default: true]
+    B:freezer-3=true
+
+    # Slime Ball -> Snow Ball [default: true]
+    B:freezer-4=true
+
+    # Poinsonous Potato -> Potato [default: true]
+    B:freezer-5=true
+
+    # Rotten Flesh -> Flesh [default: true]
+    B:freezer-6=true
+
+    # Beef -> Cooked Beef [default: true]
+    B:microwave-1=true
+
+    # Potato -> Baked Potato [default: true]
+    B:microwave-2=true
+
+    # 16 Hardened Clay for 1 Emerald [default: true]
+    B:minebay-1=true
+
+    # 1 Recipe Book for 1 Emerald [default: true]
+    B:minebay-10=true
+
+    # 1 Skeleton Skull for 8 Emeralds [default: true]
+    B:minebay-2=true
+
+    # 1 Saddle for 4 Emeralds [default: true]
+    B:minebay-3=true
+
+    # 1 Horse Spawn Egg for 8 Emeralds [default: true]
+    B:minebay-4=true
+
+    # 1 Diamond Horse Armour for 8 Diamonds [default: true]
+    B:minebay-5=true
+
+    # 1 Experience Bottle for 1 Iron Ingot [default: true]
+    B:minebay-6=true
+
+    # 4 Christmas Firework for 1 Iron Ingot [default: true]
+    B:minebay-7=true
+
+    # 1 Silk Touch Book for 8 Emeralds [default: true]
+    B:minebay-8=true
+
+    # 2 Night Vision Potion for 1 Emerald [default: true]
+    B:minebay-9=true
+
+    # Beef -> Cooked Beef [default: true]
+    B:oven-1=true
+
+    # Porkchop -> Cooked Porkchop [default: true]
+    B:oven-2=true
+
+    # Potato -> Cooked Potato [default: true]
+    B:oven-3=true
+
+    # Chicken -> Cooked Chicken [default: true]
+    B:oven-4=true
+
+    # Raw Fish -> Cooked Fish [default: true]
+    B:oven-5=true
+
+    # Raw Salmon -> Cooked Salmon [default: true]
+    B:oven-6=true
+
+    # Flesh -> Cooked Flesh [default: true]
+    B:oven-7=true
+
+    # Enchanted Book [default: true]
+    B:printer-1=true
+
+    # Written Book [default: true]
+    B:printer-2=true
+
+    # Bread Slice -> Toast [default: true]
+    B:toast-2=true
+
+    # Leather Helmet [default: true]
+    B:washing-machine-1=true
+
+    # Iron Chestplate [default: true]
+    B:washing-machine-10=true
+
+    # Iron Leggings [default: true]
+    B:washing-machine-11=true
+
+    # Iron Boots [default: true]
+    B:washing-machine-12=true
+
+    # Golden Helmet [default: true]
+    B:washing-machine-13=true
+
+    # Golden Chestplate [default: true]
+    B:washing-machine-14=true
+
+    # Golden Leggings [default: true]
+    B:washing-machine-15=true
+
+    # Golden Boots [default: true]
+    B:washing-machine-16=true
+
+    # Diamond Helmet [default: true]
+    B:washing-machine-17=true
+
+    # Diamond Chestplate [default: true]
+    B:washing-machine-18=true
+
+    # Diamond Leggings [default: true]
+    B:washing-machine-19=true
+
+    # Leather Chestplate [default: true]
+    B:washing-machine-2=true
+
+    # Diamond Boots [default: true]
+    B:washing-machine-20=true
+
+    # Leather Leggings [default: true]
+    B:washing-machine-3=true
+
+    # Leather Boots [default: true]
+    B:washing-machine-4=true
+
+    # Chainmail Helmet [default: true]
+    B:washing-machine-5=true
+
+    # Chainmail Chestplate [default: true]
+    B:washing-machine-6=true
+
+    # Chainmail Leggings [default: true]
+    B:washing-machine-7=true
+
+    # Chainmail Boots [default: true]
+    B:washing-machine-8=true
+
+    # Iron Helmet [default: true]
+    B:washing-machine-9=true
+}
+
+
+settings {
+    # Enabled or disable the welcome message [default: true]
+    B:display=false
+
+    # If true, prints out information about RecipeAPI. Recommended 'true' for people trying to add custom recipe. [default: true]
+    B:recipe-api-debug=true
+}
+
+
diff --git a/config-source/factorization.cfg b/config-source/factorization.cfg
index 4743580..80da3cb 100644
--- a/config-source/factorization.cfg
+++ b/config-source/factorization.cfg
@@ -77,7 +77,7 @@ general {
     I:entityRelightTask=3
 
     # If true, Colossi will generate in the world. If false, the player will be given an LMP instead of a lost map.
-    B:generateColossi=true
+    B:generateColossi=false
 
     # Set to false to disable dark iron ore generation
     B:generateDarkIronOre=true
diff --git a/mods-source/server/modlist.txt b/mods-source/server/modlist.txt
index ec3b391..9d23fbc 100644
--- a/mods-source/server/modlist.txt
+++ b/mods-source/server/modlist.txt
@@ -42,6 +42,7 @@ NEIIntegration-MC1.7.10-1.0.13.jar|http://www.curse.com/mc-mods/minecraft/225251
 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
+PowerConverters-1.7.10_3.2.1.jar|http://minecraft.curseforge.com/projects/powerconverters-portablejims-fork
 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
 ProjectRed-1.7.10-4.7.0pre9.92-Fabrication.jar|http://www.curse.com/mc-mods/minecraft/230111-project-red-fabrication
@@ -51,6 +52,8 @@ ProjectRed-1.7.10-4.7.0pre9.92-Mechanical.jar|http://www.curse.com/mc-mods/minec
 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/
+SimplyJetpacks-MC1.7.10-1.5.2.jar|http://www.curse.com/mc-mods/minecraft/simply-jetpacks
+smallboats-1.7.10-10.13.0-16.1.jar|http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/1442761-wip-small-boats-elegant-punt-whitehall
 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
diff --git a/technicpack-resources/overview.markup.txt b/technicpack-resources/overview.markup.txt
index ee8240d..2a6f720 100644
--- a/technicpack-resources/overview.markup.txt
+++ b/technicpack-resources/overview.markup.txt
@@ -1,4 +1,6 @@
-Explanatory text here.
+[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.1448
@@ -47,6 +49,7 @@ 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
@@ -56,6 +59,8 @@ 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
+SmallBoats 16.1
 Steve's Carts 2.0.0.b18
 TF2 Dispenser 1.7.10
 TF2 Teleporter 1.7.10
diff --git a/technicpack-resources/permissions-licensing.markup.txt b/technicpack-resources/permissions-licensing.markup.txt
index 8f85522..47b06c0 100644
--- a/technicpack-resources/permissions-licensing.markup.txt
+++ b/technicpack-resources/permissions-licensing.markup.txt
@@ -147,6 +147,10 @@ by thomassu - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft
 By Kethtar - http://ocdoc.cil.li/
 Licensed under the MIT License
 
+[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
+
 [u][b]ProjectRed (all modules)[/b][/u]
 by Mr_TJP - http://projectredwiki.com/
 
@@ -157,6 +161,12 @@ License: http://railcraft.info/wiki/info:license
 [u][b]RoadWorks[/b][/u]
 By WThieves - http://www.planetminecraft.com/mod/roadworksforge/
 
+[u][b]Simply Jetpacks[/b][/u]
+By Tonius - https://github.com/Tonius/SimplyJetpacks
+
+[u][b]SmallBoats[/b][/u]
+By Awger - http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/1442761-wip-small-boats-elegant-punt-whitehall
+
 [u][b]Steve's Carts[/b][/u]
 by Vswe/Sir_Advew - http://stevescarts.wikia.com/