Merge develop branch to bring master to 0.1

CHANGELOG

@@ -1,3 +1,8 @@
+Version 0.1 - 17-Nov-2015
+- Upgraded Forge to 10.13.4.1558.
+- First server pack built using Forge Universal.
+- Turned off Factorization BlockUndo (makes multiplayer connections unreliable).
+
 Version 0.03 - 9-Nov-2015
 - Factorization: Disable Colossi.
 - Added PowerConverters.

Makefile

@@ -1,8 +1,11 @@
 # Makefile for Erbosoft Vista modpack
-# EJB 11/5/2015
+# EJB 11/17/2015
 
-VERSION=0.03
+VERSION=0.1
-FORGEMOD=forge-1.7.10-10.13.4.1448-1.7.10-universal.jar
+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
+
+all: client-modpack server-pack
 
 client-modpack: verify-mods
 	mkdir -p build/client
@@ -19,6 +22,25 @@ client-modpack: verify-mods
 	-rm -f build/erbosoft-vista-${VERSION}.zip
 	cd build/client; zip -r ../erbosoft-vista-${VERSION}.zip .
 
+server-pack: verify-mods
+	mkdir -p build/server
+	-rm -rf build/server/*
+	cp mods-source/forge/${FORGEINSTALLER} build/server
+	cd build/server; java -jar ./${FORGEINSTALLER} -installServer
+	rm -f build/server/${FORGEINSTALLER}*
+	mkdir build/server/config
+	mkdir build/server/mods
+	cp mods-source/server/*.jar build/server/mods
+	cp -r config-source/* build/server/config
+	sed -e 's/@FORGEJAR@/${FORGEMOD}/' scripts/launch.sh.template > build/server/launch.sh
+	chmod 755 build/server/launch.sh
+	sed -e 's/@FORGEJAR@/${FORGEMOD}/' scripts/launch.bat.template > build/server/launch.bat
+	unix2dos build/server/launch.bat
+	cp scripts/eula.txt.template build/server/eula.txt
+	sed -e 's/@VERSION@/${VERSION}/' scripts/server.properties.template > build/server/server.properties
+	-rm -f build/erbosoft-vista-server-${VERSION}.zip
+	cd build/server; zip -r ../erbosoft-vista-server-${VERSION}.zip .
+
 verify-mods:
 	scripts/verify-mod-downloads mods-source/forge
 	scripts/verify-mod-downloads mods-source/server

config-source/factorization.cfg

@@ -106,10 +106,10 @@ server {
     B:barkRecipes=true
 
     # If true, then recently placed blocks break easily
-    B:blockUndo=true
+    B:blockUndo=false
 
     # If true, then blocks broken with blockundo will be instantly picked up
-    B:blockUndoGrab=true
+    B:blockUndoGrab=false
 
     # If false, water must be piped in
     B:boilersSuckWater=true

mods-source/forge/modlist.txt

@@ -1 +1,2 @@
-forge-1.7.10-10.13.4.1448-1.7.10-universal.jar|http://files.minecraftforge.net/
+forge-1.7.10-10.13.4.1558-1.7.10-installer.jar|http://files.minecraftforge.net/
+forge-1.7.10-10.13.4.1558-1.7.10-universal.jar|http://files.minecraftforge.net/

scripts/eula.txt.template

@@ -0,0 +1,3 @@
+#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
+#Tue Nov 17 17:47:41 MST 2015
+eula=true

scripts/launch.bat.template

@@ -0,0 +1 @@
+java -Xmx2G -XX:MaxPermSize=256m -jar @FORGEJAR@

scripts/launch.sh.template

@@ -0,0 +1,6 @@
+#!/bin/sh
+MEMSZ=2G
+PERMSZ=256m
+FORGEJAR=@FORGEJAR@
+
+exec java -Xmx$MEMSZ -XX:MaxPermSize=$PERMSZ -jar $FORGEJAR

scripts/server.properties.template

@@ -0,0 +1,33 @@
+#Minecraft server properties
+#Tue Nov 17 17:51:25 MST 2015
+generator-settings=
+op-permission-level=4
+allow-nether=true
+level-name=world
+enable-query=false
+allow-flight=false
+announce-player-achievements=true
+server-port=25565
+level-type=DEFAULT
+enable-rcon=false
+level-seed=
+force-gamemode=false
+server-ip=
+max-build-height=256
+spawn-npcs=true
+white-list=false
+spawn-animals=true
+hardcore=false
+snooper-enabled=true
+online-mode=true
+resource-pack=
+pvp=true
+difficulty=1
+enable-command-block=false
+gamemode=0
+player-idle-timeout=0
+max-players=20
+spawn-monsters=true
+generate-structures=true
+view-distance=10
+motd=Erbosoft Vista @VERSION@ Server

technicpack-resources/overview.markup.txt

@@ -3,7 +3,7 @@
 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
+Forge Universal 10.13.4.1558
 Advanced Machines 59.0.2
 Advanced Repulsion Systems 59.0.3
 Applied Energistics rv2-stable-10