Skip to content

Commit

Permalink
Merge pull request #221 from PrisonTeam/release_branch_v3.2.10
Browse files Browse the repository at this point in the history
Release branch v3.2.10
  • Loading branch information
GABRYCA authored Aug 23, 2021
2 parents 3596ae2 + 1f4154a commit fb25e53
Show file tree
Hide file tree
Showing 260 changed files with 21,462 additions and 8,137 deletions.
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ import java.util.Date

apply plugin: 'java'

compileJava.options.encoding = 'UTF-8'
compileTestJava.options.encoding = "UTF-8"

ext.targetArchiveClassifier = 'Java1.8'
//ext.targetArchiveClassifier = 'Java16'

Expand Down Expand Up @@ -91,7 +94,7 @@ buildscript {
}

dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
}

}
Expand Down
3 changes: 3 additions & 0 deletions docs/changelog_v3.2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ is going on in each build so you have a better idea if it may be something
that you need.


## NOTE:
* **A big amount of changelogs for 3.2.x version are listed under [changelog_v3.3.x.md](changelog_v3.3.x.md), this's
because of an early release of 3.3.x, then lately renamed back to 3.2.x, sorry for the confusion but just to know, newer changelogs are there.**



Expand Down
954 changes: 944 additions & 10 deletions docs/changelog_v3.3.x.md

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docs/docs-commands/prison_docs_command_07_prison_reload.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ A couple of examples when you would need to use the reload command for placehold

## SubCommands:

- `/prison reload autofeatures` Reloads all of the auto features settings, including reregistering all of the event listeners that are related to block break events.
- `/prison reload locales` Reloads the language files.
- `/prison reload placeholders` Regenerates all the placeholder mappings and reregisters them with the supported placeholder plugins.

## How to use the command
Expand Down
2 changes: 1 addition & 1 deletion docs/docs-commands/prison_docs_command_11_ranks.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Main Prison Ranks command which will show all the subcommands to admins and open

## How to use the command

Execute the command himself to get a list of commands like in the example: `/ranks`.
Execute the command itself to get a list of commands like in the example: `/ranks`.
This will also open a GUI to players showing a list of the ranks, you can enable or disable this in the config.yml.

### Command Format
Expand Down
2 changes: 1 addition & 1 deletion docs/docs-commands/prison_docs_command_12_ranks_command.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Add a command which will be executed when the player rankup to the rank with the

## How to use the command

Execute the command himself, and you'll get a list of the subcommands, like in the example: `/ranks command`.
Execute the command itself, and you'll get a list of the subcommands, like in the example: `/ranks command`.
- `/ranks command add [rankName] [command]` will add a rankupCommand to a rank.
- `/ranks command list [rankname]` will show a list of rankupCommands in a rank.
- `/ranks command remove [rankName] [command]` will remove the rankupCommand from the rank.
Expand Down
2 changes: 1 addition & 1 deletion docs/docs-commands/prison_docs_command_13_ranks_create.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Create a rank.

## How to use the command

Execute the command himself following the format like in the example:
Execute the command itself following the format like in the example:

- `/ranks create [rankName] [cost] [ladder] [tag]`
- `/ranks create A 100 default &3[&1A&3]&f`
Expand Down
2 changes: 1 addition & 1 deletion docs/docs-commands/prison_docs_command_14_ranks_delete.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Delete a rank.

## How to use the command

Execute the command himself like in the example to delete a rank:
Execute the command itself like in the example to delete a rank:

- `/ranks delete [rankName]`
- `/ranks delete A`
Expand Down
2 changes: 1 addition & 1 deletion docs/docs-commands/prison_docs_command_15_ranks_demote.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Demote a player of a rank depending on the ladder you want.

## How to use the command

Execute the command himself following the format shown in the example to demote a player:
Execute the command itself following the format shown in the example to demote a player:

- `/ranks demote [playerName] [ladder] [chargePlayers]`
- `/ranks demote GABRYCA default`
Expand Down
11 changes: 4 additions & 7 deletions docs/docs-commands/prison_docs_command_17_ranks_ladder_info.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,19 @@ Edit a rank on the ladder side, like moving it from a ladder to another or also

## SubCommands:

- `/ranks ladder addrank [ladderName] [rankName] [position]`
- `/ranks command` Sub-commands for Ladder commands
- `/ranks ladder create [ladderName]`
- `/ranks ladder delete [ladderName]`
- `/ranks ladder delrank [ladderName] [rankName]`
- `/ranks ladder listranks [ladderName]`
- `/ranks ladder list`
- `/ranks ladder list` Lists ladders
- `/ranks ladder moveRank [ladderName] [rankName] [position]`
- `/ranks ladder rankCostMultiplier [ladderName] [rankCostMultiplier]`

## How to use the command

Execute the command or its variables like in the examples:

- `/ranks ladder addranks default A 1` This will move the Ranks A from whatever it's to the default ladder as the first rank.
- `/ranks ladder create coolLadder` This will create a ladder named "coolLadder".
- `/ranks ladder delete coolLadder` This will delete the ladder named "coolLadder" if found.
- `/ranks ladder delrank default A` Delete a rank from the specified ladder.
- `/ranks ladder listranks default` Shows a list of ranks of the "default" in the example.
- `/ranks ladder list` Shows a list of ladders.

### Command Format
Expand Down
2 changes: 2 additions & 0 deletions docs/docs-commands/prison_docs_command_22_ranks_set.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Manages a rank or player.

## SubCommands:

(incomplete listing)

- `/ranks set cost [rankName] [cost]`
- `/ranks set currency [rankName] [currency]`
- `/ranks set rank [playerName] [rankName] [ladder]`
Expand Down
16 changes: 3 additions & 13 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,11 @@ Prison's table of contents of all documents.

### Prison Build Logs for v3.2.0 (2019-12-03) through v3.2.6-alpha (current)

- **[v3.3.x - Current](changelog_v3.3.x.md)**

- **[v3.3.0-alpha - Current](changelog_v3.3.x.md)**
- [v3.2.0 through v3.2.10](prison_changelogs.md)

- **[v3.2.0 - 2019-12-03](prison_changelog_v3.2.0.md)**
- **[v3.2.1 - 2020-09-27](prison_changelog_v3.2.1.md)**
- **[v3.2.2 - 2020-11-21](prison_changelog_v3.2.2.md)**
- **[v3.2.3 - 2020-12-25](prison_changelog_v3.2.3.md)**
- **[v3.2.4 - 2021-03-01](prison_changelog_v3.2.4.md)**
- **[v3.2.5 - 2021-04-01](prison_changelog_v3.2.5.md)**
- **[v3.2.6 - 2021-04-11](prison_changelog_v3.2.6.md)**
- **[v3.2.7 - 2021-05-02](prison_changelog_v3.2.7.md)**
- **[v3.2.8 - 2021-06-17](prison_changelog_v3.2.8.md)**
- **[v3.2.9 - 2021-07-03](prison_changelog_v3.2.9.md)**

- **[v3.3.0 - 2021-??-??](prison_changelog_v3.3.x.md)**



<hr style="height:1px; border:none; color:#aaf; background-color:#aaf;">
Expand Down
Loading

0 comments on commit fb25e53

Please sign in to comment.