Skip to content

Commit

Permalink
Merge pull request #48 from anweisen/development
Browse files Browse the repository at this point in the history
Release v2.3.0
  • Loading branch information
EinfachBeez authored Jan 28, 2023
2 parents 79dd239 + e5e1609 commit dceddca
Show file tree
Hide file tree
Showing 88 changed files with 3,503 additions and 554 deletions.
47 changes: 47 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
---
name: "\U0001F41E Bug report"
about: "Create an issue which describes a bug in the project"
title: ''
labels: "type: bug"
assignees: ''

---

**Description of the bug:**

<!-- A clear and concise description of what the bug is. -->


**Steps to reproduce this bug:**

<!-- Here is an example for how this could look like. The important thing is that you are describing the steps as specific as possible! -->

<!--
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
Steps to reproduce the exception:
1. Declare object '....'
2. Call method '#setCoins(int)'
3. See exception
-->


**Expected behavior:**

<!-- A clear and concise description of what you expected to happen. -->


**Screenshots:**

<!-- If applicable, add screenshots to help explain the problem. -->


**Additional context (optional):**

<!-- Add any other important information about the problem here. -->
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: "\U0001F4A1 Feature request"
about: "Create an issue describing a feature request"
title: ''
labels: "type: feature"
assignees: ''

---

**Description of the new feature:**

<!--
A clear and concise description of what feature is to be integrated.
Is it related to a bug report issue? If so, this issue must be mentioned and linked.
-->

**Additional context:**

<!-- Add any other context or screenshots about this feature request here. -->
16 changes: 16 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!-- INFORMATION ABOUT THE PR MUST BE GIVEN -->
<!-- CHECK IF IMPORTANT INFORMATION SHOULD BE INCLUDED IN THE README.MD -->

This pull request includes:

- [ ] new release (master branch)
- [ ] new feature (development branch)
- [ ] bug fix (development branch)

### Changes made to the repository:

<!-- A brief description of the changes done in this pull request. -->

### Documentation of test results:

