Skip to content

Commit

Permalink
Merge pull request #201 from PrisonTeam/bleeding_pull_v3_2_5
Browse files Browse the repository at this point in the history
Bleeding pull v3 2 5
  • Loading branch information
GABRYCA authored Mar 31, 2021
2 parents 1ab5334 + 0d3854f commit 7774b54
Show file tree
Hide file tree
Showing 166 changed files with 14,727 additions and 4,603 deletions.
120 changes: 72 additions & 48 deletions PrisonSpigotMC/PrisonSpigotMC.bbcode.txt

Large diffs are not rendered by default.

47 changes: 47 additions & 0 deletions PrisonSpigotMC/Prison_publication__bukkit.org.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@


<!--
NOTE: This is an html fragment that needs to be copied and pasted at the top of the document
for Prison's resource page on bukkit.org, which is also published to ___.
Do not include this comment.
This is only a fragment of html. Don't expect it to fully render properly on its own.
-->


<p>
<span style="font-size: 18px;"><strong>MC Prison v3.2.4</strong></span>
</p>
<p></p>
<p>
<span style="font-size: 14px;">Please note that this is the
official release of the Prison v3.2.4 plugin. I'm the lead developer
of the project and took over management and development of Prison over
a year ago.</span>
</p>
<p></p>
<p>
<strong>Source code:</strong>
<a href="https://github.com/PrisonTeam/Prison/">https://github.com/PrisonTeam/Prison/</a>
</p>
<p>
<strong>Active Contributors:</strong> RoyalBlueRanger [Project Lead],
GABRYCA [Developer],
Madog24 [Graphic Designer, Support Staff, Plugin Tester],
Norbik1004 [Support Staff, Youtube Manager]
</p>
<p>
<strong>Retired Contributors:</strong> SirFaizdat (creator),
Camouflage100, Perksey, GladiatorMC
</p>
<p></p>
<p>
<span style="font-size: 18px;"><b>Quick note: Now has Auto
Configure feature. Better mine editing. PLUS More Placeholders!</b></span>
</p>

7 changes: 7 additions & 0 deletions PrisonSpigotMC/README_bbcode.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,14 @@ https://www.curseforge.com/minecraft/bukkit-plugins/mc-prison-v3

This site does not use bbedit codes. What it does use is html.


** NOTE : The following is important to understand** since I went back and tried to update the site and it failed because I tried to do it a different way. lol


To get the "translated" html from the bbedit codes, I opened spigotmc.org within firefox's developer's tools to inspect the container that help the html code. I copied all of it and pasted it in to the editor in bukkit after enabling the code view of the editor. I kept the initial content. It worked fine without having to tweak anything after that. It may not be a perfect rendition since it does not carry over the css that is used within spigotmc.org, but it's not bad overall. It is not worth trying to get the css working better (you can't change it anyway).


Note: bukkit.org has an option for a "markdown" editor, but it does not work. It's bad. It's trash.


<hr style="height:1px; border:none; color:#aaf; background-color:#aaf;">
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

## Prison Documentation

[Prison Documents - Table of Contents](docs/prison_docs_000_toc.md)
[Prison Documents - Table of Contents](https://prisonteam.github.io/Prison/prison_docs_000_toc.html)

The Prison documentation covers the important details on how to setup a usable Prison server.
These documents are in a state of development, so more will be added.
Expand Down
16 changes: 16 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[Prison Documents - Table of Contents](docs/prison_docs_000_toc.md)

## Prison Build Logs

Prison's build logs can be found in the following documents.

## Build logs
- **[v3.2.5-alpha - Current](docs/changelog_v3.2.x.md)**
- [v3.2.0 - 2019-12-03](docs/prison_changelog_v3.2.0.md)&nbsp;&nbsp;
[v3.2.1 - 2020-09-27](docs/prison_changelog_v3.2.1.md)&nbsp;&nbsp;
[v3.2.2 - 2020-11-21](docs/prison_changelog_v3.2.2.md)&nbsp;&nbsp;
[v3.2.3 - 2020-12-25](docs/prison_changelog_v3.2.3.md)&nbsp;&nbsp;
[v3.2.4 - 2021-03-01](docs/prison_changelog_v3.2.4.md)**



638 changes: 638 additions & 0 deletions docs/LICENSE.md

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
[![License](https://img.shields.io/badge/license-GPL%20License%20v3-blue.svg)](LICENSE.md)
[![Build Status](https://github.com/PrisonTeam/Prison/workflows/Prison%20Build/badge.svg)](https://github.com/PrisonTeam/Prison/actions?query=workflow%3A%22Prison+Build%22)
[![Build Status](https://travis-ci.org/MC-Prison/Prison.svg?branch=master)](https://travis-ci.org/MC-Prison/Prison)
[![Discord](https://discordapp.com/api/guilds/332602419483770890/widget.png)](https://discord.gg/DCJ3j6r)

1. [What is Prison?](#what-is-prison)
2. [Why should I use Prison?](#why-should-i-use-prison)
3. [Get Prison](#get-prison)

## Prison Documentation

[Prison Documents - Table of Contents](prison_docs_000_toc.md)

The Prison documentation covers the important details on how to setup a usable Prison server.
These documents are in a state of development, so more will be added.

## What is Prison?

Prison is a Minecraft plugin that adds all the features necessary for prison servers. It runs on the popular [Spigot](http://spigotmc.org). Plugins for prison servers exist already, but many of them are poorly maintained, and the solid ones are paid resources. Prison eliminates the paywall and the updating hassle, and puts a one-stop solution in their place.

### History of Prison

Prison began as a plugin with the goal of combining two main prison server features: resetting mines and purchasable ranks. In June 2014, Prison v2.0 was released with the goal of providing a single solution for prison servers. Prison v2.0 has had numerous problems and is not the solution that we had envisioned for an all-in-one package to be. The solution is the current version - Prison v3.0.

Starting with prison v3.2.0 new development efforts were began with a focus on adding new features
and improving the performance and stability.

## Why should I use Prison?

If hassle-free updates and zero payments is not enough for you to consider switching to Prison, it doesn't stop there.

* **Prison is modular.** If you don't want to use a certain feature on your server, you can disable it in just a few keystrokes.
* **Prison is completely, 100% open source.** This means that your developers can make changes to the plugin to customize your server's experience, if you so desire.
* **Prison is and always will be free.** All of our code, resources, and binaries are provided free of charge to the Minecraft community. We do not accept donations.
* **New releases are heavily bug-tested.** We test every single aspect of every new release of Prison before releasing it to the community. If a release doesn't pass our rigorous update checklist, it is iterated upon until it does. What does this mean for you? Solid updates with minimal bugs for your server.
* **Prison is always expanding.** We are always looking for ways to expand Prison with features that make your server run more smoothly. Additionally, we are always looking for contributions from the community, be it code contributions, feature requests, bug reports, translations, or documentation.

## Get Prison

| Stable | Experimental (Nightly) |
| ------ | ---------------------- |
| [![Stable Download](https://img.shields.io/badge/download-stable-44cc11.svg)](https://www.spigotmc.org/resources/prison.1223/) | [![Experimental Download](https://img.shields.io/badge/download-experimental-red.svg)](https://ci.appveyor.com/project/faizaand/prison/build/artifacts) |

Loading

0 comments on commit 7774b54

Please sign in to comment.