Finishing Version 1.2.2

combak · Mar 14, 2017 · a94a501 · a94a501
1 parent 9ead250
commit a94a501
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,6 +43,7 @@ backup/
 /config/HardcoreEnderExpansion.clientsave.cfg
 /config/INpureProjects/logs/
 /config/cofh/core/friends.cfg
+/config/tabbychat/dictionary.txt
 
 /config/contenttweaker/ContentTweaker-Resourcepack/
 /config/contenttweaker/resourcepack/

diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,16 @@
 # Changelog
 
+# Version 1.2.2
+
+**Config Changes**
+- Change mob events
+- Some lycanite balancing stuff
+
+# Version 1.2.1a
+
+**Mod Additions**
+- TabbyChat 1.11.2.2
+
 # Version 1.2.1 - Thermos Update
 
 **Mod Updates**

diff --git a/Licences.md b/Licences.md
@@ -606,6 +606,13 @@ minecraft original sources.
 
 ## T
 
+**TabbyChat**
+> Creative Commons Attribution-NonCommercial-ShareAlike 3.0
+
+- Author: killjoy1221
+- Files: https://github.com/killjoy1221/tabbychat/releases
+- Licence: https://github.com/killjoy1221/tabbychat/blob/master/README.md
+
 **Team CoFH Mods**
 > CoFH "Don't Be a Jerk" License
 

diff --git a/Versions.md b/Versions.md
@@ -65,7 +65,6 @@
 - minetweaker3-1.7.10-3.0.10-cf534ea-customized.jar
 - mobiuscore-1.7.10-1.2.5.jar
 - modtweaker2-1.7.10-0.9.6.jar
-- MrTJPCore-1.0.8.16-universal.jar
 - neiaddons-1.7.10-1.12.14.40.jar
 - neiintegration-1.7.10-1.1.2.jar
 - netherores-1.7.10-2.3.1-22.jar
@@ -89,6 +88,7 @@
 - spiceoflife-1.7.10-1.3.1.jar
 - storagedrawers-1.7.10-1.10.8.jar
 - storagedrawers-forestry-1.7.10-1.1.2.jar
+- tabbychat-1.7.10-1.11.2.2.jar
 - tconstruct-1.7.10-1.8.8.jar
 - thaumcraft-1.7.10-4.2.3.5.jar
 - thaumcraft-inventoryscan-1.7.10-1.0.11.jar

diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json
@@ -115,7 +115,7 @@
     },
     "version":
     {
-      "text": "Shattered World - Version 1.2.1",
+      "text": "Shattered World - Version 1.2.2",
       "posX" : -200,
       "posY" : -20,
       "color" : -1,

diff --git a/config/IguanaTinkerTweaks/restrictions.cfg b/config/IguanaTinkerTweaks/restrictions.cfg
@@ -19,8 +19,8 @@ toolparts {
 
     # Prevents the creation of listed Material-Tool combinations.
     # The format is <materialname>:<partname>
-    # materialnames are: Platinum, Wood, Electrum, Stone, Iron, Flint, Cactus, Bone, Obsidian, Netherrack, Slime, Paper, Cobalt, Ardite, Manyullyn, Copper, Bronze, Alumite, Steel, BlueSlime, PigIron, Thaumium, String, avaritia_neutronium, avaritia_infinitymetal, unstableIngot, Bedrockium, MagicWood, Invar, Nickel, Lead, Silver
-    # partnames are: scythe, pickaxe, rod, largeguard, sign, shovel, binding, swordblade, fullguard, arrowhead, crossbowlimb, axe, bowlimb, excavator, hammerhead, mediumguard, frypan, crossbar, toughbinding, crossbowbody, broadaxe, chisel, knifeblade, largerod, shuriken, largeplate, largeblade, 
+    # materialnames are: Platinum, Wood, Electrum, Stone, Iron, Flint, Cactus, Bone, Obsidian, Netherrack, Slime, Paper, Cobalt, Ardite, Manyullyn, Copper, Bronze, Alumite, Steel, BlueSlime, PigIron, Thaumium, String, avaritia_neutronium, avaritia_infinitymetal, unstableIngot, Bedrockium, Invar, MagicWood, Nickel, Lead, Silver
+    # partnames are: scythe, pickaxe, rod, largeguard, sign, shovel, swordblade, binding, fullguard, arrowhead, crossbowlimb, axe, bowlimb, excavator, hammerhead, mediumguard, crossbar, frypan, toughbinding, crossbowbody, broadaxe, chisel, knifeblade, largerod, shuriken, largeplate, largeblade, 
     #  [default: ]
     S:restricted <
         Cactus:frypan

diff --git a/config/InvTweaks.cfg b/config/InvTweaks.cfg
@@ -1,6 +1,6 @@
 #Inventory Tweaks Configuration
 #(Regarding shortcuts, all key names can be found at: http://www.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html)
-#Tue Feb 07 19:10:27 CET 2017
+#Tue Mar 14 18:11:57 CET 2017
 enableMiddleClick=true
 showChestButtons=true
 enableSortingOnPickup=false

diff --git a/config/fastcraft.ini b/config/fastcraft.ini
@@ -1,5 +1,5 @@
 ; FastCraft config
-; created 07.02.2017 19:08:37
+; created 14.03.2017 18:10:23
 ;---
 
 ; Settings which have some effect on gameplay or visuals.

diff --git a/config/splash.properties b/config/splash.properties
@@ -1,5 +1,5 @@
 #Splash screen properties
-#Tue Feb 07 19:08:43 CET 2017
+#Tue Mar 14 18:10:28 CET 2017
 logoTexture=textures/gui/title/mojang.png
 background=0xFFFFFF
 font=0x0