Merge pull request #232 from TPPIDev/Development

Merging Release branch with Development

ModVersions.txt

@@ -38,7 +38,7 @@ CustomThings v0.0.2-24
 Damage Indicators v3.2.0
 Dense Ores v1.5
 Dimensional Anchors v59.0.2
-EiraIRC v2.8.148
+EiraIRC v1.7.56
 Electrical Age Beta v1.9-r46
 EnderIO v2.2.8.363
 Ender Storage v1.4.5.27

config/AppliedEnergistics2/AppliedEnergistics2.cfg

@@ -195,7 +195,7 @@ features {
     }
 
     services {
-        B:VersionChecker=true
+        B:VersionChecker=false
     }
 
     misc {

config/EnderStorage.cfg

@@ -2,7 +2,7 @@
 #Deleting any element will restore it to it's default value
 #Block ID's will be automatically generated the first time it's run
 
-checkUpdates=true
+checkUpdates=false
 
 #Set to true to make the vanilla enderchest unplaceable.
 disable-vanilla=false

config/LogisticsPipes.cfg

@@ -8,7 +8,7 @@ general {
     B:OpaquePipes=false
 
     # Should LogisticsPipes check for updates?
-    B:checkForUpdates=true
+    B:checkForUpdates=false
 
     # The maximum number of buildcraft pipes (including forks) between logistics pipes. This is an indicator of the maximum amount of nodes the recursion algorithm will visit before giving up. As it is possible to fork a pipe connection using standard BC pipes the algorithm will attempt to discover all available destinations through that pipe. Do note that the logistics system will not interfere with the operation of non-logistics pipes. So a forked pipe will usually be sup-optimal, but it is possible. A low value might reduce CPU usage, a high value will be able to handle more complex pipe setups. If you never fork your connection between the logistics pipes this has the same meaning as detectionLength and the lower of the two will be used
     I:detectionCount=100

config/MagicBees.cfg

@@ -26,7 +26,7 @@ general {
     I:capsuleStackSize=64
 
     # Set to true to stop ThaumicBees from notifying you when new updates are available. (Does not supress critical updates)
-    B:disableVersionNotification=false
+    B:disableVersionNotification=true
 
     # Set to false if you hate fun and do not want special hives generating in Magic biomes.
     B:doSpecialHiveGen=true

config/Mekanism.cfg

@@ -37,7 +37,7 @@ general {
     I:SaltPerChunk=2
     D:SoundVolume=1.0
     I:TinPerChunk=0
-    B:UpdateNotifications=true
+    B:UpdateNotifications=false
     I:UpgradeModifier=9
     I:VoicePort=36123
     B:VoiceServerEnabled=false

config/NEI/client.cfg

@@ -2,7 +2,7 @@
 #Most of these options can be changed ingame.
 #Deleting any element will restore it to it's default value
 
-checkUpdates=true
+checkUpdates=false
 
 #Change these options if you have a different mod installed on the server that handles the commands differently, Eg. Bukkit Essentials
 command

config/Translocator.cfg

@@ -2,4 +2,4 @@
 #Deleting any element will restore it to it's default value
 #Block ID's will be automatically generated the first time it's run
 
-checkUpdates=true
+checkUpdates=false

config/buildcraft/main.conf

@@ -169,7 +169,7 @@ general {
      >
 
     # set to true for version check on startup
-    B:update.check=true
+    B:update.check=false
     S:version=6.3.6
     S:woodenPipe.item.exclusion <
      >

config/cofh/core/common.cfg

@@ -17,7 +17,7 @@ General {
     B:EnableItemStacking=true
 
     # Set to true to be informed of non-critical updates. You will still receive critical update notifications.
-    B:EnableUpdateNotifications=true
+    B:EnableUpdateNotifications=false
 }
 
 

config/eirairc.cfg

@@ -37,7 +37,7 @@ display {
     S:ircNoticeColor=red
     S:ircOpColor=gold
     S:ircPrivateColor=gray
-    S:ircVoiceColor=blue
+    S:ircVoiceColor=gray
     S:opColor=red
 }
 
@@ -49,10 +49,10 @@ display {
 ##########################################################################################################
 
 global {
-    S:charset=UTF-8
+    S:charset="UTF-8"
     B:debugMode=false
     B:hideNotices=false
-    S:nick=%USERNAME%
+    S:nick="%USERNAME%"
     B:registerShortCommands=true
     B:saveCredentials=true
 }
@@ -101,8 +101,8 @@ serveronly {
         darkgray
      >
     B:enableAliases=false
-    S:nickPrefix=
-    S:nickSuffix=
+    S:nickPrefix=""
+    S:nickSuffix=""
 }
 
 
@@ -113,6 +113,36 @@ serveronly {
 ##########################################################################################################
 
 servers {
+
+    server0 {
+        B:autoConnect=true
+        S:botProfile=""
+        S:description="In-game chat for Test Pack Please Ignore"
+        S:emoteColor=""
+        S:host="irc.esper.net"
+        S:ident="TPPI-IRC"
+        S:ircColor=""
+        S:nick=""
+        S:nickServName=""
+        S:nickServPassword=""
+        S:quitMessage=""
+        B:secureConnection=false
+        S:serverPassword=""
+
+        channels {
+
+            channel0 {
+                B:autoJoin=true
+                B:autoWho=false
+                S:botProfile=""
+                S:name="#PlayTPPI"
+                S:password=""
+            }
+
+        }
+
+    }
+
 }
 
 

config/eirairc/bots/default_client.cfg

@@ -16,11 +16,15 @@ settings {
     B:allowPrivateMessages=true
     B:autoWho=false
     S:displayFormat=S-Light
+    B:enableLinkFilter=false
     B:isDefaultProfile=true
     B:muted=false
     S:name=Client
     B:readOnly=false
+    B:relayBroadcasts=false
+    B:relayDeathMessages=false
     B:relayIRCJoinLeave=true
+    B:relayMinecraftJoinLeave=false
     B:relayNickChanges=true
 }
 

config/eirairc/bots/default_server.cfg

@@ -15,6 +15,7 @@ settings {
     B:allowPrivateMessages=false
     B:autoWho=true
     S:displayFormat=S-Light
+    B:enableLinkFilter=false
     B:isDefaultProfile=true
     B:muted=false
     S:name=Server

config/eirairc/bots/default_twitch.cfg

@@ -16,11 +16,15 @@ settings {
     B:allowPrivateMessages=false
     B:autoWho=false
     S:displayFormat=Twitch
+    B:enableLinkFilter=false
     B:isDefaultProfile=true
     B:muted=false
     S:name=Twitch
     B:readOnly=false
+    B:relayBroadcasts=false
+    B:relayDeathMessages=false
     B:relayIRCJoinLeave=false
+    B:relayMinecraftJoinLeave=false
     B:relayNickChanges=false
 }
 

config/enderio/PoweredSpawnerConfig_User.json

@@ -4,8 +4,8 @@
   "costMultiplier": {
   },
 
-  "_comment": "Adding a blackList section will complete replace the one in the core file"
+  "_comment": "Adding a blackList section will complete replace the one in the core file",
   "blackList": [
     "VillagerGolem"
   ]
-}
+}

config/iChunUtil.cfg

@@ -15,7 +15,7 @@ versioncheck {
     # 
     # Min: 0
     # Max: 3
-    I:versionNotificationFrequency=0
+    I:versionNotificationFrequency=3
 
     # How will the CLIENT be notified of updates? (Servers will always have the update printed to the console. Singleplayer is yourself joining a self hosted server)
     # 0 = Notify of updates regardless of player status (op or not).

config/modpackTweaks/BookText.txt

@@ -22,8 +22,8 @@ Now I am after a blank line
 ****************************************************************************
 Greetings everyone, and welcome to...~
 ~
- �oTest Pack~
-        Please Ignore�r!~
+ §oTest Pack~
+        Please Ignore§r!~
 ~
 We are very excited to finally be releasing the pack to the public.~
 ~
@@ -33,20 +33,20 @@ Thank you all so very much for making TPPI possible!
 ~~~
 So, your first question probably is,~
 ~
-  "�oWhat is this book?�r"~
+  "§oWhat is this book?§r"~
 ~
 Well, this book you're reading is added by our own custom mod,~
 ~
 ~
-   �4M�co�6d�2p�1a�5c�4k �cT�6w�2e�1a�5k�4s�c!�r
+   §4M§co§6d§2p§1a§5c§4k §cT§6w§2e§1a§5k§4s§c!§r
 ~~~
-�4M�co�6d�2p�1a�5c�4k �cT�6w�2e�1a�5k�4s�0 is what allows us to give you the book you are currently reading, as well as many other useful features.~
+§4M§co§6d§2p§1a§5c§4k §cT§6w§2e§1a§5k§4s§0 is what allows us to give you the book you are currently reading, as well as many other useful features.~
 ~
 Should you want a new copy of this book, there is a recipe in NEI.~
 ~~~
-�4T�cP�6P�2I �1T�5w�4e�ca�6k�2s�0 is another custom mod we use, which helps us customize recipes and add other compatability between mods.~
+§4T§cP§6P§2I §1T§5w§4e§ca§6k§2s§0 is another custom mod we use, which helps us customize recipes and add other compatability between mods.~
 ~
-Using both configs and �4T�cP�6P�2I �1T�5w�4e�ca�6k�2s�0 allows us to heavily configure this pack to our liking.
+Using both configs and §4T§cP§6P§2I §1T§5w§4e§ca§6k§2s§0 allows us to heavily configure this pack to our liking.
 ~~~
 The changes that have been made are not to make the game harder, but to extend the life of a single world.~
 ~
@@ -56,27 +56,27 @@ To see a full list of tweaked recipes, type "Tweaked" in NEI.~
 ~
 To see the remaining list of things that are tweaked (not recipes), you can find that at the end of this book.~
 ~~~
-Another feature of �4M�co�6d�2p�1a�5c�4k �cT�6w�2e�1a�5k�4s�0 is the in-game commands it adds.~
+Another feature of §4M§co§6d§2p§1a§5c§4k §cT§6w§2e§1a§5k§4s§0 is the in-game commands it adds.~
 ~
-The changelog can be found by typing �l/tppi changelog�r, which will of course always be up to date, no need to ever get a new copy.~
+The changelog can be found by typing §l/tppi changelog§r, which will of course always be up to date, no need to ever get a new copy.~
 ~
 There is also a system in place to receieve ingame documentation for most mods in the pack.~
 ~
-Type �l/tppi guide�r to receive an all-around guide to the mods in the pack, the easiest way to obtain any info you wish.~
+Type §l/tppi guide§r to receive an all-around guide to the mods in the pack, the easiest way to obtain any info you wish.~
 ~~~
-Type �l/tppi mods <modname>�r to get an individual book for a mod, or to get a link if the mod has not had in-game documentation written for it yet.~
+Type §l/tppi mods <modname>§r to get an individual book for a mod, or to get a link if the mod has not had in-game documentation written for it yet.~
 ~
-�l/tppi mods list�r will give you a list of all mods that are possible to be used in the command.
+§l/tppi mods list§r will give you a list of all mods that are possible to be used in the command.
 ~~~
 Naturally, this is a big job, and it's not yet finished, but we're getting close!~
 ~
 Our community is already getting involved in documenting these mods via our mod's system.~
 ~~~
-If you'd like to help out with this documentation project or any other parts of TPPI's development, feel free to type the command �l/getInvolved�r to learn more.
+If you'd like to help out with this documentation project or any other parts of TPPI's development, feel free to type the command §l/getInvolved§r to learn more.
 ~~~
 Lastly, TPPI uses a very heavily modified ore generation system.~
 ~
-To check it out, type �l/ores�r for an ore generation guide book.
+To check it out, type §l/ores§r for an ore generation guide book.
 ~~~
 ~
      That's about it.~
@@ -90,7 +90,7 @@ To check it out, type 
 ~
 ~
 ~
-  - �o"The Developers"
+  - §o"The Developers"
 ~~~
 TWEAKED ITEMS~
 ~

config/modpackTweaks/modpackTweaks.cfg

@@ -77,13 +77,13 @@ item {
 
 "pack info" {
     # The acronym of the modpack
-    S:packAcronym=TPPI
+    S:packAcronym=TPPI2
 
     # The full name of the modpack
     S:packName=TestPackPleaseIgnore
 
     # The version of the modpack
-    S:packVersion=2.0.0-alpha
+    S:packVersion=Beta 0.1.0
 }
 
 

config/railcraft/railcraft.cfg

@@ -114,7 +114,7 @@ general {
     # 
     # change to 'check.version.online=false' to disable latest version checking
     # 
-    B:check.version.online=true
+    B:check.version.online=false
 
     # 
     # change to 'play.sounds=false' to prevent all mod sounds from playing