<!-- Add test results before and after applying your changes. (This must be specified only for bug fixes) -->
7 changes: 7 additions & 0 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,10 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: mvn -B package --file pom.xml
- name: Capture build artifacts
uses: actions/upload-artifact@v2
with:
name: Artifacts
path: |
plugin/target/Challenges.jar
mongo-connector/target/Challenges-MongoConnector.jar
82 changes: 77 additions & 5 deletions language/files/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@
"command-back-teleported": "Du wurdest §e{0} §7Position zurück teleportiert",
"command-back-teleported-multiple": "Du wurdest §e{0} §7Positionen zurück teleportiert",
"command-result-no-battle-active": "Es ist aktuell §ckein §7Force-Battle aktiviert",
"command-god-mode-enabled": "Du bist nun im §aGod-Mode",
"command-god-mode-disabled": "Du bist nun §cnicht mehr im God-Mode",
"command-god-mode-toggled-others": "§e{0} §7Spieler sind jetzt im §eGod-Mode",
"traffic-light-challenge-fail": "§e{0} §7ist über §crot §7gegangen",
"player-damage-display": "§e{0} §7nahm §7{1} §7Schaden durch §e{2}",
"death-message": "§e{0} §7ist gestorben",
Expand Down Expand Up @@ -234,6 +237,28 @@
"force-block-battle-new-block": "Block zu suchen: §e{0}",
"force-block-battle-leaderboard": "§8➜ §7Force Block Battle Leaderboard",
"force-battle-leaderboard-entry": "{0}#{1} §8» §e{2} §8┃ §e{3}",
"force-battle-block-target-display": "§eBlock: {0}",
"force-battle-item-target-display":"§eItem: {0}",
"force-battle-height-target-display": "§eHöhe: {0}",
"force-battle-mob-target-display": "§eMob: {0}",
"force-battle-biome-target-display": "§eBiom: {0}",
"force-battle-damage-target-display": "§eSchaden: §c{0} ❤",
"force-battle-advancement-target-display": "§eAdvancement: {0}",
"force-battle-position-target-display": "§ePosition: {0}",
"extreme-force-battle-new-height": "Höhe zu erreichen: §e{0}",
"extreme-force-battle-reached-height": "Du hast die Höhe §e{0} §7erreicht!",
"extreme-force-battle-new-biome": "Biom zu finden: §e{0}",
"extreme-force-battle-found-biome": "Du hast das Biom §e{0} §7gefunden!",
"extreme-force-battle-new-damage": "Schaden zu nehmen: §c{0} ❤",
"extreme-force-battle-took-damage": "Du hast §c{0} ❤ §7Schaden genommen!",
"extreme-force-battle-position": "§eX: {0} §8┃ §eZ: {1}",
"extreme-force-battle-new-position": "Position zu erreichen: §e{0}",
"extreme-force-battle-reached-position": "Du hast die Position §e{0} §7erreicht!",
"extreme-force-battle-leaderboard": "§8➜ §7Extreme Force Battle Leaderboard",
"force-biome-battle-leaderboard": "§8➜ §7Force Biome Battle Leaderboard",
"force-damage-battle-leaderboard": "§8➜ §7Force Damage Battle Leaderboard",
"force-height-battle-leaderboard": "§8➜ §7Force Height Battle Leaderboard",
"force-position-battle-leaderboard": "§8➜ §7Force Position Battle Leaderboard",
"random-event-speed": [
"Sonic? Bist du es?",
"Woahh! Das ist aber schnell"
Expand Down Expand Up @@ -289,6 +314,7 @@
"bossbar-ice-floor": "§8» §fEisboden §8┃ {0}",
"bossbar-dont-stop-running": "§8» §7Bewege dich in §8┃ §e{0}",
"bossbar-five-hundred-blocks": "§8» §fBlöcke Gelaufen §8┃ §7{0} §8/ §7{1}",
"bossbar-level-border": "§8» §7Border Größe §8┃ §7{0}",
"bossbar-race-goal-info": "§8» §fZiel §8┃ §7X: {0} §8/ §7Z: {1} §8┃ §e{2} Blöcke",
"bossbar-race-goal": "§8» §fZiel §8┃ §7X: {0} §8/ §7Z: {1}",
"bossbar-first-at-height-goal": "§8» §fZiel §8┃ §7Y: {0}",
Expand Down Expand Up @@ -386,7 +412,7 @@
"menu-item_blocks": "§4Blöcke & Items",
"menu-challenges": "§cChallenges",
"menu-settings": "§eEinstellungen",
"menu-custom": "§aBenutzerdefiniert",
"menu-custom": "§aIndividuelle Challenges",
"lore-category-activated-count": "§7Aktiviert §8» §a{0}§8/§7{1}",
"lore-category-activated": "§7Aktiviert §8» §aJa",
"lore-category-deactivated": "§7Aktiviert §8» §cNein",
Expand Down Expand Up @@ -488,7 +514,13 @@
"§bScoreboard anzeigen"
],
"item-force-battle-duped-targets": [
"§cDoppelte Ziele"
"§cDoppelte Ziele",
"Ziele können *mehrfach* vorkommen"
],
"item-force-position-battle-radius": [
"§bRadius",
"Der *maximale Radius*, in dem sich die",
"Positionen befinden können"
],
"item-difficulty-setting": [
"§aSchwierigkeit",
Expand Down Expand Up @@ -611,6 +643,10 @@
"Du verlierst keine *Items*,",
"wenn du *stirbst*"
],
"item-mob-griefing-setting": [
"§5Mob Griefing",
"Monster können *nichts zerstören*"
],
"item-no-item-damage-setting": [
"§5Kein Itemschaden",
"*Items* sind *unzerstörbar*"
Expand Down Expand Up @@ -1142,6 +1178,11 @@
"Es droppen *keine Items* von",
"*Blöcken* und *Entities* mehr."
],
"item-level-border-challenges": [
"§eLevel = Border",
"Die *Border-Größe* passt sich dem *Spieler*",
"mit den *meisten Leveln* an."
],
"item-chunk-effect-challenge": [
"§3Zufällige Chunk Effekte",
"In *jedem Chunk* bekommst du",
Expand Down Expand Up @@ -1377,6 +1418,36 @@
"Wenn ein Spieler einen Block *skippt*,",
"wird dieser in sein *Inventar hinzugefügt*"
],
"item-force-biome-battle-goal": [
"§2Force Biome Battle",
"Jeder Spieler bekommt ein *zufälliges Biom*,",
"das er betreten muss"
],
"menu-force-biome-battle-goal-settings": "Force Biome Battle",
"item-force-damage-battle-goal": [
"§3Force Damage Battle",
"Jeder Spieler bekommt eine *zufällige Anzahl Schaden*,",
"die er *erhalten* muss"
],
"menu-force-damage-battle-goal-settings": "Force Damage Battle",
"item-force-height-battle-goal": [
"§6Force Height Battle",
"Jeder Spieler bekommt eine *zufällige Höhe*,",
"auf der er sich befinden muss."
],
"menu-force-height-battle-goal-settings": "Force Height Battle",
"item-force-position-battle-goal": [
"§aForce Position Battle",
"Jeder Spieler bekommt eine *zufällige Position*,",
"die er erreichen muss."
],
"menu-force-position-battle-goal-settings": "Force Position Battle",
"item-extreme-force-battle-goal": [
"§cExtreme Force Battle",
"Jeder Spieler bekommt ein *zufälliges Ziel*,",
"welches er erreichen muss"
],
"menu-extreme-force-battle-goal-settings": "Extreme Force Battle",
"item-get-full-health-goal": [
"§aRegeneriere Volle Leben",
"The first player to gain full health wins."
Expand Down Expand Up @@ -1710,10 +1781,11 @@
"Tausche ein Mob mit einem zufälligen",
"anderem Mob aus der gleichen Welt"
],
"item-custom-action-place_random_structure": [
"§aZufällige Struktur",
"Platziert eine zufällige Struktur"
"item-custom-action-place_structure": [
"§aStruktur Platzieren",
"Platziert eine Struktur"
],
"item-custom-action-place_structure-random": "§bZufällige Struktur",
"item-custom-setting-target-current": [
"§6Aktives Entity",
"Die Aktion wird für das *aktive Entity* ausgeführt"
Expand Down
77 changes: 72 additions & 5 deletions language/files/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@
"command-back-teleported": "You were teleported §e{0} §7location back",
"command-back-teleported-multiple": "You were teleported §e{0} §7locations back",
"command-result-no-battle-active": "There is currently §cno §7Force Battle enabled",
"command-god-mode-enabled": "You are now in §aGod mode",
"command-god-mode-disabled": "You are §cno longer in God mode",
"command-god-mode-toggled-others": "§e{0} §7players are now in §eGod mode",
"traffic-light-challenge-fail": "§e{0} §7went over §cred",
"player-damage-display": "§e{0} §7took §7{1} §7damage by §e{2}",
"death-message": "§e{0} §7died",
Expand Down Expand Up @@ -234,6 +237,28 @@
"force-block-battle-new-block": "Block to find: §e{0}",
"force-block-battle-leaderboard": "§8➜ §7Force Block Battle Leaderboard",
"force-battle-leaderboard-entry": "{0}#{1} §8» §e{2} §8┃ §e{3}",
"force-battle-block-target-display": "§eBlock: {0}",
"force-battle-item-target-display":"§eItem: {0}",
"force-battle-height-target-display": "§eHeight: {0}",
"force-battle-mob-target-display": "§eMob: {0}",
"force-battle-biome-target-display": "§eBiome: {0}",
"force-battle-damage-target-display": "§eDamage: §c{0} ❤",
"force-battle-advancement-target-display": "§eAdvancement: {0}",
"force-battle-position-target-display": "§ePosition: {0}",
"extreme-force-battle-new-height": "Height to reach: §e{0}",
"extreme-force-battle-reached-height": "You've reached height §e{0}!",
"extreme-force-battle-new-biome": "Biome to find: §e{0}",
"extreme-force-battle-found-biome": "You've found the biome §e{0}!",
"extreme-force-battle-new-damage": "Damage to take: §c{0} ❤",
"extreme-force-battle-took-damage": "You took §c{0} ❤ §7damage!",
"extreme-force-battle-position": "§eX: {0} §8┃ §eZ: {1}",
"extreme-force-battle-new-position": "Position to reach: §e{0}",
"extreme-force-battle-reached-position": "You've reached the position §e{0}!",
"extreme-force-battle-leaderboard": "§8➜ §7Extreme Force Battle Leaderboard",
"force-biome-battle-leaderboard": "§8➜ §7Force Biome Battle Leaderboard",
"force-damage-battle-leaderboard": "§8➜ §7Force Damage Battle Leaderboard",
"force-height-battle-leaderboard": "§8➜ §7Force Height Battle Leaderboard",
"force-position-battle-leaderboard": "§8➜ §7Force Position Battle Leaderboard",
"random-event-speed": [
"Sonic? Is it you?",
"Woahh! That's fast"
Expand Down Expand Up @@ -290,6 +315,7 @@
"bossbar-dont-stop-running": "§8» §7Move in §8┃ §e{0}",
"bossbar-five-hundred-blocks": "§8» §fBlocks Walked §8┃ §7{0} §8/ §7{1}",
"bossbar-level-border": "§8» §7Border size §8┃ §7{0}",
"bossbar-level-border": "§8» §7Border size §8┃ §7{0}",
"bossbar-race-goal-info": "§8» §fGoal §8┃ §7X: {0} §8/ §7Z: {1} §8┃ §e{2} Blocks",
"bossbar-race-goal": "§8» §fGoal §8┃ §7X: {0} §8/ §7Z: {1}",
"bossbar-first-at-height-goal": "§8» §fGoal §8┃ §7Y: {0}",
Expand Down Expand Up @@ -387,7 +413,7 @@
"menu-item_blocks": "§4Blocks & Items",
"menu-challenges": "§cChallenges",
"menu-settings": "§eSettings",
"menu-custom": "§aCustom",
"menu-custom": "§aCustom Challenges",
"lore-category-activated-count": "§7Activated §8» §a{0}§8/§7{1}",
"lore-category-activated": "§7Activated §8» §aYes",
"lore-category-deactivated": "§7Activated §8» §cNo",
Expand Down Expand Up @@ -483,7 +509,13 @@
"§bShow Scoreboard"
],
"item-force-battle-duped-targets": [
"§cDuped Targets"
"§cDuped Targets",
"Targets can occur *multiple times*"
],
"item-force-position-battle-radius": [
"§bRadius",
"The *maximum radius*, in which the",
"positions will be located"
],
"item-difficulty-setting": [
"§aDifficulty",
Expand Down Expand Up @@ -606,6 +638,10 @@
"You don't lose any *items*",
"when you die"
],
"item-mob-griefing-setting": [
"§5Mob Griefing",
"Monsters *can't destroy* anything"
],
"item-no-item-damage-setting": [
"§5No Item Damage",
"*Items* are *unbreakable*"
Expand Down Expand Up @@ -1355,6 +1391,36 @@
"If a player *skips* a block,",
"they will *receive* it"
],
"item-force-biome-battle-goal": [
"§2Force Biome Battle",
"Each player gets a *random biome*,",
"that he has to *enter*."
],
"menu-force-biome-battle-goal-settings": "Force Biome Battle",
"item-force-damage-battle-goal": [
"§3Force Damage Battle",
"Each player gets a *random damage amount*,",
"that he has to *take*."
],
"menu-force-damage-battle-goal-settings": "Force Damage Battle",
"item-force-height-battle-goal": [
"§6Force Height Battle",
"Each player gets a *random height*,",
"that he has to *reach*."
],
"menu-force-height-battle-goal-settings": "Force Height Battle",
"item-force-position-battle-goal": [
"§aForce Position Battle",
"Each player gets a *random position*,",
"that he has to *reach*."
],
"menu-force-position-battle-goal-settings": "Force Position Battle",
"item-extreme-force-battle-goal": [
"§cExtreme Force Battle",
"Each player gets a *random target*,",
"that he has to reach."
],
"menu-extreme-force-battle-goal-settings": "Extreme Force Battle",
"item-damage-rule-none": [
"§6General Damage",
"Sets whether you can get damage or not"
Expand Down Expand Up @@ -1672,10 +1738,11 @@
"§5Swap mobs",
"Swap a mob with another of the same world"
],
"item-custom-action-place_random_structure": [
"§aRandom Structure",
"Place a random structure"
"item-custom-action-place_structure": [
"§aPlace Structure",
"Places a structure"
],
"item-custom-action-place_structure-random": "§bRandom structure",
"item-custom-setting-target-current": [
"§6Current Entity",
"The action will be executed for the *current entity*"
Expand Down
2 changes: 1 addition & 1 deletion mongo-connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>net.codingarea.challenges</groupId>
<artifactId>root</artifactId>
<version>2.2.2</version>
<version>2.3.0</version>
</parent>

<artifactId>mongo-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>net.codingarea.challenges</groupId>
<artifactId>root</artifactId>
<version>2.2.2</version>
<version>2.3.0</version>
</parent>

<artifactId>plugin</artifactId>
Expand Down
Loading

0 comments on commit dceddca

Please sign in to comment.