Skip to content

Commit

Permalink
Merge branch 'master' into docs
Browse files Browse the repository at this point in the history
  • Loading branch information
LeeTwentyThree committed Jul 9, 2023
2 parents 307debf + 38722b0 commit 0438aae
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ We thank all of the following individuals for their contributions to Nautilus. T
| ---- | --------------- | ------ | ---- | --------------- | ------ | ---- | --------------- | ------ |
| [MrPurple6411](https://github.com/MrPurple6411) | <img src="https://avatars.githubusercontent.com/u/7858500?v=4" width="50"> | 433 | [PrimeSonic](https://github.com/PrimeSonic) | <img src="https://avatars.githubusercontent.com/u/39146191?v=4" width="50"> | 312 | [Metious](https://github.com/Metious) | <img src="https://avatars.githubusercontent.com/u/71298690?v=4" width="50"> | 287 |
| [toebeann](https://github.com/toebeann) | <img src="https://avatars.githubusercontent.com/u/45315526?v=4" width="50"> | 228 | [ahk1221](https://github.com/ahk1221) | <img src="https://avatars.githubusercontent.com/u/16101353?v=4" width="50"> | 212 | [Alexejhero](https://github.com/Alexejhero) | <img src="https://avatars.githubusercontent.com/u/32238504?v=4" width="50"> | 207 |
| [LeeTwentyThree](https://github.com/LeeTwentyThree) | <img src="https://avatars.githubusercontent.com/u/31892011?v=4" width="50"> | 102 | [zorgesho](https://github.com/zorgesho) | <img src="https://avatars.githubusercontent.com/u/53096970?v=4" width="50"> | 42 | [JKohlman](https://github.com/JKohlman) | <img src="https://avatars.githubusercontent.com/u/2236351?v=4" width="50"> | 37 |
| [LeeTwentyThree](https://github.com/LeeTwentyThree) | <img src="https://avatars.githubusercontent.com/u/31892011?v=4" width="50"> | 105 | [zorgesho](https://github.com/zorgesho) | <img src="https://avatars.githubusercontent.com/u/53096970?v=4" width="50"> | 42 | [JKohlman](https://github.com/JKohlman) | <img src="https://avatars.githubusercontent.com/u/2236351?v=4" width="50"> | 37 |
| [K07H](https://github.com/K07H) | <img src="https://avatars.githubusercontent.com/u/8804812?v=4" width="50"> | 22 | [Vlad-00003](https://github.com/Vlad-00003) | <img src="https://avatars.githubusercontent.com/u/31519848?v=4" width="50"> | 11 | [EckoTheBat](https://github.com/EckoTheBat) | <img src="https://avatars.githubusercontent.com/u/31031556?v=4" width="50"> | 11 |
| [Cattlesquat](https://github.com/Cattlesquat) | <img src="https://avatars.githubusercontent.com/u/3742246?v=4" width="50"> | 5 | [github-actions[bot]](https://github.com/apps/github-actions) | <img src="https://avatars.githubusercontent.com/in/15368?v=4" width="50"> | 5 | [DingoDjango](https://github.com/DingoDjango) | <img src="https://avatars.githubusercontent.com/u/3172881?v=4" width="50"> | 4 |
| [celvro](https://github.com/celvro) | <img src="https://avatars.githubusercontent.com/u/6541615?v=4" width="50"> | 4 | [NeisesMike](https://github.com/NeisesMike) | <img src="https://avatars.githubusercontent.com/u/17013743?v=4" width="50"> | 3 | [vlyon](https://github.com/vlyon) | <img src="https://avatars.githubusercontent.com/u/791353?v=4" width="50"> | 3 |
| [EldritchCarMaker](https://github.com/EldritchCarMaker) | <img src="https://avatars.githubusercontent.com/u/97289845?v=4" width="50"> | 3 | [jonahnm](https://github.com/jonahnm) | <img src="https://avatars.githubusercontent.com/u/61718056?v=4" width="50"> | 3 | [brett-taylor](https://github.com/brett-taylor) | <img src="https://avatars.githubusercontent.com/u/3868773?v=4" width="50"> | 2 |
| [RamuneNeptune](https://github.com/RamuneNeptune) | <img src="https://avatars.githubusercontent.com/u/94365980?v=4" width="50"> | 2 | [DeadMor0z](https://github.com/DeadMor0z) | <img src="https://avatars.githubusercontent.com/u/13347404?v=4" width="50"> | 1 | [SamuramongeDev](https://github.com/SamuramongeDev) | <img src="https://avatars.githubusercontent.com/u/76671705?v=4" width="50"> | 1 |
| [VELD-Dev](https://github.com/VELD-Dev) | <img src="https://avatars.githubusercontent.com/u/36549174?v=4" width="50"> | 1 |
| [celvro](https://github.com/celvro) | <img src="https://avatars.githubusercontent.com/u/6541615?v=4" width="50"> | 4 | [NeisesMike](https://github.com/NeisesMike) | <img src="https://avatars.githubusercontent.com/u/17013743?v=4" width="50"> | 3 | [VELD-Dev](https://github.com/VELD-Dev) | <img src="https://avatars.githubusercontent.com/u/36549174?v=4" width="50"> | 3 |
| [vlyon](https://github.com/vlyon) | <img src="https://avatars.githubusercontent.com/u/791353?v=4" width="50"> | 3 | [EldritchCarMaker](https://github.com/EldritchCarMaker) | <img src="https://avatars.githubusercontent.com/u/97289845?v=4" width="50"> | 3 | [jonahnm](https://github.com/jonahnm) | <img src="https://avatars.githubusercontent.com/u/61718056?v=4" width="50"> | 3 |
| [brett-taylor](https://github.com/brett-taylor) | <img src="https://avatars.githubusercontent.com/u/3868773?v=4" width="50"> | 2 | [RamuneNeptune](https://github.com/RamuneNeptune) | <img src="https://avatars.githubusercontent.com/u/94365980?v=4" width="50"> | 2 | [DeadMor0z](https://github.com/DeadMor0z) | <img src="https://avatars.githubusercontent.com/u/13347404?v=4" width="50"> | 1 |
| [SamuramongeDev](https://github.com/SamuramongeDev) | <img src="https://avatars.githubusercontent.com/u/76671705?v=4" width="50"> | 1 |

If you notice a problem with this file, feel free to report an issue in the repository.

Expand Down
6 changes: 3 additions & 3 deletions Nautilus/Documentation/tutorials/databank-entries.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ Every PDA entry has its own "path" which determines where in the PDA this entry
| `Lifeforms/Flora/Exploitable` | Exploitable |
| `Lifeforms/Fauna/Herbivores` | Herbivores (UNUSED) |
| `Lifeforms/Fauna/Carnivores` | Carnivores |
| `Lifeforms/Fauna/Rays` | Rays |
| `Lifeforms/Fauna/Sharks` | Sharks |
| `Lifeforms/Fauna/Rays` | Rays (UNUSED) |
| `Lifeforms/Fauna/Sharks` | Sharks (UNUSED) |
| `Lifeforms/Fauna/Leviathans` | Leviathans |
| `Lifeforms/Fauna/Other` | Other Predators (UNUSED) |
| `Lifeforms/Fauna/SmallHerbivores` | Herbivores - Small |
Expand Down Expand Up @@ -271,4 +271,4 @@ PDAHandler.AddEncyclopediaEntry("SpadefishHate", "Advanced", "Spadefish are terr
// Use the StoryGoalHandler to make it unlockable.
// This particular example uses the RegisterItemGoal method to unlock the encyclopedia entry when picking up a Spadefish:
StoryGoalHandler.RegisterItemGoal("SpadefishHate", Story.GoalType.Encyclopedia, TechType.Spadefish);
```
```
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ We hope to keep improving the modding experience in Subnautica to allow develope
1. Download the [Subnautica BepInEx Pack](https://www.nexusmods.com/subnautica/mods/1108).
2. Extract/unzip the BepInEx x64 zip file to your game folder
<!---- FYI these dropdowns have a really weird spacing issue, the line breaks are mandatory to keep formatting! ---->
- <details><summary>Where is my Subnautica/game folder?</summary>
- <details><summary>Where is my Subnautica/game folder? (Click to expand)</summary>

- Steam: &ensp; &ensp; &ensp; &ensp; <code>C:\Program Files (x86)\Steam\steamapps\common\Subnautica</code> <br>
- Epic Games: &ensp; <code>C:\Program Files\Epic Games\Subnautica</code> <br>
- Xbox PC: &ensp; &ensp; &ensp; <code>C:\XboxGames\Subnautica\Content</code> <br>
###### Note: the above paths are the default locations, yours may vary
</details>

- <details><summary>How do I extract the zip file?</summary>
- <details><summary>How do I extract the zip file? (Click to expand)</summary>

- Extracting/unzipping a zip file is as simple as right clicking it, and selecting the `Extract here` prompt. We highly recommend the use of a zipping tool besides the Windows default one, such as [WinRAR](https://www.rarlab.com/download.htm), or [7-Zip](https://7-zip.org/download.html).
</details>
Expand Down

0 comments on commit 0438aae

Please sign in to comment.