Merge pull request #1199 from OxideMod/develop

Update master from develop
OxideMod · Sep 22, 2017 · 7fe5bbd · 7fe5bbd
2 parents f2765e2 + 19c59b8
commit 7fe5bbd
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/Games/Unity/Oxide.Game.TheForest/Dependencies/Assembly-CSharp-firstpass.dll b/Games/Unity/Oxide.Game.TheForest/Dependencies/Assembly-CSharp-firstpass.dll
diff --git a/Games/Unity/Oxide.Game.TheForest/Dependencies/bolt.user.dll b/Games/Unity/Oxide.Game.TheForest/Dependencies/bolt.user.dll
diff --git a/Games/Unity/Oxide.Game.TheForest/Patched/Assembly-CSharp.dll b/Games/Unity/Oxide.Game.TheForest/Patched/Assembly-CSharp.dll
diff --git a/Games/Unity/Oxide.Game.TheForest/Patched/Assembly-UnityScript.dll b/Games/Unity/Oxide.Game.TheForest/Patched/Assembly-UnityScript.dll
diff --git a/Games/Unity/Oxide.Game.TheForest/TheForest.opj b/Games/Unity/Oxide.Game.TheForest/TheForest.opj
@@ -52,7 +52,7 @@
                 "BoltEntity"
               ]
             },
-            "MSILHash": "vN9Bkjrj8eTaGcI/q6ogEx4UT04+Uhwb0lcEwPLq4d8=",
+            "MSILHash": "fXUeIvxsUVVcdFqvIKffkv2rDqMFLIlB2c4blPB+XcQ=",
             "BaseHookName": null,
             "HookCategory": "Player"
           }
@@ -806,7 +806,7 @@
                 "DropItem"
               ]
             },
-            "MSILHash": "C8h9siAqyhYFzPDlqj+OdFBiF7IwzBgQkM1OiBWJnJk=",
+            "MSILHash": "Pwd+C4vv1XOPziOQB/ukWC/rm731iXDS54jyB6+aycA=",
             "BaseHookName": null,
             "HookCategory": "_TESTED"
           }
@@ -832,7 +832,7 @@
                 "SpawnCutTree"
               ]
             },
-            "MSILHash": "XcA8C4yQcDvFOWdYKU/NNm61nab8Hmqz6J46eO566oA=",
+            "MSILHash": "RnAPztgyZWjJCDpsM2zu8FZNZRysFBZNBIfXbwaZpFE=",
             "BaseHookName": null,
             "HookCategory": "_TESTED"
           }
@@ -1170,7 +1170,7 @@
                 "PlayerHitEnemy"
               ]
             },
-            "MSILHash": "3mUGSNmUB+vOSizFh82g92JC30BEl6IrLIIRA2je4wg=",
+            "MSILHash": "upngwoi2IRoq9qlJBzevaA8c88W5r4lxtPN2IpeZe0w=",
             "BaseHookName": null,
             "HookCategory": "_TESTED"
           }
@@ -1653,7 +1653,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "HMOKiUAs1Nq1ivCpM/X9cLr4/K2UPZsHndn1lDf6vsU=",
+            "MSILHash": "coukrSIw7dkSl4KMqjNoBWmHBJrSAV0o1gUDlIcy+IA=",
             "BaseHookName": null,
             "HookCategory": "Server"
           }
@@ -1679,7 +1679,7 @@
                 "BoltEntity"
               ]
             },
-            "MSILHash": "vN9Bkjrj8eTaGcI/q6ogEx4UT04+Uhwb0lcEwPLq4d8=",
+            "MSILHash": "fXUeIvxsUVVcdFqvIKffkv2rDqMFLIlB2c4blPB+XcQ=",
             "BaseHookName": "OnPlayerConnected",
             "HookCategory": "Player"
           }

diff --git a/Games/Unity/Oxide.Game.Unturned/Dependencies/Assembly-CSharp-firstpass.dll b/Games/Unity/Oxide.Game.Unturned/Dependencies/Assembly-CSharp-firstpass.dll
diff --git a/Games/Unity/Oxide.Game.Unturned/Dependencies/UnityEngine.dll b/Games/Unity/Oxide.Game.Unturned/Dependencies/UnityEngine.dll
diff --git a/Games/Unity/Oxide.Game.Unturned/Patched/Assembly-CSharp.dll b/Games/Unity/Oxide.Game.Unturned/Patched/Assembly-CSharp.dll
diff --git a/Games/Unity/Oxide.Game.Unturned/Unturned.opj b/Games/Unity/Oxide.Game.Unturned/Unturned.opj
@@ -121,7 +121,7 @@
                 "System.Int32"
               ]
             },
-            "MSILHash": "v/B5vkGn0YYfocpCIx81shiwI2QI4xWsTR8jw27gSBo=",
+            "MSILHash": "hoWxmh4IRWHyBC1zdLO211rYgXNTqggjuZGsFrHCLy4=",
             "BaseHookName": null,
             "HookCategory": "Server"
           }
@@ -226,7 +226,7 @@
         {
           "Type": "Simple",
           "Hook": {
-            "InjectionIndex": 226,
+            "InjectionIndex": 228,
             "ReturnBehavior": 0,
             "ArgumentBehavior": 4,
             "ArgumentString": "a0",
@@ -252,6 +252,7 @@
                 "System.Byte",
                 "UnityEngine.Color",
                 "UnityEngine.Color",
+                "UnityEngine.Color",
                 "System.Boolean",
                 "System.Int32",
                 "System.Int32",
@@ -266,7 +267,7 @@
                 "Steamworks.CSteamID"
               ]
             },
-            "MSILHash": "CMZskn2CB70+OSf38dpO55ReCaRmQbeujEjOhhvG1dY=",
+            "MSILHash": "FKZLTexBWIRM4rXFbNvgN7pFwV6nFWHpvD23Myei6sQ=",
             "BaseHookName": null,
             "HookCategory": "Player"
           }