Skip to content

Commit

Permalink
Merge pull request #8 from Exiled-Team/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
NaoUnderscore authored Jan 17, 2022
2 parents 1796a5e + 8c8ec63 commit 7e524d6
Show file tree
Hide file tree
Showing 300 changed files with 13,308 additions and 3,179 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Run DocFX
env:
EXILED_REFERENCES: ${{ env.EXILED_REFERENCES_PATH }}
run: docfx docfx.json
run: docfx docfx.json; docfx docfx.json

- name: Deploy to GitHub Pages
if: github.event_name == 'push' && success() #Only publishes on push to master to avoid docs mishaps
Expand Down
4 changes: 2 additions & 2 deletions EXILED.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

<PropertyGroup>
<!-- This is the global version and is used for all projects that don't have a version -->
<Version Condition="$(Version) == ''">3.0.0-alpha.82</Version>
<Version Condition="$(Version) == ''">5.0.0-alpha.6</Version>
<!-- Enables public beta warning via the PUBLIC_BETA constant -->
<PublicBeta>true</PublicBeta>
<PublicBeta>false</PublicBeta>

<HarmonyVersion>2.0.4</HarmonyVersion>
<YamlDotNetVersion>9.1.4</YamlDotNetVersion>
Expand Down
6 changes: 6 additions & 0 deletions EXILED.sln
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exiled.CustomItems", "Exile
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exiled.CreditTags", "Exiled.CreditTags\Exiled.CreditTags.csproj", "{9FEBCAEA-EB51-46D0-BC04-F74789A40079}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exiled.CustomRoles", "Exiled.CustomRoles\Exiled.CustomRoles.csproj", "{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -73,6 +75,10 @@ Global
{9FEBCAEA-EB51-46D0-BC04-F74789A40079}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FEBCAEA-EB51-46D0-BC04-F74789A40079}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FEBCAEA-EB51-46D0-BC04-F74789A40079}.Release|Any CPU.Build.0 = Release|Any CPU
{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{417C3309-8B93-4218-A1D1-D4BB7B09BE0F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
45 changes: 0 additions & 45 deletions Exiled.API/Enums/BarrelType.cs

This file was deleted.

60 changes: 60 additions & 0 deletions Exiled.API/Enums/BaseCode.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// -----------------------------------------------------------------------
// <copyright file="BaseCode.cs" company="Exiled Team">
// Copyright (c) Exiled Team. All rights reserved.
// Licensed under the CC BY-SA 3.0 license.
// </copyright>
// -----------------------------------------------------------------------

namespace Exiled.API.Enums
{
/// <summary>
/// Firearms base codes.
/// </summary>
public enum BaseCode
{
/// <summary>
/// The COM15's base code.
/// </summary>
GunCOM15 = 43,

/// <summary>
/// The COM18's base code.
/// </summary>
GunCOM18 = 37,

/// <summary>
/// The Revolver's base code.
/// </summary>
GunRevolver = 297,

/// <summary>
/// The E11SR's base code.
/// </summary>
GunE11SR = 4737569,

/// <summary>
/// The Crossvec's base code.
/// </summary>
GunCrossvec = 1105,

/// <summary>
/// The FSP9's base code.
/// </summary>
GunFSP9 = 5193,

/// <summary>
/// The Logicer's base code.
/// </summary>
GunLogicer = 273,

/// <summary>
/// The AK's base code.
/// </summary>
GunAK = 70161,

/// <summary>
/// The Shotgun's base code.
/// </summary>
GunShotgun = 37,
}
}
Loading

0 comments on commit 7e524d6

Please sign in to comment.