AmongUsMods/Reactor
1
0 Fork 0
mirror of https://github.com/NuclearPowered/Reactor.git synced 2026-10-19 15:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 2021.11.9

Browse Source 
# Conflicts:
#	AmongUs.props
#	Reactor.Debugger/packages.lock.json
#	Reactor.Example/packages.lock.json
#	Reactor/packages.lock.json
This commit is contained in:
js6pak committed 2021-11-20 01:20:39 +01:00
2 parents d9e5e7f1a9 d92447a490
commit 8e8beaf30c
5 files changed
+31 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AmongUs.props
+1 -1
View File
@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BepInEx.IL2CPP" Version="6.0.0-be.515" /> <PackageReference Include="BepInEx.IL2CPP" Version="6.0.0-be.521" />
<PackageReference Include="AmongUs.GameLibs.$(GamePlatform)" Version="$(GameVersion)" PrivateAssets="all" /> <PackageReference Include="AmongUs.GameLibs.$(GamePlatform)" Version="$(GameVersion)" PrivateAssets="all" />
<PackageReference Include="BepInEx.AutoPlugin" Version="1.0.1" PrivateAssets="all" /> <PackageReference Include="BepInEx.AutoPlugin" Version="1.0.1" PrivateAssets="all" />
Reactor.Debugger/packages.lock.json
+7 -7
View File
@@ -16,11 +16,11 @@
}, },
"BepInEx.IL2CPP": { "BepInEx.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.515, )", "requested": "[6.0.0-be.521, )",
"resolved": "6.0.0-be.515", "resolved": "6.0.0-be.521",
"contentHash": "T4PAFl5wB/UsoVafc2rrbzJyUDMjdgCdeC1f/M3fB1vJKJY9UF67XTSgI3qo3AvQMR3x+4n+MuEXWwTo5Urnlw==", "contentHash": "nzXG/X9u4Ane4KvzaTTon9iP2o3zBkPierrkefaq9tmmQ91FzXFtmFGkVZpD6hGqGjd+KRIn0c6my58+e0u+gw==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.515", "BepInEx.Core": "6.0.0-be.521",
"BepInEx.Il2Cpp.TlsAdapter": "1.0.1", "BepInEx.Il2Cpp.TlsAdapter": "1.0.1",
"HarmonyX": "2.5.7", "HarmonyX": "2.5.7",
"Iced": "1.15.0", "Iced": "1.15.0",
@@ -40,8 +40,8 @@
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.515", "resolved": "6.0.0-be.521",
"contentHash": "VyWAWja6n8KcJRsLmY2Qp4IYddBOtwgnlnuwM4kYy8XLV6et45ua64RjWWb2vcVIWZvrXjeCwwxW2rb8lJKLMQ==", "contentHash": "O1UmrldEd72/0//LIdop26QuWwToNP3lXURfORKZGZv1Kp5nU03jS/hXIXEgDSzxRZJt5j+ffay7x+5eedXMbg==",
"dependencies": { "dependencies": {
"HarmonyX": "2.5.7", "HarmonyX": "2.5.7",
"MonoMod.Utils": "21.10.10.1", "MonoMod.Utils": "21.10.10.1",
@@ -472,7 +472,7 @@
"reactor": { "reactor": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"BepInEx.IL2CPP": "6.0.0-be.515" "BepInEx.IL2CPP": "6.0.0-be.521"
} }
} }
} }
Reactor.Example/packages.lock.json
+7 -7
View File
@@ -16,11 +16,11 @@
}, },
"BepInEx.IL2CPP": { "BepInEx.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.515, )", "requested": "[6.0.0-be.521, )",
"resolved": "6.0.0-be.515", "resolved": "6.0.0-be.521",
"contentHash": "T4PAFl5wB/UsoVafc2rrbzJyUDMjdgCdeC1f/M3fB1vJKJY9UF67XTSgI3qo3AvQMR3x+4n+MuEXWwTo5Urnlw==", "contentHash": "nzXG/X9u4Ane4KvzaTTon9iP2o3zBkPierrkefaq9tmmQ91FzXFtmFGkVZpD6hGqGjd+KRIn0c6my58+e0u+gw==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.515", "BepInEx.Core": "6.0.0-be.521",
"BepInEx.Il2Cpp.TlsAdapter": "1.0.1", "BepInEx.Il2Cpp.TlsAdapter": "1.0.1",
"HarmonyX": "2.5.7", "HarmonyX": "2.5.7",
"Iced": "1.15.0", "Iced": "1.15.0",
@@ -40,8 +40,8 @@
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.515", "resolved": "6.0.0-be.521",
"contentHash": "VyWAWja6n8KcJRsLmY2Qp4IYddBOtwgnlnuwM4kYy8XLV6et45ua64RjWWb2vcVIWZvrXjeCwwxW2rb8lJKLMQ==", "contentHash": "O1UmrldEd72/0//LIdop26QuWwToNP3lXURfORKZGZv1Kp5nU03jS/hXIXEgDSzxRZJt5j+ffay7x+5eedXMbg==",
"dependencies": { "dependencies": {
"HarmonyX": "2.5.7", "HarmonyX": "2.5.7",
"MonoMod.Utils": "21.10.10.1", "MonoMod.Utils": "21.10.10.1",
@@ -472,7 +472,7 @@
"reactor": { "reactor": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"BepInEx.IL2CPP": "6.0.0-be.515" "BepInEx.IL2CPP": "6.0.0-be.521"
} }
} }
} }
Reactor/Reactor.csproj
+1 -1
View File
@@ -24,7 +24,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
Reactor/packages.lock.json
+15 -15
View File
@@ -16,11 +16,11 @@
}, },
"BepInEx.IL2CPP": { "BepInEx.IL2CPP": {
"type": "Direct", "type": "Direct",
"requested": "[6.0.0-be.515, )", "requested": "[6.0.0-be.521, )",
"resolved": "6.0.0-be.515", "resolved": "6.0.0-be.521",
"contentHash": "T4PAFl5wB/UsoVafc2rrbzJyUDMjdgCdeC1f/M3fB1vJKJY9UF67XTSgI3qo3AvQMR3x+4n+MuEXWwTo5Urnlw==", "contentHash": "nzXG/X9u4Ane4KvzaTTon9iP2o3zBkPierrkefaq9tmmQ91FzXFtmFGkVZpD6hGqGjd+KRIn0c6my58+e0u+gw==",
"dependencies": { "dependencies": {
"BepInEx.Core": "6.0.0-be.515", "BepInEx.Core": "6.0.0-be.521",
"BepInEx.Il2Cpp.TlsAdapter": "1.0.1", "BepInEx.Il2Cpp.TlsAdapter": "1.0.1",
"HarmonyX": "2.5.7", "HarmonyX": "2.5.7",
"Iced": "1.15.0", "Iced": "1.15.0",
@@ -40,18 +40,18 @@
}, },
"Microsoft.SourceLink.GitHub": { "Microsoft.SourceLink.GitHub": {
"type": "Direct", "type": "Direct",
"requested": "[1.0.0, )", "requested": "[1.1.1, )",
"resolved": "1.0.0", "resolved": "1.1.1",
"contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
"dependencies": { "dependencies": {
"Microsoft.Build.Tasks.Git": "1.0.0", "Microsoft.Build.Tasks.Git": "1.1.1",
"Microsoft.SourceLink.Common": "1.0.0" "Microsoft.SourceLink.Common": "1.1.1"
} }
}, },
"BepInEx.Core": { "BepInEx.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0-be.515", "resolved": "6.0.0-be.521",
"contentHash": "VyWAWja6n8KcJRsLmY2Qp4IYddBOtwgnlnuwM4kYy8XLV6et45ua64RjWWb2vcVIWZvrXjeCwwxW2rb8lJKLMQ==", "contentHash": "O1UmrldEd72/0//LIdop26QuWwToNP3lXURfORKZGZv1Kp5nU03jS/hXIXEgDSzxRZJt5j+ffay7x+5eedXMbg==",
"dependencies": { "dependencies": {
"HarmonyX": "2.5.7", "HarmonyX": "2.5.7",
"MonoMod.Utils": "21.10.10.1", "MonoMod.Utils": "21.10.10.1",
@@ -126,8 +126,8 @@
}, },
"Microsoft.Build.Tasks.Git": { "Microsoft.Build.Tasks.Git": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.0.0", "resolved": "1.1.1",
"contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
}, },
"Microsoft.NETCore.Platforms": { "Microsoft.NETCore.Platforms": {
"type": "Transitive", "type": "Transitive",
@@ -141,8 +141,8 @@
}, },
"Microsoft.SourceLink.Common": { "Microsoft.SourceLink.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.0.0", "resolved": "1.1.1",
"contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
}, },
"Mono.Cecil": { "Mono.Cecil": {
"type": "Transitive", "type": "Transitive",